Skip to content

Commit 9850524

Browse files
author
YangSen-qn
committed
version to 8.9.0
1 parent 28e4a76 commit 9850524

File tree

18 files changed

+95
-103
lines changed

18 files changed

+95
-103
lines changed

‎.idea/misc.xml‎

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

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#Changelog
2+
## 8.9.0（2025-06-12）
3+
* 调整
4+
* 分片上传版本默认调整为 V2
5+
26
## 8.8.0（2024-06-24）
37
* 增加
48
* 上传支持加速域名

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
1515

1616
| Qiniu SDK 版本 | 最低 Android版本 | 依赖库版本 |
1717
|--------------|-----------------|------------------------|
18+
| 8.9.x | Android 4.0+ | okhttp 4+ |
1819
| 8.8.x | Android 4.0+ | okhttp 4+ |
1920
| 8.7.x | Android 4.0+ | okhttp 4+ |
2021
| 8.6.x | Android 4.0+ | okhttp 4+ |
@@ -56,10 +57,10 @@ https://github.com/qiniudemo/qiniu-lab-android
5657
* Android Studio中添加dependencies 或者 在项目中添加maven依赖
5758
```
5859
// 1. 直接导入
59-
implementation 'com.qiniu:qiniu-android-sdk:8.8.+'
60+
implementation 'com.qiniu:qiniu-android-sdk:8.9.+'
6061
6162
// 2. 如果要修改okhttp依赖的版本，可采用以下方式（强烈建议使用七牛库依赖的okhttp版本）
62-
implementation ('com.qiniu:qiniu-android-sdk:8.8.+'){
63+
implementation ('com.qiniu:qiniu-android-sdk:8.9.+'){
6364
exclude (group: 'com.squareup.okhttp3', module: 'okhttp')
6465
}
6566
implementation 'com.squareup.okhttp3:okhttp:4.9.1'

‎library/src/androidTest/java/com/qiniu/android/TestConfig.java‎

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,74 @@
11
package com.qiniu.android;
22

3-
import com.qiniu.android.common.FixedZone;
4-
import com.qiniu.android.common.Zone;
5-
63
/**
7-
* Created by bailong on 14/10/12.
4+
* @author Created by bailong on 14/10/12.
5+
* 测试用例参数配置
86
*/
97
public final class TestConfig {
108
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
11-
// 华东上传凭证
9+
/**
10+
* 华东上传 Bucket
11+
*/
1212
public static final String bucket_z0 = "kodo-phone-zone0-space";
13-
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:wmvcWRPZgKz1WOc3ngyRRY1V1E4=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
14-
// 华北上传凭证
13+
14+
/**
15+
* 华东上传 Token
16+
*/
17+
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:-XABZqmAaZopCyas2Pe--Pk4CbU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNDgxNSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
18+
/**
19+
* 华北上传 Bucket
20+
*/
1521
public static final String bucket_z1 = "kodo-phone-zone1-space";
16-
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:gYdNM4k8dD9O9TlJZZg1N91eCxg=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
17-
// 华南上传凭证
18-
public static final String bucket_z2 = "kodo-phone-zone2-space";
19-
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:vqpz0ZxRvYg72NMJUZIvJ2xzwkM=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
20-
// 北美上传凭证
21-
public static final String bucket_na0 = "kodo-phone-zone-na0-space";
22-
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:y7lkaVlY_uY9lT1mNU65OnC3dSQ=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
23-
// 东南亚上传凭证
24-
public static final String bucket_as0 = "kodo-phone-zone-as0-space";
25-
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:t2hHmzO7XZbPSdEVD5G0B8Zt_V8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
26-
// 华北浙江2上传凭证
27-
public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
28-
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:obdz2DnVxpp5ATqjyUvncGAWj0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3NTQ3MzE4NDEsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
29-
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:S8GPcADE_SvizTqYBIr4Ho8VxPQ=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNzU0NzMxODQxLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
30-
// -----------
31-
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
3222

23+
/**
24+
* 华北上传 Token
25+
*/
26+
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:cWM_Wa1uVvSqADR0gFFfmPfMMDg=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNDgxNSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
27+
/**
28+
* 华南上传 Bucket
29+
*/
30+
public static final String bucket_z2 = "kodo-phone-zone2-space";
3331

34-
//测试通用的token
35-
public static final String commonToken = token_na0;
36-
//dns prefetch token
37-
public static final String uptoken_prefetch = "MP_Ebql_lSsUrDr7WrXn_5vKocQDLvTPCNEFeVmp:3KJpXCGMqm6EAYU71RF1HDmQrcE=:eyJzY29wZSI6ImFuZHJvaWR0ZXN0IiwiZGVhZGxpbmUiOjE1Njc0OTAxODF9";
32+
/**
33+
* 华南上传 Token
34+
*/
35+
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:U-j1RUChHPvmT7udl1TkhZ8fJTI=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNDgxNSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
36+
/**
37+
* 北美上传 Bucket
38+
*/
39+
public static final String bucket_na0 = "kodo-phone-zone-na0-space";
3840

3941
/**
40-
* 华东机房
42+
* 北美上传 Token
43+
*/
44+
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:R09o8l_lytjxXurxJUy050RLnFE=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNDgxNSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
45+
/**
46+
* 东南亚上传 Bucket
4147
*/
42-
public static final Zone mock_bucket_zone0 = new FixedZone(new String[]{
43-
"mock.upload.qiniup.com", "mock.upload-nb.qiniup.com",
44-
"mock.upload-xs.qiniup.com", "mock.up.qiniup.com",
45-
"mock.up-nb.qiniup.com", "mock.up-xs.qiniup.com",
46-
"mock.upload.qbox.me", "up.qbox.me"
47-
});
48+
public static final String bucket_as0 = "kodo-phone-zone-as0-space";
4849

4950
/**
50-
* 华北机房
51+
* 东南亚上传 Token
52+
*/
53+
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:BYTc0wRdKqNodLGvsObUDsO7q-U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNDgxNSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
54+
/**
55+
* 华北浙江2上传 Bucket
5156
*/
52-
public static final Zone mock_bucket_zone1 = new FixedZone(new String[]{
53-
"mock.upload-z1.qiniup.com", "mock.up-z1.qiniup.com",
54-
"mock.upload-z1.qbox.me", "up-z1.qbox.me"
55-
});
57+
public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
5658

5759
/**
58-
* 华南机房
60+
* 华北浙江2上传 Token
5961
*/
60-
public static final Zone mock_bucket_zone2 = new FixedZone(new String[]{
61-
"mock.upload-z2.qiniup.com", "mock.upload-gz.qiniup.com",
62-
"mock.upload-fs.qiniup.com", "mock.up-z2.qiniup.com",
63-
"mock.up-gz.qiniup.com", "mock.up-fs.qiniup.com",
64-
"mock.upload-z2.qbox.me", "up-z2.qbox.me"
65-
});
62+
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:DNDMuoqvSje9gacTRst_vIh0bqM=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3NTQ3MzQ4MTUsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
6663

6764
/**
68-
* 北美机房
65+
* 测试使用的 AK
6966
*/
70-
public static final Zone mock_bucket_zoneNa0 = new FixedZone(new String[]{
71-
"mock.upload-na0.qiniu.com", "mock.up-na0.qiniup.com",
72-
"mock.upload-na0.qbox.me", "up-na0.qbox.me"
73-
});
67+
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
68+
7469

70+
/**
71+
* 测试通用的token
72+
*/
73+
public static final String common_token = bucket_na0;
7574
}

‎library/src/androidTest/java/com/qiniu/android/bigdata/client/ClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testMultipartSyncPost() {
5252
postArgs.params = new StringMap();
5353
postArgs.params.put("x:foo", "foo");
5454

55-
UpToken token = UpToken.parse(TestConfig.commonToken);
55+
UpToken token = UpToken.parse(TestConfig.common_token);
5656

5757
Client client = new Client(null, 90, 90, null, null);
5858
ResponseInfo responseInfo = client.syncMultipartPost("https://up.qiniup.com", postArgs, token);
@@ -70,7 +70,7 @@ public void testMultipartAsyncPost() {
7070
postArgs.mimeType = "text/plain";
7171
postArgs.params = new StringMap();
7272

73-
UpToken token = UpToken.parse(TestConfig.commonToken);
73+
UpToken token = UpToken.parse(TestConfig.common_token);
7474

7575
Client client = new Client(null, 90, 90, null, null);
7676
client.asyncMultipartPost("https://up.qiniu.com", postArgs, token, null, new CompletionHandler() {

‎library/src/androidTest/java/com/qiniu/android/collect/UplogTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void no_testUplog() {
7070

7171
item.setReport("http1.1", ReportItem.RequestKeyHttpVersion);
7272

73-
UploadInfoReporter.getInstance().report(item, TestConfig.commonToken);
73+
UploadInfoReporter.getInstance().report(item, TestConfig.common_token);
7474

7575
// wait(new WaitConditional() {
7676
// @Override

‎library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class AutoZoneTest extends BaseTest {
2727
public void testClearAutoZoneCache() {
2828
final WaitCondition waitCondition = new WaitCondition();
2929
AutoZone zone = new AutoZone();
30-
UpToken token = UpToken.parse(TestConfig.commonToken);
30+
UpToken token = UpToken.parse(TestConfig.common_token);
3131

3232
zone.preQuery(token, new Zone.QueryHandler() {
3333
@Override
@@ -110,7 +110,7 @@ public void testUCServer(){
110110
autoZone.setUcServer(ucServer);
111111
assertTrue(autoZone.getUcServerList().get(0).equals(ucServer));
112112

113-
UpToken token = UpToken.parse(TestConfig.commonToken);
113+
UpToken token = UpToken.parse(TestConfig.common_token);
114114

115115
autoZone.preQuery(token, new Zone.QueryHandler() {
116116
@Override
@@ -168,7 +168,7 @@ public boolean shouldWait() {
168168

169169
private void zoneRequest(final CompleteHandlder completeHandlder){
170170
final AutoZone zone = new AutoZone();
171-
final UpToken token = UpToken.parse(TestConfig.commonToken);
171+
final UpToken token = UpToken.parse(TestConfig.common_token);
172172

173173
zone.preQuery(token, new Zone.QueryHandler() {
174174
@Override
@@ -190,7 +190,7 @@ public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMet
190190
@Test
191191
public void testAutoZone() {
192192
final AutoZone zone = new AutoZone();
193-
final UpToken token = UpToken.parse(TestConfig.commonToken);
193+
final UpToken token = UpToken.parse(TestConfig.common_token);
194194

195195
final TestParam param = new TestParam();
196196

@@ -226,7 +226,7 @@ public boolean shouldWait() {
226226
public void testSetUcHosts02() {
227227
final AutoZone zone = new AutoZone();
228228
zone.setUcServers(new String[]{Config.preQueryHost02});
229-
final UpToken token = UpToken.parse(TestConfig.commonToken);
229+
final UpToken token = UpToken.parse(TestConfig.common_token);
230230

231231
final TestParam param = new TestParam();
232232

‎library/src/androidTest/java/com/qiniu/android/http/HttpTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import com.qiniu.android.utils.LogUtil;
1313
import com.qiniu.android.utils.StringMap;
1414

15-
import junit.framework.Assert;
16-
1715
import org.json.JSONObject;
1816
import org.junit.Before;
1917
import org.junit.Test;
@@ -51,7 +49,7 @@ public void setUp() throws Exception {
5149
public void testPost1() throws Throwable {
5250

5351
httpManager.asyncPost("https://up-na0.qiniup.com",
54-
"hello".getBytes(), null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
52+
"hello".getBytes(), null, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
5553
null, new CompletionHandler() {
5654
@Override
5755
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -80,7 +78,7 @@ public boolean shouldWait() {
8078
public void testPost2() throws Throwable {
8179

8280
httpManager.asyncPost("https://up.qiniup.com", "hello".getBytes(), null,
83-
UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
81+
UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
8482
null, new CompletionHandler() {
8583
@Override
8684
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -109,7 +107,7 @@ public void testPost3() throws Throwable {
109107
public void run() {
110108

111109
httpManager.asyncPost("https://httpbin.org/status/500", "hello".getBytes(),
112-
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
110+
null, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
113111
null, new CompletionHandler() {
114112
@Override
115113
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -141,7 +139,7 @@ public void testPost4() throws Throwable {
141139
public void run() {
142140
httpManager.asyncPost("https://httpbin.org/status/418",
143141
"hello".getBytes(),
144-
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
142+
null, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
145143
null, new CompletionHandler() {
146144
@Override
147145
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -171,7 +169,7 @@ private void testPostNoDomain() throws Throwable {
171169

172170

173171
httpManager.asyncPost("https://no-domain.qiniu.com", "hello".getBytes(),
174-
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
172+
null, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
175173
null, new CompletionHandler() {
176174
@Override
177175
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -223,7 +221,7 @@ private void testPostIP() throws Throwable {
223221
StringMap x = new StringMap().put("Host", "up.qiniu.com");
224222

225223
httpManager.asyncPost("http://124.160.115.112", "hello".getBytes(),
226-
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
224+
x, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
227225
null, new CompletionHandler() {
228226
@Override
229227
public void complete(ResponseInfo rinfo, JSONObject response) {
@@ -253,7 +251,7 @@ private void testProxy() throws Throwable {
253251
Client c = new Client(p, 10, 30, null, null);
254252

255253
c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
256-
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
254+
x, UpToken.parse(TestConfig.common_token), "hello".getBytes().length,
257255
null, new CompletionHandler() {
258256
@Override
259257
public void complete(ResponseInfo rinfo, JSONObject response) {

‎library/src/androidTest/java/com/qiniu/android/http/HttpsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void testPost1() throws Throwable {
4545

4646
info = null;
4747
httpManager.asyncPost("https://up-na0.qiniup.com", "hello".getBytes(), null,
48-
UpToken.parse(TestConfig.commonToken), "hello".getBytes().length, null, new CompletionHandler() {
48+
UpToken.parse(TestConfig.common_token), "hello".getBytes().length, null, new CompletionHandler() {
4949
@Override
5050
public void complete(ResponseInfo rinfo, JSONObject response) {
5151
LogUtil.d(rinfo.toString());

‎library/src/androidTest/java/com/qiniu/android/http/request/RequestTransactionTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import com.qiniu.android.storage.UploadOptions;
1313
import com.qiniu.android.utils.LogUtil;
1414

15-
import junit.framework.Assert;
16-
1715
import org.json.JSONException;
1816
import org.json.JSONObject;
1917
import org.junit.Test;

0 commit comments

Comments
 (0)