Merge pull request #262 from sxci/cancell

fix upload cancel logic to avoid retry after cancel signal is triggered

Author: jemygraw

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

@@ -7,15 +7,10 @@
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.utils.UrlSafeBase64;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

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

@@ -4,7 +4,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -194,8 +194,10 @@ public boolean needSwitchServer() {
     }
 
     public boolean needRetry() {
-        return !isCancelled() && (needSwitchServer() || statusCode == 406
-                || (statusCode == 200 && error != null));
+        return !isCancelled() && (
+                        needSwitchServer() || statusCode == 406 ||
+                        (statusCode == 200 && error != null) || (isNotQiniu() && !upToken.hasReturnUrl())
+        );
     }
 
     public boolean isNotQiniu() {

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

@@ -2,7 +2,6 @@
 
 
 import com.qiniu.android.common.AutoZone;
-import com.qiniu.android.common.FixedZone;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.dns.DnsManager;
 import com.qiniu.android.dns.IResolver;

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

@@ -15,7 +15,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 
 /**
  * 表单上传
@@ -124,10 +123,7 @@ public void complete(ResponseInfo info, JSONObject response) {
                 if (info.isOK()) {
                     options.progressHandler.progress(key, 1.0);
                     completionHandler.complete(key, info, response);
-                } else if (options.cancellationSignal.isCancelled()) {
-                    ResponseInfo i = ResponseInfo.cancelled(token);
-                    completionHandler.complete(key, i, null);
-                } else if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
+                } else if (info.needRetry()) {
                     final String upHostRetry = config.zone.upHost(token.token, config.useHttps, upHost);
                     Log.d("Qiniu.FormUploader", "retry upload first time use up host " + upHostRetry);
                     CompletionHandler retried = new CompletionHandler() {
@@ -136,15 +132,15 @@ public void complete(ResponseInfo info, JSONObject response) {
                             if (info.isOK()) {
                                 options.progressHandler.progress(key, 1.0);
                                 completionHandler.complete(key, info, response);
-                            } else if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
+                            } else if (info.needRetry()) {
                                 final String upHostRetry2 = config.zone.upHost(token.token, config.useHttps, upHostRetry);
                                 Log.d("Qiniu.FormUploader", "retry upload second time use up host " + upHostRetry2);
                                 CompletionHandler retried2 = new CompletionHandler() {
                                     @Override
                                     public void complete(ResponseInfo info2, JSONObject response2) {
                                         if (info2.isOK()) {
                                             options.progressHandler.progress(key, 1.0);
-                                        } else if (info2.needRetry() || (info2.isNotQiniu() && !token.hasReturnUrl())) {
+                                        } else if (info2.needRetry()) {
                                             config.zone.frozenDomain(upHostRetry2);
                                         }
                                         completionHandler.complete(key, info2, response2);
@@ -256,7 +252,7 @@ private static ResponseInfo syncUpload0(Client client, Configuration config, byt
         }
 
         //retry for the first time
-        if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
+        if (info.needRetry()) {
             if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
                 options.netReadyHandler.waitReady();
                 if (!AndroidNetwork.isNetWorkReady()) {
@@ -269,7 +265,7 @@ private static ResponseInfo syncUpload0(Client client, Configuration config, byt
             Log.d("Qiniu.FormUploader", "sync upload retry first time use up host " + upHostRetry);
             info = client.syncMultipartPost(upHostRetry, args, token);
 
-            if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
+            if (info.needRetry()) {
                 if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
                     options.netReadyHandler.waitReady();
                     if (!AndroidNetwork.isNetWorkReady()) {
@@ -280,7 +276,7 @@ private static ResponseInfo syncUpload0(Client client, Configuration config, byt
                 String upHostRetry2 = config.zone.upHost(token.token, config.useHttps, upHostRetry);
                 Log.d("Qiniu.FormUploader", "sync upload retry second time use up host " + upHostRetry2);
                 info = client.syncMultipartPost(upHostRetry2, args, token);
-                if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
+                if (info.needRetry()) {
                     config.zone.frozenDomain(upHostRetry2);
                 }
             }

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

@@ -231,12 +231,13 @@ public void complete(ResponseInfo info, JSONObject response) {
                         return;
                     }
 
-                    String upHostRetry = config.zone.upHost(token.token, config.useHttps, upHost);
-                    if (upHostRetry != null
-                            && ((info.isNotQiniu() && !token.hasReturnUrl() || info.needRetry())
-                            && retried < config.retryMax)) {
-                        nextTask(offset, retried + 1, upHostRetry);
-                        return;
+                    // mkfile  ，允许多重试一次
+                    if (info.needRetry() && retried < config.retryMax + 1) {
+                        String upHostRetry = config.zone.upHost(token.token, config.useHttps, upHost);
+                        if (upHostRetry != null) {
+                            nextTask(offset, retried + 1, upHostRetry);
+                            return;
+                        }
                     }
                     completionHandler.complete(key, info, response);
                 }
@@ -269,6 +270,11 @@ public void complete(ResponseInfo info, JSONObject response) {
                     }
                 }
 
+                if (info.isCancelled()) {
+                    completionHandler.complete(key, info, response);
+                    return;
+                }
+
                 String upHostRetry = config.zone.upHost(token.token, config.useHttps, upHost);
                 if (!isChunkOK(info, response)) {
                     if (info.statusCode == 701 && retried < config.retryMax) {