Merge branch 'staging' into fix_anr_back

Author: turtledreams

CHANGELOG.md

@@ -1,6 +1,13 @@
 ## XX.XX.XX
+
 * Mitigated an ANR that occurred when the back button was pressed on the content activity.
 
+* Health check requests now include additional metrics.
+
+* Mitigated an issue where behavior settings were not stored when only provided through configuration during initialization.
+* Mitigated an issue where, on the first run of the SDK, behavior settings returned null if none were previously stored.
+* Mitigated an issue where first behavior settings update calls sent 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/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

@@ -530,7 +530,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

@@ -969,13 +969,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/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
      */