refactor

Author: longbai

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

@@ -117,8 +117,8 @@ public boolean needRetry() {
                 || (statusCode == 200 && error != null));
     }
 
-    public boolean isQiniu() {
-        return statusCode < 500 && statusCode >= 200 && reqId == null;
+    public boolean isNotQiniu() {
+        return statusCode < 500 && statusCode >= 200 && reqId != null;
     }
 
     public String toString() {

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

@@ -126,7 +126,7 @@ public void complete(ResponseInfo info, JSONObject response) {
                         host = config.upHostBackup;
                     }
                     boolean forceIp = false;
-                    if (!info.isQiniu() && !token.hasReturnUrl()){
+                    if (info.isNotQiniu() && !token.hasReturnUrl()){
                         forceIp = true;
                     }
                     httpManager.multipartPost(genUploadAddress(host, config.upPort), args, progress, retried, options.cancellationSignal, forceIp);

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

@@ -165,7 +165,7 @@ private int calcBlockSize(int offset) {
     }
 
     private boolean isCancelled() {
-        return options.cancellationSignal != null && options.cancellationSignal.isCancelled();
+        return options.cancellationSignal.isCancelled();
     }
 
     private void nextTask(final int offset, final int retried, final String host) {
@@ -221,7 +221,7 @@ public void complete(ResponseInfo info, JSONObject response) {
                         nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried, host);
                         return;
                     }
-                    if (!info.isQiniu() && !token.hasReturnUrl()){
+                    if (info.isNotQiniu() && !token.hasReturnUrl()){
                         forceIp = true;
                     }
                     if (retried >= config.retryMax || !info.needRetry()) {