Skip to content

Commit a7b62ff

Browse files
gawen957gawen957
committed
add MultipartBody and Headers and use okhttp3.11.0 implements in http.Client classs, because of un-allowed non-Ascii characters in the Heades.of() method of okhttp3.12.0, which influence the form upload so that it couldn't use the Chinese filename.
1 parent e9c5d40 commit a7b62ff

File tree

14 files changed

+785
-71
lines changed

14 files changed

+785
-71
lines changed

‎.idea/caches/build_file_checksums.ser‎

544 Bytes
Binary file not shown.

‎.idea/codeStyles/Project.xml‎

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

‎.idea/compiler.xml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.idea/gradle.xml‎

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

‎.idea/misc.xml‎

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

‎.idea/vcs.xml‎

Lines changed: 1 addition & 1 deletion
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
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="android-sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="android-sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎library/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ String version = versionName()
2020
int code = versionNameToCode(version)
2121

2222
android {
23-
compileSdkVersion 25
23+
compileSdkVersion 26
2424
buildToolsVersion '25.0.2'
2525
defaultConfig {
2626
//applicationId "com.qiniu.android"
2727
minSdkVersion 9
28-
targetSdkVersion 25
28+
targetSdkVersion 26
2929
versionCode code
3030
versionName version
3131
}
@@ -36,7 +36,8 @@ android {
3636
}
3737

3838
dependencies {
39-
compile 'com.squareup.okhttp3:okhttp:3.11.0'
39+
compile 'com.squareup.okhttp3:okhttp:3.12.0'
40+
compile 'com.google.code.findbugs:jsr305:3.0.2'
4041
compile fileTree(include: ['*.jar'], dir: 'libs')
4142
}
4243

‎library/library.iml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-sdk" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -23,7 +23,7 @@
2323
</configuration>
2424
</facet>
2525
</component>
26-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2727
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
@@ -61,21 +61,20 @@
6161
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7164
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7978
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8079
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8180
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -92,19 +91,13 @@
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
9794
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
10195
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10296
</content>
103-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
97+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
10498
<orderEntry type="sourceFolder" forTests="false" />
105-
<orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
106-
<orderEntry type="library" exported="" name="happy-dns-0.2.13" level="project" />
107-
<orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
108-
<orderEntry type="library" exported="" name="android-android-25" level="project" />
99+
<orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.2@jar" level="project" />
100+
<orderEntry type="library" exported="" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
101+
<orderEntry type="library" exported="" name="Gradle: com.squareup.okhttp3:okhttp:3.12.0@jar" level="project" />
109102
</component>
110103
</module>

0 commit comments

Comments
 (0)