change cancel behavior

Author: longbai

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

@@ -103,14 +103,12 @@ 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);
+                } else if(options.cancellationSignal.isCancelled()){
+                    ResponseInfo i = ResponseInfo.cancelled();
+                    completionHandler.complete(key, i, null);
                 } else if (info.needRetry()) {
                     CompletionHandler retried = new CompletionHandler() {
                         @Override

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

@@ -173,18 +173,19 @@ private void nextTask(final int offset, final int retried, final String host) {
             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);
                         completionHandler.complete(key, info, response);
                         return;
                     }
 
+                    if(isCancelled()){
+                        ResponseInfo i = ResponseInfo.cancelled();
+                        completionHandler.complete(key, i, null);
+                        return;
+                    }
+
                     if (info.needRetry() && retried < config.retryMax) {
                         nextTask(offset, retried + 1, host);
                         return;