callback body support 'null' (#518)

YangSen-qn · YangSen-qn · web-flow · commit 93def7ffbd1b · 2025-07-24T09:55:21.000+08:00
Co-authored-by: YangSen-qn &lt;yangsen@qiniu.com&gt;
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 #Changelog
+## 8.9.1（2025-07-23）
+* 增加
+  * 上传回调 Body 支持返回 null 字符串
+
 ## 8.9.0（2025-06-12）
 * 调整
   * 分片上传版本默认调整为 V2
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 | 7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：8.8.0
+* 推荐使用最新版：8.9.1
 * 7.6.2 ~ 8.3.2 AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
 ```
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
diff --git a/library/src/androidTest/java/com/qiniu/android/TestConfig.java b/library/src/androidTest/java/com/qiniu/android/TestConfig.java
@@ -70,5 +70,5 @@ public final class TestConfig {
     /**
      * 测试通用的token
      */
-    public static final String COMMON_TOKEN = BUCKET_NA0;
+    public static final String COMMON_TOKEN = TOKEN_NA0;
 }
diff --git a/library/src/androidTest/java/com/qiniu/android/storage/RetryTest.java b/library/src/androidTest/java/com/qiniu/android/storage/RetryTest.java
@@ -168,7 +168,7 @@ public void progress(String key, double percent) {
                 LogUtil.i(("progress:" + percent));
             }
         }, null);
-        uploadManager.put(f, expectKey, TestConfig.BUCKET_NA0, new UpCompletionHandler() {
+        uploadManager.put(f, expectKey, TestConfig.COMMON_TOKEN, new UpCompletionHandler() {
 
             public void complete(String k, ResponseInfo rinfo, JSONObject response) {
 
diff --git a/library/src/androidTest/java/com/qiniu/android/storage/UploadBaseTest.java b/library/src/androidTest/java/com/qiniu/android/storage/UploadBaseTest.java
@@ -76,7 +76,7 @@ protected void uploadFileAndAssertResult(int statusCode,
                                              Configuration configuration,
                                              UploadOptions options) {
 
-        uploadFileAndAssertResult(statusCode, file, TestConfig.BUCKET_NA0, key, configuration, options);
+        uploadFileAndAssertResult(statusCode, file, TestConfig.COMMON_TOKEN, key, configuration, options);
     }
 
     protected void uploadFileAndAssertResult(int statusCode,
@@ -85,7 +85,7 @@ protected void uploadFileAndAssertResult(int statusCode,
                                              Configuration configuration,
                                              UploadOptions options) {
 
-        uploadFileAndAssertResult(statusCode, file, TestConfig.BUCKET_NA0, key, configuration, options);
+        uploadFileAndAssertResult(statusCode, file, TestConfig.COMMON_TOKEN, key, configuration, options);
     }
 
     protected void uploadFileAndAssertResult(int statusCode,
@@ -190,7 +190,7 @@ protected void upload(UploadInfo file,
                           UploadOptions options,
                           UpCompletionHandler completionHandler) {
 
-        upload(file, TestConfig.BUCKET_NA0, key, configuration, options, completionHandler);
+        upload(file, TestConfig.COMMON_TOKEN, key, configuration, options, completionHandler);
     }
 
     protected void upload(UploadInfo file,
diff --git a/library/src/androidTest/java/com/qiniu/android/storage/UriTest.java b/library/src/androidTest/java/com/qiniu/android/storage/UriTest.java
@@ -102,7 +102,7 @@ private void testUpload(Uri uri, String fileName, String etag, boolean isHttps,
         key += isConcurrent ? "serial_" : "concurrent_";
         key += fileName;
         final UploadCompleteInfo completeInfo = new UploadCompleteInfo();
-        uploadManager.put(uri, null, key, TestConfig.BUCKET_NA0, new UpCompletionHandler() {
+        uploadManager.put(uri, null, key, TestConfig.COMMON_TOKEN, new UpCompletionHandler() {
             @Override
             public void complete(String key, ResponseInfo info, JSONObject response) {
                 completeInfo.key = key;
diff --git a/library/src/androidTest/java/com/qiniu/android/storage/serverConfig/ServerConfigTest.java b/library/src/androidTest/java/com/qiniu/android/storage/serverConfig/ServerConfigTest.java
@@ -17,7 +17,7 @@ public class ServerConfigTest extends BaseTest {
     public void testMonitor() {
         ServerConfigMonitor.removeConfigCache();
         ServerConfigMonitor.startMonitor();
-        ServerConfigMonitor.setToken(TestConfig.BUCKET_NA0);
+        ServerConfigMonitor.setToken(TestConfig.COMMON_TOKEN);
 
         wait(new WaitConditional() {
             @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
@@ -9,7 +9,7 @@ public final class Constants {
     /**
      * SDK 版本号
      */
-    public static final String VERSION = "8.9.0";
+    public static final String VERSION = "8.9.1";
 
     /**
      * UTF-8 编码
diff --git a/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java b/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java
@@ -579,8 +579,8 @@ private int getStatusCodeByException(Exception e) {
 
     private static JSONObject buildJsonResp(byte[] body) throws Exception {
         String str = new String(body, Constants.UTF_8);
-        // 允许 空 字符串
-        if (StringUtils.isNullOrEmpty(str)) {
+        // 允许 空 和 null 字符串
+        if (StringUtils.isNullOrEmpty(str) || str.equalsIgnoreCase("null")) {
             return new JSONObject();
         }
         return new JSONObject(str);

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,5 @@ public final class TestConfig {`
`70`	`70`	`/**`
`71`	`71`	`* 测试通用的token`
`72`	`72`	`*/`
`73`		`- public static final String COMMON_TOKEN = BUCKET_NA0;`
	`73`	`+ public static final String COMMON_TOKEN = TOKEN_NA0;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public void progress(String key, double percent) {`
`168`	`168`	`LogUtil.i(("progress:" + percent));`
`169`	`169`	`}`
`170`	`170`	`}, null);`
`171`		`- uploadManager.put(f, expectKey, TestConfig.BUCKET_NA0, new UpCompletionHandler() {`
	`171`	`+ uploadManager.put(f, expectKey, TestConfig.COMMON_TOKEN, new UpCompletionHandler() {`
`172`	`172`
`173`	`173`	`public void complete(String k, ResponseInfo rinfo, JSONObject response) {`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected void uploadFileAndAssertResult(int statusCode,`
`76`	`76`	`Configuration configuration,`
`77`	`77`	`UploadOptions options) {`
`78`	`78`
`79`		`- uploadFileAndAssertResult(statusCode, file, TestConfig.BUCKET_NA0, key, configuration, options);`
	`79`	`+ uploadFileAndAssertResult(statusCode, file, TestConfig.COMMON_TOKEN, key, configuration, options);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`protected void uploadFileAndAssertResult(int statusCode,`
`@@ -85,7 +85,7 @@ protected void uploadFileAndAssertResult(int statusCode,`
`85`	`85`	`Configuration configuration,`
`86`	`86`	`UploadOptions options) {`
`87`	`87`
`88`		`- uploadFileAndAssertResult(statusCode, file, TestConfig.BUCKET_NA0, key, configuration, options);`
	`88`	`+ uploadFileAndAssertResult(statusCode, file, TestConfig.COMMON_TOKEN, key, configuration, options);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`protected void uploadFileAndAssertResult(int statusCode,`
`@@ -190,7 +190,7 @@ protected void upload(UploadInfo file,`
`190`	`190`	`UploadOptions options,`
`191`	`191`	`UpCompletionHandler completionHandler) {`
`192`	`192`
`193`		`- upload(file, TestConfig.BUCKET_NA0, key, configuration, options, completionHandler);`
	`193`	`+ upload(file, TestConfig.COMMON_TOKEN, key, configuration, options, completionHandler);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`protected void upload(UploadInfo file,`