Merge pull request #1 from qiniu/master

gawen957 · web-flow · commit 94687ee2465f · 2019-01-18T17:32:56.000+08:00
git pull
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,4 @@ build/
 # Android Studio
 .idea/workspace.xml
 .idea/libraries
-
+.idea/kotlinc.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ android:
     - build-tools-26.0.0
 
     # The SDK version used to compile your project
-    - android-25
+    - android-26
     - android-22
 
     # Specify at least one system image
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.3.14 (2019-01-10)
+### 修改
+* 修复 okhttp 3.12 上传中文文件名的兼容问题
+
+
 ## 7.3.13 (2018-08-31)
 ### 修改
 * 修复 Android 8.0 net.dns1 属性不能获取问题，即移除依赖 com.qiniu:happy-dns ，保留 dns 设置接口
diff --git a/android-sdk.iml b/android-sdk.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 24 19:53:45 CST 2016
+#Wed Jan 09 22:33:48 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -20,15 +20,25 @@ String version = versionName()
 int code = versionNameToCode(version)
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion '25.0.2'
     defaultConfig {
         //applicationId "com.qiniu.android"
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode code
         versionName version
     }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled true
+        }
+
+    }
 
     lintOptions {
         warning 'InvalidPackage'
@@ -37,6 +47,8 @@ android {
 
 dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.11.0'
+    // 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -23,7 +23,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -61,20 +61,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -92,19 +92,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
-    <orderEntry type="library" exported="" name="happy-dns-0.2.13" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
-    <orderEntry type="library" exported="" name="android-android-25" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.2@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
   </component>
 </module>
diff --git a/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java b/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java
@@ -73,7 +73,7 @@ public void testPutBytesWithAutoZone() throws Throwable {
             final CountDownLatch signal = new CountDownLatch(1);
             final String bucket = bucketToken.getKey();
             final String upToken = bucketToken.getValue();
-            final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_test.txt", bucket);
+            final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_测试.txt", bucket);
 
             uploadManager.put(putData, expectKey, upToken, new UpCompletionHandler() {
                 public void complete(String key, ResponseInfo info, JSONObject response) {
diff --git a/library/src/androidTest/java/com/qiniu/android/HttpTest.java b/library/src/androidTest/java/com/qiniu/android/HttpTest.java
@@ -213,7 +213,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     @SmallTest
     public void testProxy() throws Throwable {
         StringMap x = new StringMap();
-        ProxyConfiguration p = new ProxyConfiguration("115.231.183.168", 80);
+        ProxyConfiguration p = new ProxyConfiguration("115.238.101.32", 80);
         Client c = new Client(p, 10, 30, null, null);
         c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
                 x, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
diff --git a/library/src/androidTest/java/com/qiniu/android/HttpsTest.java b/library/src/androidTest/java/com/qiniu/android/HttpsTest.java
@@ -9,8 +9,6 @@
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.storage.UpToken;
 
-import junit.framework.Assert;
-
 import org.json.JSONObject;
 
 import java.net.URI;
diff --git a/library/src/androidTest/java/com/qiniu/android/PipelineTest.java b/library/src/androidTest/java/com/qiniu/android/PipelineTest.java
@@ -2,7 +2,6 @@
 
 
 import android.test.InstrumentationTestCase;
-import android.util.Log;
 
 import com.qiniu.android.bigdata.pipeline.Pipeline;
 import com.qiniu.android.bigdata.pipeline.Points;
diff --git a/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java b/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java
@@ -13,7 +13,6 @@
 import com.qiniu.android.storage.UpProgressHandler;
 import com.qiniu.android.storage.UploadManager;
 import com.qiniu.android.storage.UploadOptions;
-import com.qiniu.android.utils.Etag;
 
 import junit.framework.Assert;
 
diff --git a/library/src/androidTest/java/com/qiniu/android/SyncFormUploadTest.java b/library/src/androidTest/java/com/qiniu/android/SyncFormUploadTest.java
@@ -10,7 +10,6 @@
 import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UploadManager;
 import com.qiniu.android.storage.UploadOptions;
-import com.qiniu.android.utils.Etag;
 
 import junit.framework.Assert;
 
diff --git a/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java b/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java
@@ -11,7 +11,6 @@
 import com.qiniu.android.storage.UploadManager;
 import com.qiniu.android.storage.UploadOptions;
 import com.qiniu.android.storage.persistent.FileRecorder;
-import com.qiniu.android.utils.Etag;
 
 import junit.framework.Assert;
 
@@ -170,7 +169,7 @@ public void test1M() throws Throwable {
     }
 
     public void test4M() throws Throwable {
-        template(4 * 1024, 0.6);
+        template(4 * 1024, 0.5);
     }
 
     public void test8M1K() throws Throwable {
diff --git a/library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java b/library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java
@@ -1,7 +1,6 @@
 package com.qiniu.android.common;
 
 import android.test.AndroidTestCase;
-import android.util.Log;
 
 import com.qiniu.android.TestConfig;
 
diff --git 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.3.13";
+    public static final String VERSION = "7.3.14";
 
     public static final String UTF_8 = "utf-8";
 }
diff --git a/library/src/main/java/com/qiniu/android/common/FixedZone.java b/library/src/main/java/com/qiniu/android/common/FixedZone.java
@@ -53,8 +53,8 @@ public final class FixedZone extends Zone {
      * 新加坡机房
      */
     public static final Zone zoneAs0 = new FixedZone(new String[]{
-            "upload-as0.qiniup.com","up-as0.qiniup.com",
-            "upload-as0.qbox.me","up-as0.qbox.me"
+            "upload-as0.qiniup.com", "up-as0.qiniup.com",
+            "upload-as0.qbox.me", "up-as0.qbox.me"
     });
 
     private ZoneInfo zoneInfo;
diff --git a/library/src/main/java/com/qiniu/android/http/Client.java b/library/src/main/java/com/qiniu/android/http/Client.java
@@ -21,13 +21,14 @@
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
-import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
 import static com.qiniu.android.http.ResponseInfo.NetworkError;
 
+//import okhttp3.MultipartBody;
+
 /**
  * Created by bailong on 15/11/12.
  */
diff --git a/library/src/main/java/com/qiniu/android/http/Headers.java b/library/src/main/java/com/qiniu/android/http/Headers.java
diff --git a/library/src/main/java/com/qiniu/android/http/MultipartBody.java b/library/src/main/java/com/qiniu/android/http/MultipartBody.java
diff --git a/library/src/main/java/com/qiniu/android/storage/FormUploader.java b/library/src/main/java/com/qiniu/android/storage/FormUploader.java
