Merge pull request #119 from longbai/avoid_dns_hijacking

cancel check

Author: longbai

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

@@ -17,7 +17,6 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
 
 import static java.lang.String.format;
 

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

@@ -103,6 +103,11 @@ public void onProgress(int bytesWritten, int totalSize) {
         CompletionHandler completion = new CompletionHandler() {
             @Override
             public void complete(ResponseInfo info, JSONObject response) {
+                if(options.cancellationSignal != null && options.cancellationSignal.isCancelled()){
+                    ResponseInfo i = ResponseInfo.cancelled();
+                    completionHandler.complete(key, i, null);
+                    return;
+                }
                 if (info.isOK()) {
                     options.progressHandler.progress(key, 1.0);
                     completionHandler.complete(key, info, response);

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

@@ -125,7 +125,7 @@ private void putChunk(String host, int offset, int chunkSize, String context, Pr
         post(url, chunkBuffer, 0, chunkSize, progress, _completionHandler, c);
     }
 
-    private void makeFile(String host, CompletionHandler _completionHandler) {
+    private void makeFile(String host, CompletionHandler _completionHandler, UpCancellationSignal c) {
         String mime = format(Locale.ENGLISH, "/mimeType/%s", UrlSafeBase64.encodeToString(options.mimeType));
 
         String keyStr = "";
@@ -145,8 +145,8 @@ private void makeFile(String host, CompletionHandler _completionHandler) {
         String url = format(Locale.ENGLISH, "http://%s/mkfile/%d%s%s%s", host, size, mime, keyStr, paramStr);
         String bodyStr = StringUtils.join(contexts, ",");
         byte[] data = bodyStr.getBytes();
-        // 不取消 makeFile 操作
-        post(url, data, 0, data.length, null, _completionHandler, null);
+
+        post(url, data, 0, data.length, null, _completionHandler, c);
     }
 
     private void post(String url, byte[] data, int offset, int size, ProgressHandler progress,
@@ -165,14 +165,19 @@ private int calcBlockSize(int offset) {
     }
 
     private boolean isCancelled() {
-        return options.cancellationSignal.isCancelled();
+        return options.cancellationSignal != null && options.cancellationSignal.isCancelled();
     }
 
     private void nextTask(final int offset, final int retried, final String host) {
         if (offset == size) {
             CompletionHandler complete = new CompletionHandler() {
                 @Override
                 public void complete(ResponseInfo info, JSONObject response) {
+                    if(isCancelled()){
+                        ResponseInfo i = ResponseInfo.cancelled();
+                        completionHandler.complete(key, i, null);
+                        return;
+                    }
                     if (info.isOK()) {
                         removeRecord();
                         options.progressHandler.progress(key, 1.0);
@@ -187,7 +192,7 @@ public void complete(ResponseInfo info, JSONObject response) {
                     completionHandler.complete(key, info, response);
                 }
             };
-            makeFile(host, complete);
+            makeFile(host, complete, options.cancellationSignal);
             return;
         }
 
@@ -207,6 +212,11 @@ public void onProgress(int bytesWritten, int totalSize) {
             @Override
             public void complete(ResponseInfo info, JSONObject response) {
                 if (!info.isOK()) {
+                    if(isCancelled()){
+                        ResponseInfo i = ResponseInfo.cancelled();
+                        completionHandler.complete(key, i, null);
+                        return;
+                    }
                     if (info.statusCode == 701) {
                         nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried, host);
                         return;