refresh

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.5.1 (2015-05-29)
+
+### 修正
+* 重传判断
+
 ## 7.0.5 (2015-05-18)
 
 ### 增加

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

@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.0.5";
+    public static final String VERSION = "7.0.5.1";
 
     public static final String UTF_8 = "utf-8";
 }

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

@@ -79,6 +79,10 @@ public static ResponseInfo invalidArgument(String message) {
                 message);
     }
 
+    public static ResponseInfo invalidToken(String message) {
+        return new ResponseInfo(InvalidToken, "", "", "", "", "", -1, 0,
+                message);
+    }
 
     public static ResponseInfo fileError(Exception e) {
         return new ResponseInfo(InvalidFile, "", "", "", "", "", -1,
@@ -92,9 +96,11 @@ public boolean isCancelled() {
     public boolean isOK() {
         return statusCode == 200 && error == null && reqId != null;
     }
-
+    
     public boolean isNetworkBroken() {
-        return statusCode == NetworkError;
+        return statusCode == NetworkError || statusCode == UnknownHost
+                || statusCode == CannotConnectToHost || statusCode == TimedOut
+                || statusCode == NetworkConnectionLost;
     }
 
     public boolean isServerError() {
@@ -103,13 +109,11 @@ public boolean isServerError() {
     }
 
     public boolean needSwitchServer() {
-        return statusCode == NetworkError || statusCode == CannotConnectToHost
-                || statusCode == TimedOut || statusCode == NetworkConnectionLost
-                || (statusCode >= 500 && statusCode < 600 && statusCode != 579);
+        return isNetworkBroken() || isServerError();
     }
 
     public boolean needRetry() {
-        return !isCancelled() && (isNetworkBroken() || isServerError() || statusCode == 406
+        return !isCancelled() && (needSwitchServer() || statusCode == 406
                 || (statusCode == 200 && error != null));
     }
 

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

@@ -77,7 +77,7 @@ public void put(final byte[] data, final String key, final String token,
 
         final UpToken decodedToken = UpToken.parse(token);
         if (decodedToken == null){
-            final ResponseInfo info = ResponseInfo.invalidArgument("invalid token");
+            final ResponseInfo info = ResponseInfo.invalidToken("invalid token");
             AsyncRun.run(new Runnable() {
                 @Override
                 public void run() {
@@ -124,7 +124,7 @@ public void put(File file, final String key, String token, final UpCompletionHan
         }
         UpToken decodedToken = UpToken.parse(token);
         if (decodedToken == null){
-            final ResponseInfo info = ResponseInfo.invalidArgument("invalid token");
+            final ResponseInfo info = ResponseInfo.invalidToken("invalid token");
             AsyncRun.run(new Runnable() {
                 @Override
                 public void run() {