Merge pull request #487 from Countly/sc_fix

fix: the config

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 25.4.2
+* Mitigated an issue where latest fetched behavior settings were replacing the current settings instead of merging.
+
 ## 25.4.1
 * Improved request queue handling with a built-in backoff mechanism which is enabled by default.
 * Added "disableBackoffMechanism()" init config method to disable backoff behavior.

gradle.properties

@@ -22,7 +22,7 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 # RELEASE FIELD SECTION
-VERSION_NAME=25.4.1
+VERSION_NAME=25.4.2
 GROUP=ly.count.android
 POM_URL=https://github.com/Countly/countly-sdk-android
 POM_SCM_URL=https://github.com/Countly/countly-sdk-android

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

@@ -44,7 +44,7 @@ public class TestUtils {
     public final static String commonAppKey = "appkey";
     public final static String commonDeviceId = "1234";
     public final static String SDK_NAME = "java-native-android";
-    public final static String SDK_VERSION = "25.4.1";
+    public final static String SDK_VERSION = "25.4.2";
     public static final int MAX_THREAD_COUNT_PER_STACK_TRACE = 50;
 
     public static class Activity2 extends Activity {

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

@@ -47,7 +47,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 public class Countly {
 
-    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "25.4.1";
+    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "25.4.2";
     /**
      * Used as request meta data on every request
      */

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

@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import java.util.Iterator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -235,23 +236,35 @@ void saveAndStoreDownloadedConfig(@NonNull JSONObject config, @NonNull CountlyCo
             return;
         }
 
-        //at this point it is a valid response
-        latestRetrievedConfigurationFull = config;
-        String configAsString;
+        JSONObject newInner = config.optJSONObject(keyRConfig);
+        if (newInner == null || newInner.length() == 0) {
+            L.d("[ModuleConfiguration] Config rejected: inner 'c' object is invalid or empty.");
+            return;
+        }
 
+        // Merge timestamp and version
         try {
-            latestRetrievedConfiguration = config.getJSONObject(keyRConfig);
-            configAsString = config.toString();
+            latestRetrievedConfigurationFull.put(keyRTimestamp, config.get(keyRTimestamp));
+            latestRetrievedConfigurationFull.put(keyRVersion, config.get(keyRVersion));
         } catch (JSONException e) {
-            latestRetrievedConfigurationFull = null;
-            latestRetrievedConfiguration = null;
+            L.w("[ModuleConfiguration] saveAndStoreDownloadedConfig, Failed to merge version/timestamp.", e);
+        }
 
-            L.w("[ModuleConfiguration] saveAndStoreDownloadedConfig, Failed retrieving internal config, " + e);
-            return;
+        Iterator<String> keys = newInner.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = newInner.opt(key);
+            if (value != null && !JSONObject.NULL.equals(value)) {
+                try {
+                    latestRetrievedConfiguration.put(key, value);
+                } catch (JSONException e) {
+                    L.w("[ModuleConfiguration] saveAndStoreDownloadedConfig, Failed to merge inner config key: " + key, e);
+                }
+            }
         }
 
-        //save to storage
-        storageProvider.setServerConfig(configAsString);
+        // Save updated config
+        storageProvider.setServerConfig(latestRetrievedConfigurationFull.toString());
 
         //update config variables
         updateConfigVariables(clyConfig);