Merge branch 'master' of YangSen-qn:qiniu/android-sdk into develop

# Conflicts:
#	library/src/androidTest/java/com/qiniu/android/TestConfig.java
#	library/src/main/java/com/qiniu/android/http/dns/SystemDns.java

Author: YangSen-qn

CHANGELOG.md

@@ -1,4 +1,8 @@
 #Changelog
+## 8.4.1(2022-01-27)
+* 优化 SystemDns 解析：异步开线程池，降低高并发场景下对内存资源占用。
+
+
 ## 8.4.0(2021-12-07)
 * 优化：
     * DNS 预解析支持 DoH (DNS over HTTPS)

QiNiu_Android.iml

@@ -3,6 +3,7 @@
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
+        <option name="BUILD_FOLDER_PATH" />
         <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>

README.md

@@ -15,7 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 
 | Qiniu SDK 版本 | 最低 Android版本   |       依赖库版本           |
 |------------ |-----------------|------------------------|
-|  8.4.0        |  Android 4.0+     |        okhttp 4+         |
+|  8.4.*        |  Android 4.0+     |        okhttp 4+         |
 |  8.3.2        |  Android 4.0+     |        okhttp 4+         |
 |  8.3.1        |  Android 4.0+     |        okhttp 4+         |
 |  8.3.0        |  Android 5.0+     |        okhttp 4+         |
@@ -33,7 +33,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 |  7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：8.4.0
+* 推荐使用最新版：8.4.1
 * 7.6.2 ~ 8.3.2 AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
 ```
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

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

@@ -0,0 +1,36 @@
+package com.qiniu.android;
+
+import com.qiniu.android.http.dns.IDnsNetworkAddress;
+import com.qiniu.android.http.dns.SystemDns;
+import com.qiniu.android.utils.Utils;
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+public class SystemDnsTest extends BaseTest {
+
+    public void testDnsLookup() {
+        SystemDns dns = new SystemDns(5);
+        try {
+            List<IDnsNetworkAddress> result = dns.lookup("upload.qiniup.com");
+            assertTrue("testDnsLookup fail:", result != null && result.size() > 0);
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+            fail("testDnsLookup fail because:" + e.getMessage());
+        }
+    }
+
+    public void testDnsTimeout() {
+        long start = Utils.currentSecondTimestamp();
+        int timeout = 5;
+        SystemDns dns = new SystemDns(timeout);
+        try {
+            List<IDnsNetworkAddress> result = dns.lookup("a.a.a.cn");
+            assertTrue("testDnsTimeout fail:", result == null || result.size() == 0);
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        long end = Utils.currentSecondTimestamp();
+        assertTrue("testDnsTimeout fail because timeout to long", end <= (start + timeout + 1));
+    }
+}

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

@@ -27,6 +27,7 @@ public final class TestConfig {
     public static final String bucket_fog_cn_east1 = "test-fog-cn-east-1";
     public static final String token_fog_cn_east1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:JPPu4hG6dc9AMTBag4eAujK_ldI=:eyJzY29wZSI6InRlc3QtZm9nLWNuLWVhc3QtMSIsImRlYWRsaW5lIjoxNjQ2NjMzMjM1LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9";
     public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:4y0ZaTdcqRcyMloKt_ujblr-WUA=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjQ2NjMzMjM1LCAicmV0dXJuQm9keSI6IntcImNhbGxiYWNrVXJsXCI6XCJodHRwOlwvXC9jYWxsYmFjay5kZXYucWluaXUuaW9cIiwgXCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9";
+
     // -----------
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
 

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

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

library/src/main/java/com/qiniu/android/http/dns/SystemDns.java

@@ -22,7 +22,7 @@
 public class SystemDns implements Dns {
 
     private int timeout = 10;
-    private final ExecutorService executor = new ThreadPoolExecutor(1, 3,
+    private static final ExecutorService executor = new ThreadPoolExecutor(1, 3,
             60L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
     public SystemDns() {