Merge pull request #147 from longbai/fixed_progress_problem

进度在ui线程回调

Author: longbai

CHANGELOG.md

@@ -1,5 +1,13 @@
 #Changelog
 
+## 7.0.9 (2015-10-15)
+
+### 修改
+* 禁止0字节文件上传
+
+### 修正
+* 进度回调在非UI线程
+
 ## 7.0.8 (2015-10-10)
 
 ### 修改

library/src/main/java/com/qiniu/android/common/Constants.java

@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.0.8";
+    public static final String VERSION = "7.0.9";
 
     public static final String UTF_8 = "utf-8";
 }

library/src/main/java/com/qiniu/android/http/ByteArrayEntity.java

@@ -1,6 +1,8 @@
 package com.qiniu.android.http;
 
 
+import com.qiniu.android.utils.AsyncRun;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,7 +17,7 @@ public final class ByteArrayEntity extends AbstractHttpEntity implements Cloneab
 
     private static final int progressStep = 8 * 1024;
     private final byte[] b;
-    private final int off, len;
+    private final int offset, len;
     private final ProgressHandler progressHandler;
     private final CancellationHandler cancellationHandler;
 
@@ -30,7 +32,7 @@ public ByteArrayEntity(final byte[] b, final int off, final int len, ProgressHan
             throw new IndexOutOfBoundsException("off: " + off + " len: " + len + " b.length: " + b.length);
         }
         this.b = b;
-        this.off = off;
+        this.offset = off;
         this.len = len;
         this.progressHandler = h;
         this.cancellationHandler = c;
@@ -48,15 +50,15 @@ public long getContentLength() {
 
     @Override
     public InputStream getContent() {
-        return new ByteArrayInputStream(this.b, this.off, this.len);
+        return new ByteArrayInputStream(this.b, this.offset, this.len);
     }
 
     // @Override
     public void writeTo(final OutputStream outStream) throws IOException {
         if (progressHandler != null || cancellationHandler != null) {
             writeWithNotify(outStream);
         } else {
-            outStream.write(this.b, this.off, this.len);
+            outStream.write(this.b, this.offset, this.len);
         }
         outStream.flush();
     }
@@ -74,9 +76,16 @@ private void writeWithNotify(final OutputStream outStream) throws IOException {
             }
             int left = this.len - off;
             int len = left < progressStep ? left : progressStep;
-            outStream.write(this.b, this.off + off, len);
+            outStream.write(this.b, this.offset + off, len);
             if (progressHandler != null) {
-                progressHandler.onProgress(off, this.len);
+                final int off2 = off;
+                final ByteArrayEntity b = this;
+                AsyncRun.run(new Runnable() {
+                    @Override
+                    public void run() {
+                        progressHandler.onProgress(off2, b.len);
+                    }
+                });
             }
             off += len;
         }

library/src/main/java/com/qiniu/android/http/ResponseInfo.java

@@ -97,9 +97,10 @@ public ResponseInfo(int statusCode, String reqId, String xlog, String xvia, Stri
         this.sent = sent;
     }
 
-    public static ResponseInfo zeroSize(){
+    public static ResponseInfo zeroSize() {
         return new ResponseInfo(ZeroSizeFile, "", "", "", "", "", "", -1, 0, 0, "file or data size is zero");
     }
+
     public static ResponseInfo cancelled() {
         return new ResponseInfo(Cancelled, "", "", "", "", "", "", -1, 0, 0, "cancelled by user");
     }

library/src/main/java/com/qiniu/android/storage/UploadManager.java

@@ -9,8 +9,6 @@
 
 /**
  * 七牛文件上传管理器
- * <p/>
- * <p/>
  * 一般默认可以使用这个类的方法来上传数据和文件。这个类自动检测文件的大小，
  * 只要超过了{@link Configuration#putThreshold}
  */
@@ -52,10 +50,11 @@ private static boolean areInvalidArg(final String key, byte[] data, File f,
         ResponseInfo info = null;
         if (message != null) {
             info = ResponseInfo.invalidArgument(message);
-        } if ((f!=null && f.length() == 0) || (data != null && data.length == 0)){
+        }
+        if ((f != null && f.length() == 0) || (data != null && data.length == 0)) {
             info = ResponseInfo.zeroSize();
         }
-        if (info != null){
+        if (info != null) {
             final ResponseInfo info2 = info;
             AsyncRun.run(new Runnable() {
                 @Override