Merge pull request #414 from YangSen-qn/sdk_v7_dns_create_file_error

version 7: dns create file error

Author: bachue

CHANGELOG.md

@@ -1,4 +1,7 @@
 #Changelog
+# 7.6.7
+* 修复创建dns缓存文件失败问题
+
 # 7.6.6
 * 修复部分空指针异常
 

Qiniu_Android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Qiniu_Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="QiNiu_Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

README.md

@@ -25,7 +25,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 |  7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：7.6.6
+* 推荐使用最新版：7.6.7
 * AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
 ```
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

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

@@ -10,16 +10,16 @@ public final class TestConfig {
     // TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
     //华东上传凭证
     public static final String bucket_z0 = "sdk-z0";
-    public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:fO65e-s-sRrcNiWkZ3qcrCLM3pM=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNTk3MjAyMDYwfQ==";
+    public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:EhEVhvMUxV41FUXANl2YU4UES2I=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNjA2NDU5OTg3fQ==";
     //华北上传凭证
     public static final String bucket_z1 = "sdk-z1";
-    public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:KHpcWxGAAut9zJjGaHEqEbjlf-c=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNTk3MjAyMDgzfQ==";
+    public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:yOKL2sqzRSNiOb1bb5OeRonHQfI=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNjA2NDYwMDA2fQ==";
     //华南上传凭证
     public static final String bucket_z2 = "sdk-z2";
-    public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:yt7nub2-FOkK2zwodXSgxinpboE=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNTk3MjAyMTAwfQ==";
+    public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:VVB2X8hQYwGQnkNFUzn26kom1Qc=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNjA2NDYwMDIyfQ==";
     //北美上传凭证
     public static final String bucket_na0 = "sdk-na0";
-    public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:J9AbA4jVl4BtsAFg9XooZaa2Iyk=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTU5NzIwMjExNX0=";
+    public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:b46IRIripBu1p2dV1VVBvqM9au4=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTYwNjQ2MDAzOH0=";
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
 
 

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

@@ -78,7 +78,7 @@ public final class Config {
     /**
      * dns缓存信息目录
      */
-    public static String dnscacheDir = Environment.getExternalStorageDirectory() + File.separator + "dnschache" + File.separator;
+    public static String dnscacheDir = ContextGetter.applicationContext().getCacheDir().getAbsolutePath() + "/dnsCache/";
 
     /**
      * preQuery host

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

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

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

@@ -357,7 +357,14 @@ public static boolean recoverCache(Configuration config) {
         if (data == null)
             return true;
 
-        DnsCacheInfo cacheInfo = (DnsCacheInfo) StringUtils.toObject(data);
+        DnsCacheInfo cacheInfo = null;
+        Object cacheInfoObject = StringUtils.toObject(data);
+        if (cacheInfoObject instanceof DnsCacheInfo){
+            cacheInfo = (DnsCacheInfo) StringUtils.toObject(data);
+        } else {
+            recorder.del(localIP);
+        }
+
         if (cacheInfo == null)
             return true;
 
@@ -411,7 +418,8 @@ public static void startPrefetchDns(String token, Configuration config) {
         }
         if (dnsPrefetcher != null) {
             ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = dnsPrefetcher.getConcurrentHashMap();
-            byte[] dnscache = StringUtils.toByteArray(concurrentHashMap);
+            dnsCacheInfo.info = concurrentHashMap;
+            byte[] dnscache = StringUtils.toByteArray(dnsCacheInfo);
             if (dnscache == null)
                 return;
             recorder.set(cacheKey, dnscache);

library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java

@@ -20,13 +20,14 @@ public class DnsCacheFile implements Recorder {
     public DnsCacheFile(String directory) throws IOException {
         this.directory = directory;
         f = new File(directory);
-        if (f.isDirectory() || !f.exists()) {
+
+        if (!f.exists()) {
             boolean r = f.mkdirs();
             if (!r) {
                 throw new IOException("mkdir failed");
             }
-            return;
         }
+
         if (!f.isDirectory()) {
             throw new IOException("does not mkdir");
         }