Merge pull request #307 from sxci/v7.3.13

remove  happly-dns

CHANGELOG.md

@@ -1,5 +1,15 @@
 #Changelog
 
+## 7.3.13 (2018-08-31)
+### 修改
+* 修复 Android 8.0 net.dns1 属性不能获取问题，即移除依赖 com.qiniu:happy-dns ，保留 dns 设置接口
+
+
+## 7.3.12 (2018-04-08)
+### 修改
+* 新建 Dns 类，可以不依赖  com.qiniu:happy-dns
+
+
 ## 7.3.11 (2017-03-12)
 ### 增加
 * 新加坡机房

library/build.gradle

@@ -36,8 +36,7 @@ android {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
-    compile 'com.qiniu:happy-dns:0.2.13'
+    compile 'com.squareup.okhttp3:okhttp:3.11.0'
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
 

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

@@ -18,7 +18,7 @@ public class AutoZoneTest extends AndroidTestCase {
     private String bkt = "javasdk";
 
 //    public void testHttp() {
-//        AutoZone zone = new AutoZone(null);
+//        AutoZone zone = new AutoZone();
 //        final CountDownLatch countDownLatch = new CountDownLatch(1);
 //        zone.preQueryIndex(new AutoZone.ZoneIndex(ak, bkt), new Zone.QueryHandler() {
 //            @Override
@@ -45,7 +45,7 @@ public class AutoZoneTest extends AndroidTestCase {
 //    }
 
 //    public void testHttpFail() {
-//        AutoZone zone = new AutoZone(null);
+//        AutoZone zone = new AutoZone();
 //        ZoneInfo zoneInfo = zone.zoneInfo(ak + "_not_be_ak", bkt);
 //        assertNull(zoneInfo);
 //    }
@@ -57,7 +57,7 @@ public void testSplitE() {
     }
 
     public void testC1() {
-        AutoZone autoZone = new AutoZone(null);
+        AutoZone autoZone = new AutoZone();
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         autoZone.preQueryIndex(new AutoZone.ZoneIndex(ak, bkt), new Zone.QueryHandler() {
             @Override

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

@@ -1,6 +1,5 @@
 package com.qiniu.android.common;
 
-import com.qiniu.android.dns.DnsManager;
 import com.qiniu.android.http.Client;
 import com.qiniu.android.http.CompletionHandler;
 import com.qiniu.android.http.ResponseInfo;
@@ -22,16 +21,16 @@ public final class AutoZone extends Zone {
     /**
      * 自动判断机房
      */
-    public static final AutoZone autoZone = new AutoZone(null);
+    public static final AutoZone autoZone = new AutoZone();
     private final String ucServer;
     private Map<ZoneIndex, ZoneInfo> zones = new ConcurrentHashMap<>();
     private Client client = new Client();
 
-    public AutoZone(DnsManager dns) {
-        this("https://uc.qbox.me", dns);
+    public AutoZone() {
+        this("https://uc.qbox.me");
     }
 
-    AutoZone(String ucServer, DnsManager dns) {
+    AutoZone(String ucServer) {
         this.ucServer = ucServer;
     }
 

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

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

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

@@ -2,23 +2,11 @@
 
 import com.qiniu.android.common.AutoZone;
 import com.qiniu.android.common.Zone;
-import com.qiniu.android.dns.DnsManager;
-import com.qiniu.android.dns.Domain;
-import com.qiniu.android.dns.IResolver;
-import com.qiniu.android.dns.NetworkInfo;
-import com.qiniu.android.dns.local.AndroidDnsServer;
-import com.qiniu.android.dns.local.Resolver;
 import com.qiniu.android.http.Dns;
 import com.qiniu.android.http.ProxyConfiguration;
 import com.qiniu.android.http.UrlConverter;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 public final class Configuration {
 
@@ -127,40 +115,6 @@ public static class Builder {
         private UrlConverter urlConverter = null;
         private Dns dns = null;
 
-        public Builder() {
-            buildDefaultDns();
-        }
-
-        private void buildDefaultDns() {
-            IResolver r1 = AndroidDnsServer.defaultResolver();
-            IResolver r2 = null;
-            try {
-                r2 = new Resolver(InetAddress.getByName("119.29.29.29"));
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
-            final DnsManager happlyDns = new DnsManager(NetworkInfo.normal, new IResolver[]{r1, r2});
-
-            dns = new Dns() {
-                @Override
-                public List<InetAddress> lookup(String hostname) throws UnknownHostException {
-                    InetAddress[] ips;
-                    try {
-                        ips = happlyDns.queryInetAdress(new Domain(hostname));
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        throw new UnknownHostException(e.getMessage());
-                    }
-                    if (ips == null) {
-                        throw new UnknownHostException(hostname + " resolve failed.");
-                    }
-                    List<InetAddress> l = new ArrayList<>();
-                    Collections.addAll(l, ips);
-                    return l;
-                }
-            };
-        }
-
         public Builder zone(Zone zone) {
             this.zone = zone;
             return this;