Merge pull request #319 from longbai/up7.3.14

longbai · web-flow · commit 7af63be9dc84 · 2019-01-10T16:43:28.000+08:00
update 7.3.14
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
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/library/build.gradle b/library/build.gradle
@@ -48,7 +48,7 @@ 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 'com.google.code.findbugs:jsr305:3.0.2'
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
 
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;
 
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

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ android {`
`48`	`48`	`dependencies {`
`49`	`49`	`compile 'com.squareup.okhttp3:okhttp:3.11.0'`
`50`	`50`	`// for javax.annotation.Nullable use in custom MultipartBody and Headers implements.`
`51`		`- compile 'com.google.code.findbugs:jsr305:3.0.2'`
	`51`	`+// compile 'com.google.code.findbugs:jsr305:3.0.2'`
`52`	`52`	`compile fileTree(include: ['*.jar'], dir: 'libs')`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`public final class Constants {`
`5`		`- public static final String VERSION = "7.3.13";`
	`5`	`+ public static final String VERSION = "7.3.14";`
`6`	`6`
`7`	`7`	`public static final String UTF_8 = "utf-8";`
`8`	`8`	`}`