update qcloud sdk to 5.9.32

Author: jordanqin

QCloudCosXml/cos-android-base/build.gradle

@@ -6,8 +6,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50929
-        versionName '5.9.29'
+        versionCode 50930
+        versionName '5.9.30'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/CosXmlBaseService.java

@@ -41,6 +41,7 @@
 import com.tencent.cos.xml.model.object.GetObjectBytesResult;
 import com.tencent.cos.xml.model.object.GetObjectRequest;
 import com.tencent.cos.xml.model.object.GetObjectResult;
+import com.tencent.cos.xml.model.object.SaveLocalRequest;
 import com.tencent.cos.xml.model.object.UploadPartRequest;
 import com.tencent.cos.xml.model.object.UploadPartResult;
 import com.tencent.cos.xml.model.object.UploadRequest;
@@ -385,16 +386,16 @@ protected String getRequestHost(CosXmlRequest request) throws CosXmlClientExcept
             httpRequestBuilder.body(cosXmlRequest.getRequestBody());
         }
 
-        if (cosXmlRequest instanceof GetObjectRequest) {
-            GetObjectRequest getObjectRequest = (GetObjectRequest) cosXmlRequest;
-            if (!TextUtils.isEmpty(getObjectRequest.getDownloadPath())) {
+        if (cosXmlRequest instanceof SaveLocalRequest) {
+            SaveLocalRequest saveLocalRequest = (SaveLocalRequest) cosXmlRequest;
+            if (!TextUtils.isEmpty(saveLocalRequest.getSaveLocalPath())) {
                 httpRequestBuilder.converter(new ResponseFileBodySerializer<T2>((GetObjectResult) cosXmlResult,
-                        getObjectRequest.getDownloadPath(), getObjectRequest.getFileOffset()));
-            } else if (getObjectRequest.getFileContentUri() != null) {
+                        saveLocalRequest.getSaveLocalPath(), saveLocalRequest.getSaveLocalOffset()));
+            } else if (saveLocalRequest.getSaveLocalUri() != null) {
                 httpRequestBuilder.converter(new ResponseFileBodySerializer<T2>((GetObjectResult) cosXmlResult,
-                        getObjectRequest.getFileContentUri(),
+                        saveLocalRequest.getSaveLocalUri(),
                         ContextHolder.getAppContext().getContentResolver(),
-                        getObjectRequest.getFileOffset()));
+                        saveLocalRequest.getSaveLocalOffset()));
             }
         } else if (cosXmlRequest instanceof GetObjectBytesRequest) {
             httpRequestBuilder.converter(new ResponseBytesConverter<T2>((GetObjectBytesResult) cosXmlResult));

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/model/EmptyResponseResult.java

@@ -0,0 +1,21 @@
+package com.tencent.cos.xml.model;
+
+import com.tencent.cos.xml.exception.CosXmlClientException;
+import com.tencent.cos.xml.exception.CosXmlServiceException;
+import com.tencent.qcloud.core.http.HttpResponse;
+
+/**
+ * 空响应结果
+ * <p>
+ * Created by jordanqin on 2024/7/18 14:52.
+ * Copyright 2010-2020 Tencent Cloud. All Rights Reserved.
+ */
+public class EmptyResponseResult extends CosXmlResult {
+    /**
+     * @see CosXmlResult#parseResponseBody(HttpResponse)
+     */
+    @Override
+    public void parseResponseBody(HttpResponse response)  throws CosXmlClientException, CosXmlServiceException {
+        super.parseResponseBody(response);
+    }
+}

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/model/object/GetObjectRequest.java

@@ -45,7 +45,7 @@
  * @see BaseCosXml#getObject(GetObjectRequest)
  * @see BaseCosXml#getObjectAsync(GetObjectRequest, CosXmlResultListener)
  */
-public class GetObjectRequest extends ObjectRequest implements TransferRequest {
+public class GetObjectRequest extends ObjectRequest implements SaveLocalRequest, TransferRequest {
 
     private String rspContentType;
     private String rspContentLanguage;
@@ -365,6 +365,21 @@ public Uri getFileContentUri() {
         return fileContentUri;
     }
 
+    @Override
+    public String getSaveLocalPath() {
+        return getDownloadPath();
+    }
+
+    @Override
+    public Uri getSaveLocalUri() {
+        return getFileContentUri();
+    }
+
+    @Override
+    public long getSaveLocalOffset() {
+        return getFileOffset();
+    }
+
     @Override
     public String getMethod() {
         return RequestMethod.GET;

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/model/object/SaveLocalRequest.java

@@ -0,0 +1,25 @@
+package com.tencent.cos.xml.model.object;
+
+import android.net.Uri;
+
+/**
+ * 需要将body保存到本地的请求
+ * <p>
+ * Created by jordanqin on 2023/12/25 17:30.
+ * Copyright 2010-2020 Tencent Cloud. All Rights Reserved.
+ */
+public interface SaveLocalRequest {
+    /**
+     * 获取文件本地保存路径
+     * @return 本地保存路径
+     */
+    String getSaveLocalPath();
+
+    /**
+     * 获取文件本地保存uri
+     * @return 本地保存uri
+     */
+    Uri getSaveLocalUri();
+
+    long getSaveLocalOffset();
+}

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/common/OneTimeCredentialTest.java

@@ -345,6 +345,52 @@ public void onFail(CosXmlClientException exception, CosXmlServiceException servi
         testLocker.lock();
     }
 
+    @Test
+    public void testPreBuildConnectionFail() {
+        CosXmlSimpleService cosXmlService = ServiceFactory.INSTANCE.newAnonymousService();
+        PreBuildConnectionRequest request = new PreBuildConnectionRequest(TestConst.PERSIST_BUCKET);
+        boolean b1 = cosXmlService.preBuildConnection(request);
+
+        PreBuildConnectionRequest request1 = new PreBuildConnectionRequest("fail-1253960454");
+        boolean b2 = cosXmlService.preBuildConnection(request1);
+
+        final boolean[] b3 = {false};
+        final TestLocker testLocker = new TestLocker();
+        cosXmlService.preBuildConnectionAsync(request, new CosXmlResultSimpleListener() {
+            @Override
+            public void onSuccess() {
+                b3[0] = true;
+                testLocker.release();
+            }
+
+            @Override
+            public void onFail(CosXmlClientException exception, CosXmlServiceException serviceException) {
+                b3[0] = false;
+                testLocker.release();
+            }
+        });
+        testLocker.lock();
+
+        final boolean[] b4 = {false};
+        final TestLocker testLocker1 = new TestLocker();
+        PreBuildConnectionRequest request2 = new PreBuildConnectionRequest("fail-1253960454");
+        cosXmlService.preBuildConnectionAsync(request2, new CosXmlResultSimpleListener() {
+            @Override
+            public void onSuccess() {
+                b4[0] = false;
+                testLocker1.release();
+            }
+
+            @Override
+            public void onFail(CosXmlClientException exception, CosXmlServiceException serviceException) {
+                b4[0] = true;
+                testLocker1.release();
+            }
+        });
+        Assert.assertTrue(b1 && !b2 && b3[0] &&!b4[0]);
+        testLocker1.lock();
+    }
+
     @Test
     public void testHeadObject() {
         CosXmlSimpleService cosXmlService = ServiceFactory.INSTANCE.newAnonymousService();

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java

@@ -50,6 +50,10 @@ public class TestConst {
     public static final String AUDIT_BUCKET_DOCUMENT = "student.ppt";
     public static final String AUDIT_WEBPAGE = "https://tech.meituan.com/2021/06/10/react-native-hybrid-practice-dsl-in-meituan.html";
 
+    // AI内容识别
+    public static final String AI_RECOGNITION_BUCKET = "ai-recognition-1253960454";
+    public static final String AI_RECOGNITION_IMAGE = "image.jpg";
+
     //声音识别
     public static final String ASR_BUCKET_REGION = "ap-guangzhou";
     public static final String ASR_BUCKET = "ci-auditing-sample-1253960454";