add port rollback

Author: longbai

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.1";
+    public static final String VERSION = "7.0.6";
 
     public static final String UTF_8 = "utf-8";
 }

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

@@ -111,17 +111,17 @@ public void postData(String url, byte[] data, Header[] headers, ProgressHandler
     }
 
     private void postEntity(String url, final HttpEntity entity, Header[] headers,
-                         ProgressHandler progressHandler, CompletionHandler completionHandler, final boolean forceIp) {
+                         final ProgressHandler progressHandler, final CompletionHandler completionHandler, final boolean forceIp) {
         final CompletionHandler wrapper = wrap(completionHandler);
         final Header[] h = reporter.appendStatHeaders(headers);
 
         if (converter != null){
             url = converter.convert(url);
         }
 
-        final AsyncHttpResponseHandler originHandler = new ResponseHandler(url, wrapper, progressHandler);
+        ResponseHandler handler = new ResponseHandler(url, wrapper, progressHandler);
         if(backUpIp == null || converter != null){
-            client.post(null, url, h, entity, null, originHandler);
+            client.post(null, url, h, entity, null, handler);
             return;
         }
         final String url2 = url;
@@ -130,13 +130,13 @@ private void postEntity(String url, final HttpEntity entity, Header[] headers,
         t.execute(new Runnable() {
             @Override
             public void run() {
-                URI uri = URI.create(url2);
+                final URI uri = URI.create(url2);
                 String ip = Dns.getAddress(uri.getHost());
                 if (ip == null || ip.equals("") || forceIp) {
                     ip = backUpIp;
                 }
 
-                Header[] h2 = new Header[h.length + 1];
+                final Header[] h2 = new Header[h.length + 1];
                 System.arraycopy(h, 0, h2, 0, h.length);
 
                 String newUrl = null;
@@ -146,7 +146,25 @@ public void run() {
                     throw new AssertionError(e);
                 }
                 h2[h.length] = new BasicHeader("Host", uri.getHost());
-                client.post(null, newUrl, h2, entity, null, originHandler);
+                final String ip2 = ip;
+                ResponseHandler handler2 = new ResponseHandler(url2, wrap(new CompletionHandler() {
+                    @Override
+                    public void complete(ResponseInfo info, JSONObject response) {
+                        if (uri.getPort() == 80 || info.statusCode != ResponseInfo.CannotConnectToHost){
+                            completionHandler.complete(info, response);
+                            return;
+                        }
+                        String newUrl80 = null;
+                        try {
+                            newUrl80 = new URI(uri.getScheme(), null, ip2, 80, uri.getPath(), uri.getQuery(), null).toString();
+                        } catch (URISyntaxException e) {
+                            throw new AssertionError(e);
+                        }
+                        ResponseHandler handler3 = new ResponseHandler(newUrl80, completionHandler, progressHandler);
+                        client.post(null, newUrl80, h2, entity, null, handler3);
+                    }
+                }), progressHandler);
+                client.post(null, newUrl, h2, entity, null, handler2);
             }
         });
     }

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

@@ -122,7 +122,7 @@ public boolean isQiniu() {
     }
 
     public String toString() {
-        return String.format(Locale.ENGLISH, "{ResponseInfo:%s,status:%d, reqId:%s, xlog:%s, xvia:%s,  host:%s, ip:%s, port:%d, duration:%f s, error:%s}",
+        return String.format(Locale.ENGLISH, "{ResponseInfo:%s,status:%d, reqId:%s, xlog:%s, xvia:%s, host:%s, ip:%s, port:%d, duration:%f s, error:%s}",
                 super.toString(), statusCode, reqId, xlog, xvia, host, ip, port, duration, error);
     }
 }

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

@@ -71,8 +71,8 @@ public final class Configuration {
     private Configuration(Builder builder){
         upHost = builder.upHost;
         upHostBackup = builder.upHostBackup;
-        upIp = builder.upIp;
-        upPort = builder.upPort;
+        upIp = getIp(builder);
+        upPort = getPort(builder);
 
         chunkSize = builder.chunkSize;
         putThreshold = builder.putThreshold;
@@ -90,6 +90,20 @@ private Configuration(Builder builder){
         urlConverter = builder.urlConverter;
     }
 
+    private static int getPort(Builder builder){
+        if (builder.urlConverter != null){
+            return 80;
+        }
+        return builder.upPort;
+    }
+
+    private static String getIp(Builder builder){
+        if (builder.urlConverter != null){
+            return null;
+        }
+        return builder.upIp;
+    }
+
     private KeyGenerator getKeyGen(KeyGenerator keyGen) {
         if(keyGen == null) {
             keyGen = new KeyGenerator() {
@@ -182,7 +196,6 @@ public Builder retryMax(int times){
 
         public Builder urlConverter(UrlConverter converter){
             this.urlConverter = converter;
-            this.upIp = null;
             return this;
         }