update qcloud sdk to 1.5.33

Author: tothetruth

QCloudFoundation/foundation/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10531
-        versionName "1.5.31"
+        versionCode 10533
+        versionName "1.5.33"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -36,7 +36,7 @@ android {
 
 dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    api 'com.squareup.okhttp3:okhttp:3.12.1'
     api 'com.parse.bolts:bolts-tasks:1.4.0'
 
     androidTestImplementation 'androidx.annotation:annotation:1.0.0'
@@ -46,6 +46,8 @@ dependencies {
     testCompileOnly 'org.mockito:mockito-core:1.10.19'
 
     compileOnly 'androidx.appcompat:appcompat:1.0.0'
+
+    compileOnly 'com.tencent.qcloud:beacon-android-release:4.1.13'
 }
 
 project.extensions.add('artifactId', 'qcloud-foundation')

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpRequest.java

@@ -36,6 +36,7 @@
 import java.util.Set;
 
 import okhttp3.CacheControl;
+import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.Request;
@@ -331,6 +332,23 @@ public Builder<T> addHeaders(Map<String, List<String>> headers) {
             return this;
         }
 
+        public Builder<T> addHeadersUnsafeNonAscii(Map<String, List<String>> headers) {
+            if (headers != null) {
+                Headers.Builder headerBuilder = new Headers.Builder();
+                for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+                    String name = entry.getKey();
+                    for (String value : entry.getValue()) {
+                        if (name != null && value != null) {
+                            headerBuilder.addUnsafeNonAscii(name, value);
+                            addHeaderNameValue(this.headers, name, value);
+                        }
+                    }
+                }
+                requestBuilder.headers(headerBuilder.build());
+            }
+            return this;
+        }
+
         public Builder<T> removeHeader(String name) {
             requestBuilder.removeHeader(name);
             headers.remove(name);

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTask.java

@@ -236,6 +236,11 @@ protected HttpResult<T> execute() throws QCloudClientException, QCloudServiceExc
                     e.printStackTrace();
                 }
             }
+
+            if (httpRequest.getRequestBody() instanceof StreamingRequestBody) {
+                ((StreamingRequestBody) httpRequest.getRequestBody()).release();
+            }
+
             metrics.onTaskEnd();
         }
     }

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTaskMetrics.java

@@ -294,6 +294,8 @@ synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
     @Override
     public String toString() {
         return new StringBuilder().append("Http Metrics: \n")
+                .append("domain : ").append(domainName).append("\n")
+                .append("dns : ").append(connectAddress != null ? connectAddress.getHostAddress() : "null").append("\n")
                 .append("fullTaskTookTime : ").append(fullTaskTookTime()).append("\n")
                 .append("calculateMD5STookTime : ").append(calculateMD5STookTime()).append("\n")
                 .append("signRequestTookTime : ").append(signRequestTookTime()).append("\n")

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpClient.java

@@ -251,15 +251,15 @@ public Builder() {
 
         public Builder setConnectionTimeout(int connectionTimeout) {
             if (connectionTimeout < 3 * 1000) {
-                throw new IllegalArgumentException("connection timeout must be larger than 10 seconds.");
+                throw new IllegalArgumentException("connection timeout must be larger than 3 seconds.");
             }
             this.connectionTimeout = connectionTimeout;
             return this;
         }
 
         public Builder setSocketTimeout(int socketTimeout) {
             if (socketTimeout < 3 * 1000) {
-                throw new IllegalArgumentException("socket timeout must be larger than 10 seconds.");
+                throw new IllegalArgumentException("socket timeout must be larger than 3 seconds.");
             }
             this.socketTimeout = socketTimeout;
             return this;

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpRequest.java

@@ -22,7 +22,6 @@
 
 package com.tencent.qcloud.core.http;
 
-
 import com.tencent.qcloud.core.auth.QCloudSignSourceProvider;
 import com.tencent.qcloud.core.auth.QCloudSigner;
 import com.tencent.qcloud.core.auth.STSCredentialScope;

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/StreamingRequestBody.java

@@ -67,6 +67,8 @@ public class StreamingRequestBody extends RequestBody implements ProgressBody, Q
 
     protected CountingSink countingSink;
 
+    private boolean deleteFileWhenComplete = false;
+
     public void setProgressListener(QCloudProgressListener progressListener) {
         this.progressListener = progressListener;
     }
@@ -115,7 +117,7 @@ static StreamingRequestBody steam(InputStream inputStream, File tmpFile, String
         requestBody.file = tmpFile;
         requestBody.offset = offset < 0 ? 0 : offset;
         requestBody.requiredLength = length;
-
+        requestBody.deleteFileWhenComplete = true;
         return requestBody;
     }
 
@@ -293,4 +295,14 @@ public String onGetMd5() throws IOException {
             if(inputStream != null)Util.closeQuietly(inputStream);
         }
     }
+
+    //
+    public void release() {
+        if (deleteFileWhenComplete) {
+            if (file != null) {
+                file.delete();
+            }
+        }
+
+    }
 }

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/RetryInterceptor.java

@@ -207,10 +207,6 @@ Response processRequest(Chain chain, Request request, HttpTask task) throws IOEx
             } else if (shouldRetry(request, response, attempts, task.getWeight(), startTime, e, statusCode) && !task.isCanceled()) {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s failed for %s, code is %d", request, e, statusCode);
                 retryStrategy.onTaskEnd(false, e);
-                if (response != null && response.body() != null) {
-                    response.close();
-                }
-
             } else {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s ends for %s, code is %d", request, e, statusCode);
                 break;
@@ -331,7 +327,6 @@ private int getHostReliable(String host) {
 
 
     private boolean shouldRetry(Request request, Response response, int attempts, int weight, long startTime, IOException e, int statusCode) {
-
         if (isUserCancelled(e)) {
             return false;
         }

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/track/TrackService.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010-2020 Tencent Cloud. All rights reserved.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.tencent.qcloud.core.track;
+
+import android.content.Context;
+import com.tencent.beacon.event.open.BeaconConfig;
+import com.tencent.beacon.event.open.BeaconEvent;
+import com.tencent.beacon.event.open.BeaconReport;
+import com.tencent.beacon.event.open.EventResult;
+import com.tencent.beacon.event.open.EventType;
+import com.tencent.qcloud.core.logger.QCloudLogger;
+import com.tencent.qcloud.core.util.QCloudStringUtils;
+
+import java.util.Map;
+
+/**
+ * 灯塔服务
+ */
+public class TrackService {
+
+    private static final String TAG = "TrackService";
+    private static String beaconKey;
+    private static boolean debug = false;
+    private Context context;
+    private static TrackService instance;
+
+    private TrackService(Context context) {
+        this.context = context.getApplicationContext();
+    }
+
+    /**
+     * 初始化
+     */
+    public static void init(Context context, String beaconKey, boolean debug) {
+        synchronized (TrackService.class) {
+            if (instance == null) {
+                instance = new TrackService(context);
+                TrackService.beaconKey = beaconKey;
+                TrackService.debug = debug;
+                if(isIncludeBeacon()) {
+                    BeaconConfig.Builder builder = BeaconConfig.builder()
+                            .auditEnable(false)
+                            .bidEnable(false)
+                            .qmspEnable(false)
+                            .pagePathEnable(false)
+                            .setNormalPollingTime(30000);
+                    try {
+                        builder.collectMACEnable(false)
+                                .collectIMEIEnable(false)
+                                .collectAndroidIdEnable(false)
+                                .collectProcessInfoEnable(false);
+                    } catch (NoSuchMethodError error) {
+                        //APP使用了标准版的灯塔SDK builder不支持collectXXX
+                    }
+                    BeaconConfig config = builder.build();
+
+                    BeaconReport beaconReport = BeaconReport.getInstance();
+                    beaconReport.setLogAble(debug);//是否打开日志
+                    try {
+                        beaconReport.setCollectMac(false); //该项设为false即关闭采集Mac功能
+                        beaconReport.setCollectAndroidID(false); //该项设为false即关闭采集AndroidId功能
+                        beaconReport.setCollectImei(false); //该项设为false即关闭采集IMEI和IMSI的功能
+                        beaconReport.setCollectProcessInfo(false); //该项设为false即关闭采集processInfo功能
+                    } catch (NoSuchMethodError error) {
+                    }
+                    beaconReport.start(context, beaconKey, config);
+                    //某些灯塔sdk版本，start之前setCollectMac等无效
+                    try {
+                        beaconReport.setCollectMac(false); //该项设为false即关闭采集Mac功能
+                        beaconReport.setCollectAndroidID(false); //该项设为false即关闭采集AndroidId功能
+                        beaconReport.setCollectImei(false); //该项设为false即关闭采集IMEI和IMSI的功能
+                        beaconReport.setCollectProcessInfo(false); //该项设为false即关闭采集processInfo功能
+                    } catch (NoSuchMethodError error) {
+                    }
+                }
+            }
+        }
+    }
+
+    public static TrackService getInstance() {
+        return instance;
+    }
+
+
+    public void track(String beaconKey, String eventCode, Map<String, String> params) {
+        if(!isIncludeBeacon()) return;
+        String trackBeaconKey = TrackService.beaconKey;
+        if (beaconKey != null) {
+            trackBeaconKey = beaconKey;
+        }
+        BeaconEvent.Builder builder = BeaconEvent.builder()
+                .withAppKey(trackBeaconKey)
+                .withCode(eventCode)
+                .withType(EventType.NORMAL)
+                .withParams(params);
+        try {
+            builder.withIsSimpleParams(true);
+        } catch (NoSuchMethodError error) {
+            //APP使用了标准版的灯塔SDK 不支持withIsSimpleParams
+        }
+        EventResult result = BeaconReport.getInstance().report(builder.build());
+        if (debug) {
+            StringBuilder mapAsString = new StringBuilder("{");
+            for (String key : params.keySet()) {
+                mapAsString.append(key + "=" + params.get(key) + ", ");
+            }
+            mapAsString.delete(mapAsString.length() - 2, mapAsString.length()).append("}");
+            QCloudLogger.i(TAG, "eventCode: %s, params: %s => result{ eventID: %s, errorCode: %d, errorMsg: %s}",
+                    eventCode, mapAsString, result.eventID, result.errorCode, result.errMsg);
+        }
+    }
+
+
+    private static boolean isIncludeBeacon(){
+        try {
+            Class.forName("com.tencent.beacon.event.open.BeaconReport");
+            return true;
+        } catch (ClassNotFoundException e){
+            return false;
+        }
+    }
+}

QCloudFoundation/quic/build.gradle

@@ -31,9 +31,9 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10531
+        versionCode 10533
 
-        versionName "1.5.31"
+        versionName "1.5.33"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"