update qcloud sdk to 5.8.9

Author: jordanqin

QCloudCosXml/cos-android-base/build.gradle

@@ -18,8 +18,8 @@ android {
     buildTypes {
         debug {
             testCoverageEnabled = true
-//            it.buildConfigField "int", "VERSION_CODE", "${defaultConfig.versionCode}"
-//            it.buildConfigField "String","VERSION_NAME","\"${defaultConfig.versionName}\""
+            it.buildConfigField "int", "VERSION_CODE", "${defaultConfig.versionCode}"
+            it.buildConfigField "String","VERSION_NAME","\"${defaultConfig.versionName}\""
 
             it.buildConfigField 'String', 'OWNER_UIN', quotWrapper(System.getenv("OWNER_UIN"))
             it.buildConfigField 'String', 'COS_APPID', quotWrapper(System.getenv("COS_APPID"))
@@ -42,8 +42,8 @@ android {
         }
 
         release {
-//            it.buildConfigField "int", "VERSION_CODE", "${defaultConfig.versionCode}"
-//            it.buildConfigField "String","VERSION_NAME","\"${defaultConfig.versionName}\""
+            it.buildConfigField "int", "VERSION_CODE", "${defaultConfig.versionCode}"
+            it.buildConfigField "String","VERSION_NAME","\"${defaultConfig.versionName}\""
 
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

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

@@ -64,6 +64,7 @@
 import com.tencent.qcloud.core.http.QCloudHttpClient;
 import com.tencent.qcloud.core.http.QCloudHttpRequest;
 import com.tencent.qcloud.core.http.QCloudHttpRetryHandler;
+import com.tencent.qcloud.core.logger.AndroidLogcatAdapter;
 import com.tencent.qcloud.core.logger.FileLogAdapter;
 import com.tencent.qcloud.core.logger.QCloudLogger;
 import com.tencent.qcloud.core.task.QCloudTask;
@@ -130,6 +131,11 @@ public CosXmlBaseService(Context context, CosXmlServiceConfig configuration) {
             LogServerProxy.init(context, fileLogAdapter);
             QCloudLogger.addAdapter(fileLogAdapter);
         }
+        if(configuration.isDebuggable()){
+            AndroidLogcatAdapter logcatAdapter = new AndroidLogcatAdapter();
+            QCloudLogger.addAdapter(logcatAdapter);
+        }
+
         BeaconService.init(context.getApplicationContext(), configuration);
         appCachePath = context.getApplicationContext().getFilesDir().getPath();
 

QCloudCosXml/cos-android/build.gradle

@@ -84,7 +84,7 @@ android {
 
     // 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
     defaultPublishConfig "normalRelease"
-    //  defaultPublishConfig  "slimRelease"
+//      defaultPublishConfig  "slimRelease"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_7

QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/transfer/UploadPartsTask.java

@@ -22,10 +22,11 @@
 
 package com.tencent.cos.xml.transfer;
 
+import static com.tencent.cos.xml.common.ClientErrorCode.ETAG_NOT_FOUND;
+
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.SparseArray;
-import android.util.SparseLongArray;
 
 import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.crypto.COSDirect;
@@ -52,8 +53,6 @@
 import bolts.Task;
 import bolts.TaskCompletionSource;
 
-import static com.tencent.cos.xml.common.ClientErrorCode.ETAG_NOT_FOUND;
-
 
 abstract class BaseUploadPartsTask {
 
@@ -240,7 +239,7 @@ synchronized private void mergeTaskMetrics(HttpTaskMetrics httpTaskMetrics) {
  */
 class ParallelUploadPartsTask extends BaseUploadPartsTask {
 
-    private Set<UploadPartRequest> runningRequestSet = Collections.synchronizedSet(new HashSet<UploadPartRequest>());
+    private final Set<UploadPartRequest> runningRequestSet = Collections.synchronizedSet(new HashSet<UploadPartRequest>());
     private TaskCompletionSource<Set<COSUploadTask.UploadPart>> tcs = new TaskCompletionSource<>();
     private SparseArray<Long> uploadPartProgress = new SparseArray<>();
     private AtomicLong mTotalProgress = new AtomicLong(0);
@@ -269,13 +268,16 @@ public void onProgress(long complete, long target) {
                     updateProgress(uploadPartRequest, complete);
                 }
             });
-            runningRequestSet.add(uploadPartRequest);
+            synchronized(runningRequestSet) {
+                runningRequestSet.add(uploadPartRequest);
+            }
 
             mCosDirect.uploadPartAsync(uploadPartRequest, new CosXmlResultListener() {
                 @Override
                 public void onSuccess(CosXmlRequest request, CosXmlResult result) {
-
-                    runningRequestSet.remove(uploadPartRequest);
+                    synchronized(runningRequestSet) {
+                        runningRequestSet.remove(uploadPartRequest);
+                    }
                     UploadPartResult uploadPartResult = (UploadPartResult) result;
                     String eTag = uploadPartResult.eTag;
                     COSTransferTask.loggerInfo(TAG, taskId, "upload part %d, etag=%s", partNumber, eTag);
@@ -343,8 +345,10 @@ public void cancel() {
     }
 
     private void cancelAllUploadingRequests() {
-        for (UploadPartRequest request : runningRequestSet) {
-            mCosDirect.cancel(request);
+        synchronized(runningRequestSet) {
+            for (UploadPartRequest request : runningRequestSet) {
+                mCosDirect.cancel(request);
+            }
         }
     }
 }

QCloudCosXml/version.gradle

@@ -22,6 +22,6 @@
  */
 
 ext {
-    cosSdkVersionCode = 50807
-    cosSdkVersionName = '5.8.7'
+    cosSdkVersionCode = 50809
+    cosSdkVersionName = '5.8.9'
 }