Skip to content

Commit 8fd12e8

Browse files
bachuebachue
authored
Merge pull request #355 from JemyCheung/okhttp3
fix the null exception bug
2 parents 4343ced + fce6b5f commit 8fd12e8

File tree

9 files changed

+144
-71
lines changed

9 files changed

+144
-71
lines changed

‎.idea/caches/gradle_models.ser‎

37.1 KB
Binary file not shown.

‎.idea/codeStyles/Project.xml‎

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android-sdk.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎library/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646
}
4747

4848
dependencies {
49-
compile 'com.squareup.okhttp3:okhttp:3.11.0'
49+
compile 'com.squareup.okhttp3:okhttp:3.12.6'
5050
// for javax.annotation.Nullable use in custom MultipartBody and Headers implements.
5151
// compile 'com.google.code.findbugs:jsr305:3.0.2'
5252
compile fileTree(include: ['*.jar'], dir: 'libs')

‎library/library.iml‎

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":library" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="2.1.0" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="2.1.0" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -17,7 +19,8 @@
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2124
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2225
<option name="PROJECT_TYPE" value="1" />
2326
</configuration>
@@ -28,18 +31,16 @@
2831
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2932
<exclude-output />
3033
<content url="file://$MODULE_DIR$">
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3234
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -75,35 +76,11 @@
7576
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7677
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7778
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
102-
<excludeFolder url="jar://$MODULE_DIR$/build/qiniu-android-sdk-7.4.0.jar!/" />
79+
<excludeFolder url="file://$MODULE_DIR$/build" />
10380
</content>
10481
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
10582
<orderEntry type="sourceFolder" forTests="false" />
106-
<orderEntry type="library" exported="" name="com.squareup.okio:okio:1.14.0@jar" level="project" />
107-
<orderEntry type="library" exported="" name="com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
83+
<orderEntry type="library" exported="" name="Gradle: com.squareup.okhttp3:okhttp:3.12.6@jar" level="project" />
84+
<orderEntry type="library" exported="" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
10885
</component>
10986
</module>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
public final class Constants {
5-
public static final String VERSION = "7.4.2";
5+
public static final String VERSION = "7.4.3";
66

77
public static final String UTF_8 = "utf-8";
88
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
public class DnsCacheFile implements Recorder {
1616

1717
public String directory;
18+
public File f;
1819

1920
public DnsCacheFile(String directory) throws IOException {
2021
this.directory = directory;
21-
File f = new File(directory);
22+
f = new File(directory);
2223
if (!f.exists()) {
2324
boolean r = f.mkdirs();
2425
if (!r) {
@@ -39,8 +40,8 @@ public DnsCacheFile(String directory) throws IOException {
3940
*/
4041
@Override
4142
public void set(String key, byte[] data) {
42-
File file = new File(directory);
43-
File[] fs = file.listFiles();
43+
File[] fs = f.listFiles();
44+
if (fs == null) return;
4445
if (fs.length > 0) {
4546
for (int i = 0; i < fs.length; i++) {
4647
del(fs[i].getName());
@@ -97,8 +98,8 @@ public byte[] get(String key) {
9798

9899
//f.delete()=false时才会有fs.length>1的情况
99100
public String getFileName() {
100-
File file = new File(directory);
101-
File[] fs = file.listFiles();
101+
File[] fs = f.listFiles();
102+
if (fs == null) return null;
102103
if (fs.length == 1) {
103104
return fs[0].getName();
104105
} else if (fs.length > 1) {
@@ -107,7 +108,7 @@ public String getFileName() {
107108
for (int i = 1; i < fs.length; i++) {
108109
String key = fs[i].getName();
109110
DnsCacheKey cacheKey = DnsCacheKey.toCacheKey(key);
110-
if(cacheKey==null)
111+
if (cacheKey == null)
111112
return null;
112113
long time = Long.parseLong(cacheKey.getCurrentTime());
113114
if (time > cachetime) {

0 commit comments

Comments
 (0)