Merge pull request #258 from zshbleaker/master

Fix problem of no callback when no network.

Author: jemygraw

library/library.iml

@@ -112,4 +112,4 @@
     <orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="happy-dns-0.2.7" level="project" />
   </component>
-</module>
+</module>

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

@@ -98,6 +98,10 @@ public void complete(ResponseInfo info, JSONObject response) {
                         e.printStackTrace();
                         complete.onFailure(ResponseInfo.NetworkError);
                     }
+                } else {
+                    if (info.isNetworkBroken()) {
+                        complete.onFailure(info.statusCode);
+                    }
                 }
             }
         });

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

@@ -160,6 +160,16 @@ public static ResponseInfo fileError(Exception e, final UpToken upToken) {
         return create(null, InvalidFile, "", "", "", "", "", "", 80, 0, 0, e.getMessage(), upToken);
     }
 
+    public static ResponseInfo networkError(int code, UpToken upToken) {
+        return create(null, code, "", "", "", "", "", "", 80, 0, 0, "Network error during preQuery", upToken);
+    }
+
+    public static boolean isStatusCodeForBrokenNetwork(int code) {
+        return code == NetworkError || code == UnknownHost
+                || code == CannotConnectToHost || code == TimedOut
+                || code == NetworkConnectionLost;
+    }
+
     public boolean isCancelled() {
         return statusCode == Cancelled;
     }

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

@@ -95,7 +95,9 @@ public void onSuccess() {
 
             @Override
             public void onFailure(int reason) {
-                final ResponseInfo info = ResponseInfo.invalidToken("invalid token");
+                final ResponseInfo info = ResponseInfo.isStatusCodeForBrokenNetwork(reason) ?
+                        ResponseInfo.networkError(reason, decodedToken) :
+                        ResponseInfo.invalidToken("invalid token");
                 completionHandler.complete(key, info, null);
             }
         });