Merge pull request #100 from longbai/use_objc_error_code

统一android 错误码与objc 一致

Author: longbai

CHANGELOG.md

@@ -8,7 +8,8 @@
 
 ### 增加
 * Estat/Xstat 等性能报告
-* post上传进度粒度更细（小影）
+* post上传进度粒度更细（小影提交）
+* 统一android和objective C的错误码
 
 ## 7.0.2 (2015-01-22)
 

library/src/androidTest/java/com/qiniu/android/HttpTest.java

@@ -116,4 +116,47 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
         Assert.assertEquals(418, info.statusCode);
         Assert.assertNotNull(info.error);
     }
+
+    @SmallTest
+    public void testPostNoDomain() throws Throwable {
+
+        httpManager.postData("http://no-domain.qiniu.com", "hello".getBytes(), null, null, new CompletionHandler() {
+            @Override
+            public void complete(ResponseInfo rinfo, JSONObject response) {
+                Log.d("qiniutest", rinfo.toString());
+                info = rinfo;
+                signal.countDown();
+            }
+        });
+
+        try {
+            signal.await(60, TimeUnit.SECONDS); // wait for callback
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        Assert.assertNull(info.reqId);
+        Assert.assertEquals(ResponseInfo.UnknownHost, info.statusCode);
+    }
+
+    @SmallTest
+    public void testPostNoPort() throws Throwable {
+
+        httpManager.postData("http://up.qiniu.com:12345", "hello".getBytes(), null, null, new CompletionHandler() {
+            @Override
+            public void complete(ResponseInfo rinfo, JSONObject response) {
+                Log.d("qiniutest", rinfo.toString());
+                info = rinfo;
+                signal.countDown();
+            }
+        });
+
+        try {
+            signal.await(60, TimeUnit.SECONDS); // wait for callback
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        Assert.assertNull(info.reqId);
+        Assert.assertEquals(ResponseInfo.CannotConnectToHost, info.statusCode);
+    }
+
 }

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

@@ -1,8 +1,6 @@
 package com.qiniu.android.common;
 
-/**
- * Created by bailong on 14/10/8.
- */
+
 public final class Config {
     public static final String VERSION = "7.0.3";
 

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

@@ -9,10 +9,15 @@
 import com.qiniu.android.utils.Dns;
 
 import org.apache.http.Header;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
@@ -107,6 +112,20 @@ private static ResponseInfo buildResponseInfo(int statusCode, Header[] headers,
 
         if (statusCode == 0) {
             statusCode = ResponseInfo.NetworkError;
+            String msg = error.getMessage();
+            if (error instanceof IOException) {
+                if (msg != null && msg.indexOf("UnknownHostException") == 0) {
+                    statusCode = ResponseInfo.UnknownHost;
+                } else if (msg != null && msg.indexOf("Broken pipe") == 0) {
+                    statusCode = ResponseInfo.NetworkConnectionLost;
+                } else if (error instanceof NoHttpResponseException) {
+                    statusCode = ResponseInfo.NetworkConnectionLost;
+                } else if (error instanceof SocketTimeoutException) {
+                    statusCode = ResponseInfo.TimedOut;
+                } else if (error instanceof ConnectTimeoutException || error instanceof SocketException) {
+                    statusCode = ResponseInfo.CannotConnectToHost;
+                }
+            }
         }
 
         return new ResponseInfo(statusCode, reqId, xlog, xvia, host, ip, duration, err);

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

@@ -11,6 +11,14 @@ public final class ResponseInfo {
     public static final int InvalidFile = -3;
     public static final int Cancelled = -2;
     public static final int NetworkError = -1;
+
+    // <-- error code copy from ios
+    public static final int TimedOut = -1001;
+    public static final int UnknownHost = -1003;
+    public static final int CannotConnectToHost = -1004;
+    public static final int NetworkConnectionLost = -1005;
+
+    // -->
     /**
      * 回复状态码
      */
@@ -83,15 +91,19 @@ public boolean isNetworkBroken() {
     }
 
     public boolean isServerError() {
-        return (statusCode >= 500 && statusCode < 600 && statusCode != 579) || statusCode == 996;
+        return (statusCode >= 500 && statusCode < 600 && statusCode != 579)
+                || statusCode == 996;
     }
 
     public boolean needSwitchServer() {
-        return isNetworkBroken() || (statusCode >= 500 && statusCode < 600 && statusCode != 579);
+        return statusCode == NetworkError || statusCode == CannotConnectToHost
+                || statusCode == TimedOut || statusCode == NetworkConnectionLost
+                || (statusCode >= 500 && statusCode < 600 && statusCode != 579);
     }
 
     public boolean needRetry() {
-        return isNetworkBroken() || isServerError() || statusCode == 406 || (statusCode == 200 && error != null);
+        return isNetworkBroken() || isServerError() || statusCode == 406
+                || (statusCode == 200 && error != null);
     }
 
     public String toString() {