Merge branch 'staging' into manual_metrics

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 25.4.4
 * Improved disk size calculation in crash reports.
 * Added a new function "sendMetricsRequest(metricsOverride)" to send a manual metrics request, accessible through the requestQueue interface.
+* Added "setRequestTimeoutDuration(requestTimeoutDuration)" init config method configure request timeout in seconds.
 
 * Mitigated an issue displaying Content on API level 35 and above.
 

sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java

@@ -126,6 +126,10 @@ public void setUp() {
             @Override public int getBOMDuration() {
                 return 60;
             }
+
+            @Override public int getRequestTimeoutDurationMillis() {
+                return 30_000;
+            }
         };
 
         Countly.sharedInstance().setLoggingEnabled(true);

sdk/src/main/java/ly/count/android/sdk/ConfigurationProvider.java

@@ -29,4 +29,6 @@ interface ConfigurationProvider {
     int getBOMRequestAge();
 
     int getBOMDuration();
+
+    int getRequestTimeoutDurationMillis();
 }

sdk/src/main/java/ly/count/android/sdk/ConnectionProcessor.java

@@ -49,10 +49,6 @@ of this software and associated documentation files (the "Software"), to deal
  * of this bug in dexmaker: https://code.google.com/p/dexmaker/issues/detail?id=34
  */
 public class ConnectionProcessor implements Runnable {
-    private static final int CONNECT_TIMEOUT_IN_MILLISECONDS = 30_000;
-    // used in backoff mechanism to accept half of the CONNECT_TIMEOUT_IN_MILLISECONDS
-    private static final int READ_TIMEOUT_IN_MILLISECONDS = 30_000;
-
     private static final String CRLF = "\r\n";
     private static final String charset = "UTF-8";
 
@@ -148,8 +144,8 @@ private enum RequestResult {
             pccTsConfigureConnection = UtilsTime.getNanoTime();
         }
 
-        conn.setConnectTimeout(CONNECT_TIMEOUT_IN_MILLISECONDS);
-        conn.setReadTimeout(READ_TIMEOUT_IN_MILLISECONDS);
+        conn.setConnectTimeout(configProvider_.getRequestTimeoutDurationMillis());
+        conn.setReadTimeout(configProvider_.getRequestTimeoutDurationMillis());
         conn.setUseCaches(false);
         conn.setDoInput(true);
         conn.setRequestMethod("GET");
@@ -264,8 +260,8 @@ private enum RequestResult {
         }
 
         conn.setRequestMethod("HEAD");
-        conn.setConnectTimeout(CONNECT_TIMEOUT_IN_MILLISECONDS);
-        conn.setReadTimeout(READ_TIMEOUT_IN_MILLISECONDS);
+        conn.setConnectTimeout(configProvider_.getRequestTimeoutDurationMillis());
+        conn.setReadTimeout(configProvider_.getRequestTimeoutDurationMillis());
         conn.setUseCaches(false);
         conn.setDoInput(true);
         conn.setDoOutput(false);

sdk/src/main/java/ly/count/android/sdk/CountlyConfig.java

@@ -204,6 +204,7 @@ public class CountlyConfig {
     String sdkBehaviorSettings;
     boolean backOffMechanismEnabled = true;
     boolean sdkBehaviorSettingsRequestsDisabled = false;
+    int requestTimeoutDuration = 30; // in seconds
 
     /**
      * THIS VARIABLE SHOULD NOT BE USED
@@ -1034,6 +1035,23 @@ public synchronized CountlyConfig disableSDKBehaviorSettingsUpdates() {
         return this;
     }
 
+    /**
+     * Set the request timeout duration in seconds
+     * Minimum value is "1" second
+     * Default value is "30" seconds
+     *
+     * @param requestTimeoutDuration The request timeout duration in seconds
+     * @return Returns the same config object for convenient linking
+     */
+    public synchronized CountlyConfig setRequestTimeoutDuration(int requestTimeoutDuration) {
+        int tempRequestTimeoutDuration = requestTimeoutDuration;
+        if (tempRequestTimeoutDuration <= 0) {
+            tempRequestTimeoutDuration = 1;
+        }
+        this.requestTimeoutDuration = tempRequestTimeoutDuration;
+        return this;
+    }
+
     /**
      * APM configuration interface to be used with CountlyConfig
      */

sdk/src/main/java/ly/count/android/sdk/ModuleConfiguration.java

@@ -494,4 +494,8 @@ public boolean getTrackingEnabled() {
     @Override public int getBOMDuration() {
         return currentVBOMDuration;
     }
+
+    @Override public int getRequestTimeoutDurationMillis() {
+        return _cly.config_.requestTimeoutDuration * 1000;
+    }
 }