Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .idea/caches/build_file_checksums.ser
Binary file not shown.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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 设置接口
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}

Expand Down
2 changes: 0 additions & 2 deletions library/src/androidTest/java/com/qiniu/android/HttpsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.qiniu.android.common;

import android.test.AndroidTestCase;
import android.util.Log;

import com.qiniu.android.TestConfig;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
4 changes: 2 additions & 2 deletions library/src/main/java/com/qiniu/android/common/FixedZone.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion library/src/main/java/com/qiniu/android/http/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
Loading