diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 000000000..ae78c113f
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..6ff1209bd
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..313944a86
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5b755f36..4fe55cad4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@
* 应广大用户需求，升级到 okhttp4
* 修复文件空指针异常
+# 7.4.4（同v7.6.3code，okhttp3.12.6）
+
# 7.4.3（同v7.5.0code，okhttp3.12.6）
# 7.4.2
diff --git a/README.md b/README.md
index e6687bb10..0c8156420 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ https://github.com/qiniudemo/qiniu-lab-android
|------------ |-----------------|------------------------|
| 7.6.x | Android 5.0+ | okhttp 4+ |
| 7.5.x | Android 5.0+ | okhttp 4+ |
+| 7.4.4 | Android 4.4+ | okhttp 3.12.6 |
| 7.4.3 | Android 2.3+ | okhttp 3.12.6 |
| 7.3.x | Android 2.3+ | okhttp 3.11.0 |
| 7.2.x | Android 2.3+ | okhttp 3+ |
@@ -25,7 +26,7 @@ https://github.com/qiniudemo/qiniu-lab-android
### 注意
* 推荐使用最新版：7.6.3，7.6.3使用okhttp4.2.2
-* 7.4.3是在7.5.2版本上降低okhttp版本，其他功能不变
+* 7.4.4是在7.6.3版本上降低okhttp版本，其他功能不变
* 从 7.3.13 开始，不在强制依赖 `happy-dns-android`，默认不再提供 `httpDns`，可以调用 `Configuration.Builder#dns(com.qiniu.android.http.Dns)`方法设置外部 `Dns`，自定义 `Dns` 要求实现 `com.qiniu.android.http.Dns` 接口。
* 从7.5.0开始增加了DNS预取和缓存策略，减少dns解析错误
* 如果可以明确 区域 的话，最好指定固定区域，这样可以少一步网络请求，少一步出错的可能。
diff --git a/library/build.gradle b/library/build.gradle
index f661129c2..64b6e1db6 100755
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -53,7 +53,7 @@ android {
}
dependencies {
- implementation 'com.squareup.okhttp3:okhttp:4.2.2'
+ implementation 'com.squareup.okhttp3:okhttp:3.12.6'
// for javax.annotation.Nullable use in custom MultipartBody and Headers implements.
// implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation fileTree(include: ['*.jar'], dir: 'libs')
diff --git a/library/library.iml b/library/library.iml
new file mode 100644
index 000000000..fa5e5030b
--- /dev/null
+++ b/library/library.iml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/library/src/androidTest/java/com/qiniu/android/CancelTest.java b/library/src/androidTest/java/com/qiniu/android/CancelTest.java
index 056f01c32..f75a4bd98 100644
--- a/library/src/androidTest/java/com/qiniu/android/CancelTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/CancelTest.java
@@ -39,10 +39,10 @@ protected void setUp() throws Exception {
}
- public void testFile() throws Throwable {
- Temp[] ts = new Temp[]{templateFile(400, 0.2), templateFile(700, 0.2), templateFile(1024, 0.51), templateFile(4 * 1024, 0.5), templateFile(8 * 1024 + 1, 0.6)};
- checkTemp(ts, "testFile");
- }
+// public void testFile() throws Throwable {
+// Temp[] ts = new Temp[]{templateFile(400, 0.2), templateFile(700, 0.2), templateFile(1024, 0.51), templateFile(4 * 1024, 0.5), templateFile(8 * 1024 + 1, 0.6)};
+// checkTemp(ts, "testFile");
+// }
// public void testData() throws Throwable {
// Temp[] ts = new Temp[]{templateData(400, 0.2), templateData(700, 0.2), templateData(1024, 0.51), templateData(4 * 1024 + 785, 0.5), templateData(4 * 1024, 0.5), templateData(8 * 1024, 0.6)};
diff --git a/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java b/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java
index 5c67f35da..7832554e2 100644
--- a/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java
+++ b/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java
@@ -59,7 +59,7 @@ protected void setUp() throws Exception {
File f = File.createTempFile("qiniutest", "b");
String folder = f.getParent();
FileRecorder fr = new FileRecorder(folder);
- config = new Configuration.Builder().recorder(fr).build();
+ config = new Configuration.Builder().recorder(fr).useHttps(false).build();
uploadManager = new UploadManager(config);
ACollectUploadInfoTest.testInit();
@@ -79,7 +79,7 @@ public void progress(String key, double percent) {
if (percent >= pos) {
cancelled = true;
}
- Log.i("qiniutest", "progress " + percent);
+ Log.e("qiniutest", "progress " + percent);
}
}, new UpCancellationSignal() {
@Override
diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java
index bbabd14a3..e23ab7e7d 100644
--- 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.6.3";
+ public static final String VERSION = "7.4.4";
public static final String UTF_8 = "utf-8";
}
diff --git a/library/src/main/java/com/qiniu/android/http/HttpEventListener.java b/library/src/main/java/com/qiniu/android/http/HttpEventListener.java
index cd32e4f1d..eb322a0ac 100644
--- a/library/src/main/java/com/qiniu/android/http/HttpEventListener.java
+++ b/library/src/main/java/com/qiniu/android/http/HttpEventListener.java
@@ -2,8 +2,6 @@
import com.qiniu.android.collect.LogHandler;
-import org.jetbrains.annotations.NotNull;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -72,7 +70,7 @@ public Object getUploadInfo() {
final AtomicLong nextCallId = new AtomicLong(1L);
@Override
- public EventListener create(@NotNull Call call) {
+ public EventListener create(Call call) {
long callId = nextCallId.getAndIncrement();
return new HttpEventListener(callId, (Client.ResponseTag) call.request().tag(), System.nanoTime());
}