Merge branch 'staging' into 2543

Author: turtledreams

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 25.4.3
-* Mitigated an ANR that occurred when the back button was pressed on the content activity.
+* Improved Health Check metric information.
+* Improved Content display mechanics.
+
+* Mitigated an issue that could have happened when navigating back from a Content.
+* Mitigated a persistency issue with configuration provided SBS and its initial state.
+* Mitigated an issue where SBS could have been fetched twice.
 
 ## 25.4.2
 * Mitigated an issue where latest fetched behavior settings were replacing the current settings instead of merging.

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

@@ -29,7 +29,7 @@ public void addBreadcrumb() {
     @Test(expected = AssertionError.class)
     public void addBreadcrumb_emptyString() {
         BreadcrumbHelper breadcrumbHelper = new BreadcrumbHelper(5, new ModuleLog());
-        breadcrumbHelper.addBreadcrumb("", 10);
+        breadcrumbHelper.addBreadcrumb("", 10, 5);
     }
 
     /**
@@ -39,7 +39,7 @@ public void addBreadcrumb_emptyString() {
     @Test(expected = AssertionError.class)
     public void addBreadcrumb_null() {
         BreadcrumbHelper breadcrumbHelper = new BreadcrumbHelper(5, new ModuleLog());
-        breadcrumbHelper.addBreadcrumb(null, 10);
+        breadcrumbHelper.addBreadcrumb(null, 10, 5);
     }
 
     /**
@@ -49,7 +49,7 @@ public void addBreadcrumb_null() {
     @Test
     public void addBreadcrumb_exceedsCharacterLimit() {
         BreadcrumbHelper breadcrumbHelper = new BreadcrumbHelper(5, new ModuleLog());
-        breadcrumbHelper.addBreadcrumb("Test", 2);
+        breadcrumbHelper.addBreadcrumb("Test", 2, 5);
         Assert.assertEquals(list("Te"), breadcrumbHelper.getBreadcrumbs());
     }
 
@@ -60,11 +60,11 @@ public void addBreadcrumb_exceedsCharacterLimit() {
     @Test
     public void addBreadcrumb_exceedsLimit() {
         BreadcrumbHelper breadcrumbHelper = new BreadcrumbHelper(2, new ModuleLog());
-        breadcrumbHelper.addBreadcrumb("Test", 3);
+        breadcrumbHelper.addBreadcrumb("Test", 3, 2);
         Assert.assertEquals(list("Tes"), breadcrumbHelper.getBreadcrumbs());
-        breadcrumbHelper.addBreadcrumb("Doggy", 3);
+        breadcrumbHelper.addBreadcrumb("Doggy", 3, 2);
         Assert.assertEquals(list("Tes", "Dog"), breadcrumbHelper.getBreadcrumbs());
-        breadcrumbHelper.addBreadcrumb("Geralt", 3);
+        breadcrumbHelper.addBreadcrumb("Geralt", 3, 2);
         Assert.assertEquals(list("Dog", "Ger"), breadcrumbHelper.getBreadcrumbs());
     }
 

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

@@ -1089,6 +1089,10 @@ public void doWork(String requestData, String customEndpoint, ConnectionProcesso
                     }
                 };
             }
+
+            @Override public ImmediateRequestI CreatePreflightRequestMaker() {
+                return null;
+            }
         };
     }
 
@@ -1162,6 +1166,10 @@ private int[] setupTest_allFeatures(JSONObject serverConfig) {
                     }
                 };
             }
+
+            @Override public ImmediateRequestI CreatePreflightRequestMaker() {
+                return null;
+            }
         };
         countlyConfig.metricProviderOverride = new MockedMetricProvider();
         Countly.sharedInstance().init(countlyConfig);

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

@@ -7,19 +7,17 @@
 public class BreadcrumbHelper {
 
     private final @NonNull LinkedList<String> logs = new LinkedList<>();
-    private final int maxBreadcrumbs;
 
     private final @NonNull ModuleLog L;
 
     protected BreadcrumbHelper(int maxBreadcrumbs, @NonNull ModuleLog L) {
         assert maxBreadcrumbs > 0;
         assert L != null;
 
-        this.maxBreadcrumbs = maxBreadcrumbs;
         this.L = L;
     }
 
-    protected void addBreadcrumb(@NonNull String breadcrumb, int valueSize) {
+    protected void addBreadcrumb(@NonNull String breadcrumb, int valueSize, int maxBreadcrumbs) {
         assert breadcrumb != null;
         assert !breadcrumb.isEmpty();
         assert valueSize > 0;

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

@@ -0,0 +1,6 @@
+package ly.count.android.sdk;
+
+interface ConfigurationValueValidator<T> {
+
+    Boolean validate(T value);
+}

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

@@ -247,6 +247,63 @@ private enum RequestResult {
         return conn;
     }
 
+    synchronized public @NonNull URLConnection urlConnectionForPreflightRequest(@NonNull String preflightData) throws IOException {
+        long approxSize = preflightData.length();
+        URL url = new URL(preflightData);
+
+        long tOpen = pcc != null ? UtilsTime.getNanoTime() : 0;
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+        if (conn instanceof HttpsURLConnection && (Countly.publicKeyPinCertificates != null || Countly.certificatePinCertificates != null)) {
+            ((HttpsURLConnection) conn).setSSLSocketFactory(sslContext_.getSocketFactory());
+        }
+
+        if (pcc != null) {
+            pcc.TrackCounterTimeNs("ConnectionProcessorUrlConnectionForPreflightRequest_01_OpenURLConnection", UtilsTime.getNanoTime() - tOpen);
+            tOpen = UtilsTime.getNanoTime();
+        }
+
+        conn.setRequestMethod("HEAD");
+        conn.setConnectTimeout(CONNECT_TIMEOUT_IN_MILLISECONDS);
+        conn.setReadTimeout(READ_TIMEOUT_IN_MILLISECONDS);
+        conn.setUseCaches(false);
+        conn.setDoInput(true);
+        conn.setDoOutput(false);
+        conn.setInstanceFollowRedirects(true);
+
+        if (requestHeaderCustomValues_ != null) {
+            L.v("[ConnectionProcessor] Adding [" + requestHeaderCustomValues_.size() + "] custom header fields");
+            for (Map.Entry<String, String> e : requestHeaderCustomValues_.entrySet()) {
+                if (e.getKey() != null && e.getValue() != null && !e.getKey().isEmpty()) {
+                    conn.addRequestProperty(e.getKey(), e.getValue());
+                }
+            }
+        }
+
+        if (pcc != null) {
+            pcc.TrackCounterTimeNs("ConnectionProcessorUrlConnectionForPreflightRequest_02_ConfigureConnection", UtilsTime.getNanoTime() - tOpen);
+            tOpen = UtilsTime.getNanoTime();
+        }
+
+        try {
+            for (int i = 0; ; i++) {
+                String key = conn.getHeaderFieldKey(i);
+                if (key == null) break;
+                String value = conn.getHeaderField(i);
+                approxSize += key.getBytes(StandardCharsets.US_ASCII).length + value.getBytes(StandardCharsets.US_ASCII).length + 2L;
+            }
+        } catch (Exception e) {
+            L.e("[ConnectionProcessor] urlConnectionForPreflightRequest, exception while calculating header field size: " + e);
+        }
+
+        if (pcc != null) {
+            pcc.TrackCounterTimeNs("ConnectionProcessorUrlConnectionForPreflightRequest_03_HeaderFieldSize", UtilsTime.getNanoTime() - tOpen);
+        }
+
+        L.v("[ConnectionProcessor] urlConnectionForPreflightRequest, Approx data size: [" + approxSize + " B]");
+        return conn;
+    }
+
     /**
      * Return the size of the text multipart entry
      *
@@ -530,7 +587,7 @@ public void run() {
                         // this one from the stored events collection
                         storageProvider_.removeRequest(originalRequest);
 
-                        if (configProvider_.getBOMEnabled() && backoff(setupServerRequestTime, storedRequestCount, requestData)) {
+                        if (configProvider_.getBOMEnabled() && backoff(setupServerRequestTime, storedRequestCount - 1, requestData)) {
                             backoffCallback_.run();
                             break;
                         }

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

@@ -493,6 +493,10 @@ public synchronized Countly init(CountlyConfig config) {
                     @Override public ImmediateRequestI CreateImmediateRequestMaker() {
                         return (new ImmediateRequestMaker());
                     }
+
+                    @Override public ImmediateRequestI CreatePreflightRequestMaker() {
+                        return (new PreflightRequestMaker());
+                    }
                 };
             }
 
@@ -969,13 +973,15 @@ void onStartInternal(Activity activity) {
         }
 
         ++activityCount_;
-        if (activityCount_ == 1 && !moduleSessions.manualSessionControlEnabled) {
+        if (activityCount_ == 1) {
+            // start the timer in the first activity
+            moduleConfiguration.fetchIfTimeIsUpForFetchingServerConfig();
             //if we open the first activity
             //and we are not using manual session control,
             //begin a session
-
-            moduleSessions.beginSessionInternal();
-            moduleConfiguration.fetchIfTimeIsUpForFetchingServerConfig();
+            if (!moduleSessions.manualSessionControlEnabled) {
+                moduleSessions.beginSessionInternal();
+            }
         }
 
         config_.deviceInfo.inForeground();

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

@@ -10,10 +10,13 @@
 
 class CountlyWebViewClient extends WebViewClient {
     private final List<WebViewUrlListener> listeners;
+    WebViewPageLoadedListener afterPageFinished;
+    long pageLoadTime;
 
     public CountlyWebViewClient() {
         super();
         this.listeners = new ArrayList<>();
+        this.pageLoadTime = System.currentTimeMillis();
     }
 
     @Override
@@ -38,6 +41,20 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
         return false;
     }
 
+    @Override
+    public void onPageFinished(WebView view, String url) {
+        Log.v(Countly.TAG, "[CountlyWebViewClient] onPageFinished, url: [" + url + "]");
+        super.onPageFinished(view, url);
+        if (afterPageFinished != null) {
+            pageLoadTime = System.currentTimeMillis() - pageLoadTime;
+            boolean timeOut = (pageLoadTime / 1000L) >= 60;
+            Log.d(Countly.TAG, "[CountlyWebViewClient] onPageFinished, pageLoadTime: " + pageLoadTime + " ms");
+
+            afterPageFinished.onPageLoaded(timeOut);
+            afterPageFinished = null;
+        }
+    }
+
     public void registerWebViewUrlListener(WebViewUrlListener listener) {
         this.listeners.add(listener);
     }

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

@@ -674,32 +674,6 @@ String getMetrics(@NonNull final Context context, @Nullable final Map<String, St
         return result;
     }
 
-    @NonNull
-    String getMetricsHealthCheck(@NonNull final Context context, @Nullable final Map<String, String> metricOverride) {
-        Map<String, Object> metrics = new ConcurrentHashMap<>();
-
-        String appVersion = mp.getAppVersion(context);
-
-        if (metricOverride != null) {
-            if (metricOverride.containsKey("_app_version")) {
-                appVersion = metricOverride.get("_app_version");
-            }
-        }
-
-        metrics.put("_app_version", appVersion);
-
-        String result = new JSONObject(metrics).toString();
-
-        try {
-            result = java.net.URLEncoder.encode(result, "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            // should never happen because Android guarantees UTF-8 support
-            Countly.sharedInstance().L.e("[getMetrics] encode failed, [" + ex + "]");
-        }
-
-        return result;
-    }
-
     /**
      * Returns a JSON object containing the device crash report
      */

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

@@ -2,4 +2,6 @@
 
 interface ImmediateRequestGenerator {
     ImmediateRequestI CreateImmediateRequestMaker();
+
+    ImmediateRequestI CreatePreflightRequestMaker();
 }