Merge pull request #340 from JemyCheung/master

fix nullpointer

Author: bachue

library/library.iml

@@ -99,6 +99,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+      <excludeFolder url="jar://$MODULE_DIR$/build/qiniu-android-sdk-7.4.0.jar!/" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

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

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

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

@@ -285,8 +285,10 @@ public static boolean checkRePrefetchDns(String token, Configuration config) {
         String localip = AndroidNetwork.getHostIP();
         String akScope = StringUtils.getAkAndScope(token);
 
+        if (currentTime == null || localip == null || akScope == null)
+            return true;
         long cacheTime = (Long.parseLong(currentTime) - Long.parseLong(cacheKey.getCurrentTime())) / 1000;
-        if (!localip.equals(cacheKey.getLocalIp()) || cacheTime > config.dnsCacheTimeMs || !akScope.equals(cacheKey.getAkScope())) {
+        if (!cacheKey.getLocalIp().equals(localip) || cacheTime > config.dnsCacheTimeMs || !cacheKey.getAkScope().equals(akScope)) {
             return true;
         }
 
@@ -302,6 +304,8 @@ public static void startPrefetchDns(String token, Configuration config) {
         String currentTime = String.valueOf(System.currentTimeMillis());
         String localip = AndroidNetwork.getHostIP();
         String akScope = StringUtils.getAkAndScope(token);
+        if (currentTime == null || localip == null || akScope == null)
+            return;
         String cacheKey = new DnsCacheKey(currentTime, localip, akScope).toString();
         Recorder recorder = null;
         DnsPrefetcher dnsPrefetcher = null;
@@ -310,14 +314,18 @@ public static void startPrefetchDns(String token, Configuration config) {
             dnsPrefetcher = DnsPrefetcher.getDnsPrefetcher().init(token);
         } catch (IOException e) {
             e.printStackTrace();
+            return;
         }
         if (config.dns != null) {
             DnsPrefetcher.getDnsPrefetcher().dnsPreByCustom(config.dns);
         }
-        ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = dnsPrefetcher.getConcurrentHashMap();
-        byte[] dnscache = StringUtils.toByteArray(concurrentHashMap);
-
-        recorder.set(cacheKey, dnscache);
+        if (dnsPrefetcher != null) {
+            ConcurrentHashMap<String, List<InetAddress>> concurrentHashMap = dnsPrefetcher.getConcurrentHashMap();
+            byte[] dnscache = StringUtils.toByteArray(concurrentHashMap);
+            if (dnscache == null)
+                return;
+            recorder.set(cacheKey, dnscache);
+        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.qiniu.android.storage.persistent;
 
+import com.qiniu.android.http.custom.DnsCacheKey;
 import com.qiniu.android.storage.Recorder;
 
 import java.io.File;
@@ -105,7 +106,10 @@ public String getFileName() {
             long cachetime = 0;
             for (int i = 1; i < fs.length; i++) {
                 String key = fs[i].getName();
-                long time = Long.parseLong(key.split(":")[0]);
+                DnsCacheKey cacheKey = DnsCacheKey.toCacheKey(key);
+                if(cacheKey==null)
+                    return null;
+                long time = Long.parseLong(cacheKey.getCurrentTime());
                 if (time > cachetime) {
                     del(fileName);
                     cachetime = time;