Merge pull request #384 from JemyCheung/master

response_error

Author: bachue

library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java

@@ -51,11 +51,11 @@ public class AutoZoneTest extends AndroidTestCase {
 //        assertNull(zoneInfo);
 //    }
 
-    public void testSplitE() {
-        String s1 = "bkt:key";
-        String s2 = "bkt";
-        Assert.assertEquals(s1.split(":")[0], s2.split(":")[0]);
-    }
+//    public void testSplitE() {
+//        String s1 = "bkt:key";
+//        String s2 = "bkt";
+//        Assert.assertEquals(s1.split(":")[0], s2.split(":")[0]);
+//    }
 
     public void testC1() {
         AutoZone autoZone = new AutoZone();

library/src/main/java/com/qiniu/android/collect/UploadInfoElement.java

@@ -510,13 +510,16 @@ public long getUp_time() {
 
     public static String resultCode(int statuscode, String error) {
         String result = "";
+        if (statuscode == 406) {
+            return "checksum_error";
+        }
+        if (200 < statuscode && statuscode < 1000) {
+            return "response_error";
+        }
         switch (statuscode) {
             case 200:
                 result = "ok";
                 break;
-            case 406:
-                result = "checksum_error";
-                break;
             case ResponseInfo.NetworkError:
                 if (error != null && error.indexOf("but received") != -1) {
                     result = "file_changed";
@@ -566,7 +569,7 @@ public static String errorType(int statuscode, String error) {
         if (statuscode == 406) {
             return "checksum_error";
         }
-        if (200 < statuscode && statuscode < 600) {
+        if (200 < statuscode && statuscode < 1000) {
             return "response_error";
         }
         switch (statuscode) {