update qcloud sdk to 1.5.26

Author: tothetruth

QCloudFoundation/.idea/caches/build_file_checksums.ser

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10525
-        versionName "1.5.25"
+        versionCode 10526
+        versionName "1.5.26"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudFoundation/.idea/compiler.xml

@@ -272,6 +272,11 @@ public Builder<T> encodedQuery(String key, String value) {
             return this;
         }
 
+        public Builder<T> encodedQuery(String queryString) {
+            httpUrlBuilder.encodedQuery(queryString);
+            return this;
+        }
+
         public Builder<T> query(Map<String, String> nameValues) {
             if (nameValues != null) {
                 for (Map.Entry<String, String> entry : nameValues.entrySet()) {

QCloudFoundation/.idea/gradle.xml

@@ -23,13 +23,18 @@
 package com.tencent.qcloud.core.http;
 
 
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.text.TextUtils;
+
 import com.tencent.qcloud.core.common.QCloudClientException;
 import com.tencent.qcloud.core.common.QCloudProgressListener;
 import com.tencent.qcloud.core.common.QCloudServiceException;
 import com.tencent.qcloud.core.util.QCloudHttpUtils;
 
 import java.io.*;
 
+import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.internal.Util;
 import okio.Buffer;
@@ -38,6 +43,9 @@
 public class ResponseFileConverter<T> extends ResponseBodyConverter<T> implements ProgressBody {
 
     private String filePath;
+    private Uri contentUri;
+    private ContentResolver contentResolver;
+
     private long offset;
 
     protected boolean isQuic = false;
@@ -51,6 +59,12 @@ public ResponseFileConverter(String filePath, long offset) {
         this.offset = offset;
     }
 
+    public ResponseFileConverter(Uri contentUri, ContentResolver contentResolver, long offset) {
+        this.contentUri = contentUri;
+        this.contentResolver = contentResolver;
+        this.offset = offset;
+    }
+
     @Override
     public void setProgressListener(QCloudProgressListener progressListener) {
         this.progressListener = progressListener;
@@ -80,6 +94,39 @@ public T convert(HttpResponse<T> response) throws QCloudClientException, QCloudS
             contentLength = response.contentLength();
         }
 
+        if (!TextUtils.isEmpty(filePath)) {
+            return downloadToAbsolutePath(response, contentLength);
+        } else if (contentUri != null) {
+            return pipeToContentUri(response, contentLength);
+        }
+
+        throw new QCloudClientException(new IllegalArgumentException("filePath or ContentUri are both null"));
+    }
+
+    private T pipeToContentUri(HttpResponse<T> response, long contentLength)
+            throws QCloudClientException, QCloudServiceException {
+        OutputStream output = getOutputStream();
+        InputStream input = response.byteStream();
+
+        byte[] buffer = new byte[8192];
+        countingSink = new CountingSink(new Buffer(), contentLength, progressListener);
+        int len;
+        try {
+            while ((len = input.read(buffer)) != -1) {
+                output.write(buffer, 0, len);
+                countingSink.writeBytesInternal(len);
+            }
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new QCloudClientException("write local uri error for " + e.toString(), e);
+        } finally {
+            Util.closeQuietly(output);
+        }
+    }
+
+    private T downloadToAbsolutePath(HttpResponse<T> response, long contentLength)
+            throws QCloudClientException, QCloudServiceException {
         File downloadFilePath = new File(filePath);
         File parentDir = downloadFilePath.getParentFile();
         if(parentDir != null && !parentDir.exists() && !parentDir.mkdirs()){
@@ -121,16 +168,25 @@ private void writeRandomAccessFile(File downloadFilePath, InputStream inputStrea
     }
 
     public OutputStream getOutputStream() throws QCloudClientException {
-        File downloadFilePath = new File(filePath);
-        File parentDir = downloadFilePath.getParentFile();
-        if(parentDir != null && !parentDir.exists() && !parentDir.mkdirs()){
-            throw new QCloudClientException(new IOException("local file directory can not create."));
-        }
-        try {
-            OutputStream outputStream = new FileOutputStream(downloadFilePath);
-            return outputStream;
-        } catch (FileNotFoundException e) {
-           throw new QCloudClientException(e);
+        if (!TextUtils.isEmpty(filePath)) {
+            File downloadFilePath = new File(filePath);
+            File parentDir = downloadFilePath.getParentFile();
+            if(parentDir != null && !parentDir.exists() && !parentDir.mkdirs()){
+                throw new QCloudClientException(new IOException("local file directory can not create."));
+            }
+            try {
+                return new FileOutputStream(downloadFilePath);
+            } catch (FileNotFoundException e) {
+                throw new QCloudClientException(e);
+            }
+        } else if (contentUri != null){
+            try {
+                return contentResolver.openOutputStream(contentUri);
+            } catch (FileNotFoundException e) {
+                throw new QCloudClientException(e);
+            }
+        } else {
+            throw new QCloudClientException(new IllegalArgumentException("filePath or ContentUri are both null"));
         }
     }