From 0cfe3dc34196f24e5d642bd999fb49cfeb08713b Mon Sep 17 00:00:00 2001 From: JemyCheung Date: Tue, 19 Nov 2019 16:29:14 +0800 Subject: [PATCH 1/2] fix file null --- .idea/caches/gradle_models.ser | Bin 0 -> 38037 bytes .idea/codeStyles/Project.xml | 134 ++++++++++++++---- .idea/gradle.xml | 1 + .idea/misc.xml | 16 ++- android-sdk.iml | 2 +- library/build.gradle | 2 +- library/library.iml | 45 ++---- .../storage/persistent/DnsCacheFile.java | 13 +- 8 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 .idea/caches/gradle_models.ser diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000000000000000000000000000000000000..d58f41d78d02ee7ef912b28f93cae734c1c1b72b GIT binary patch literal 38037 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∈vqn6 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 Tngp{d`SEC%Gs{8Pi)Q~9)nO{H literal 0 HcmV?d00001 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626c2..ae78c113f 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 94946c6a8..1715e3b95 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,6 +12,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index e0d5b93ff..10b5291fa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/android-sdk.iml b/android-sdk.iml index ad4065b84..74149ab95 100644 --- a/android-sdk.iml +++ b/android-sdk.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index ac07e981e..449d631e8 100755 --- a/library/build.gradle +++ b/library/build.gradle @@ -46,7 +46,7 @@ android { } dependencies { - compile 'com.squareup.okhttp3:okhttp:3.11.0' + compile 'com.squareup.okhttp3:okhttp:3.12.6' // for javax.annotation.Nullable use in custom MultipartBody and Headers implements. // compile 'com.google.code.findbugs:jsr305:3.0.2' compile fileTree(include: ['*.jar'], dir: 'libs') diff --git a/library/library.iml b/library/library.iml index d14856797..6b01e6472 100644 --- a/library/library.iml +++ b/library/library.iml @@ -4,6 +4,8 @@ @@ -17,7 +19,8 @@ \ No newline at end of file diff --git a/library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java b/library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java index d112c5fe6..abd388eaf 100644 --- a/library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java +++ b/library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java @@ -15,10 +15,11 @@ public class DnsCacheFile implements Recorder { public String directory; + public File f; public DnsCacheFile(String directory) throws IOException { this.directory = directory; - File f = new File(directory); + f = new File(directory); if (!f.exists()) { boolean r = f.mkdirs(); if (!r) { @@ -39,8 +40,8 @@ public DnsCacheFile(String directory) throws IOException { */ @Override public void set(String key, byte[] data) { - File file = new File(directory); - File[] fs = file.listFiles(); + File[] fs = f.listFiles(); + if (fs == null) return; if (fs.length > 0) { for (int i = 0; i < fs.length; i++) { del(fs[i].getName()); @@ -97,8 +98,8 @@ public byte[] get(String key) { //f.delete()=false时才会有fs.length>1的情况 public String getFileName() { - File file = new File(directory); - File[] fs = file.listFiles(); + File[] fs = f.listFiles(); + if (fs == null) return null; if (fs.length == 1) { return fs[0].getName(); } else if (fs.length > 1) { @@ -107,7 +108,7 @@ public String getFileName() { for (int i = 1; i < fs.length; i++) { String key = fs[i].getName(); DnsCacheKey cacheKey = DnsCacheKey.toCacheKey(key); - if(cacheKey==null) + if (cacheKey == null) return null; long time = Long.parseLong(cacheKey.getCurrentTime()); if (time > cachetime) { From fce6b5f76fdb467e8c37bbc952395d774fce8040 Mon Sep 17 00:00:00 2001 From: JemyCheung Date: Tue, 19 Nov 2019 16:33:15 +0800 Subject: [PATCH 2/2] v7.4.3 --- library/src/main/java/com/qiniu/android/common/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java index 6edfec55e..84950de99 100644 --- a/library/src/main/java/com/qiniu/android/common/Constants.java +++ b/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.2"; + public static final String VERSION = "7.4.3"; public static final String UTF_8 = "utf-8"; }