Merge pull request #398 from Countly/fix_sc

fix: sc reset

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 25.4.3
+* Mitigated an issue where SDK behavior settings were set to default when fetching for new config.
+* Mitigated an issue where latest fetched behavior settings were replacing the current settings instead of merging.
+
 ## 25.4.2
 * Added fullscreen support for feedback widgets.
 * Added "disableSDKBehaviorSettingsUpdates" init config parameter to disable server config updates.

Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '25.4.2'
+  s.version = '25.4.3'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '25.4.2'
+  s.version = '25.4.3'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.xcodeproj/project.pbxproj

@@ -768,7 +768,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.2;
+				MARKETING_VERSION = 25.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -800,7 +800,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.2;
+				MARKETING_VERSION = 25.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

CountlyCommon.m

@@ -29,7 +29,7 @@ @interface CountlyCommon ()
 #endif
 @end
 
-NSString* const kCountlySDKVersion = @"25.4.2";
+NSString* const kCountlySDKVersion = @"25.4.3";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";

CountlyPersistency.h

@@ -58,8 +58,8 @@
 - (NSDictionary *)retrieveRemoteConfig;
 - (void)storeRemoteConfig:(NSDictionary *)remoteConfig;
 
-- (NSDictionary *)retrieveServerConfig;
-- (void)storeServerConfig:(NSDictionary *)serverConfig;
+- (NSMutableDictionary *)retrieveServerConfig;
+- (void)storeServerConfig:(NSMutableDictionary *)serverConfig;
 
 - (NSDictionary *)retrieveHealthCheckTrackerState;
 - (void)storeHealthCheckTrackerState:(NSDictionary *)healthCheckTrackerState;

CountlyPersistency.m

@@ -593,16 +593,17 @@ - (void)storeRemoteConfig:(NSDictionary *)remoteConfig
     [NSUserDefaults.standardUserDefaults synchronize];
 }
 
-- (NSDictionary *)retrieveServerConfig
+- (NSMutableDictionary *)retrieveServerConfig
 {
     NSDictionary* serverConfig = [NSUserDefaults.standardUserDefaults objectForKey:kCountlyServerConfigPersistencyKey];
-    if (!serverConfig)
-        serverConfig = NSDictionary.new;
-    
-    return serverConfig;
+    if ([serverConfig isKindOfClass:[NSDictionary class]]) {
+         return [serverConfig mutableCopy];
+     }
+
+     return [NSMutableDictionary new];
 }
 
-- (void)storeServerConfig:(NSDictionary *)serverConfig
+- (void)storeServerConfig:(NSMutableDictionary *)serverConfig
 {
     [NSUserDefaults.standardUserDefaults setObject:serverConfig forKey:kCountlyServerConfigPersistencyKey];
     [NSUserDefaults.standardUserDefaults synchronize];

CountlyServerConfig.m

@@ -116,16 +116,66 @@ - (instancetype)init
 
 - (void)retrieveServerConfigFromStorage:(NSString *)sdkBehaviorSettings
 {
-    NSError *error = nil;
-    NSDictionary *serverConfigObject = [CountlyPersistency.sharedInstance retrieveServerConfig];
-    if (serverConfigObject.count == 0 && sdkBehaviorSettings)
+    NSMutableDictionary *persistentBehaviorSettings = [CountlyPersistency.sharedInstance retrieveServerConfig];
+    if (persistentBehaviorSettings.count == 0 && sdkBehaviorSettings)
     {
-        serverConfigObject = [NSJSONSerialization JSONObjectWithData:[sdkBehaviorSettings cly_dataUTF8] options:0 error:&error];
+        NSError *error = nil;
+        id parsed = [NSJSONSerialization JSONObjectWithData:[sdkBehaviorSettings cly_dataUTF8] options:0 error:&error];
+
+        if ([parsed isKindOfClass:[NSDictionary class]]) {
+            persistentBehaviorSettings = [(NSDictionary *)parsed mutableCopy];
+            [CountlyPersistency.sharedInstance storeServerConfig:persistentBehaviorSettings];
+        } else {
+            CLY_LOG_W(@"%s, Failed to parse sdkBehaviorSettings or not a dictionary: %@", __FUNCTION__, error);
+        }
     }
 
-    if (serverConfigObject.count > 0 && !error)
+    [self populateServerConfig:persistentBehaviorSettings];
+}
+
+- (void)mergeBehaviorSettings:(NSMutableDictionary *)baseConfig
+                          withConfig:(NSDictionary *)newConfig
+{
+    // c, t and v paramters must exist
+    if(newConfig.count != 3 || !newConfig[kRConfig]) {
+        CLY_LOG_D(@"%s, missing entries for a behavior settings omitting", __FUNCTION__);
+        return;
+    }
+    
+    if (!newConfig[kRVersion] || !newConfig[kRTimestamp])
     {
-        [self populateServerConfig:serverConfigObject];
+        CLY_LOG_D(@"%s, version or timestamp is missing in the behavioır settings omitting", __FUNCTION__);
+        return;
+    }
+    
+    if(!([newConfig[kRConfig] isKindOfClass:[NSDictionary class]]) || ((NSDictionary *)newConfig[kRConfig]).count == 0){
+        CLY_LOG_D(@"%s, invalid behavior settings omitting", __FUNCTION__);
+        return;
+    }
+            
+    id timestamp = newConfig[kRTimestamp];
+    if (timestamp) {
+        baseConfig[kRTimestamp] = timestamp;
+    }
+
+    id version = newConfig[kRVersion];
+    if (version) {
+        baseConfig[kRVersion] = version;
+    }
+    
+    NSDictionary *cBase = baseConfig[kRConfig] ?: NSMutableDictionary.new;
+    NSDictionary *cNew = newConfig[kRConfig];
+
+    if ([cBase isKindOfClass:[NSDictionary class]] || [cNew isKindOfClass:[NSDictionary class]]) {
+        NSMutableDictionary *cMerged = [cBase mutableCopy];
+
+        [cNew enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+            if (obj != nil && obj != [NSNull null]) {
+                cMerged[key] = obj;
+            }
+        }];
+
+        baseConfig[kRConfig] = cMerged;
     }
 }
 
@@ -379,9 +429,10 @@ - (void)fetchServerConfig:(CountlyConfig *)config
 
         if (serverConfigResponse[kRConfig] != nil)
         {
-            [CountlyPersistency.sharedInstance storeServerConfig:serverConfigResponse];
-            [self setDefaultValues];
-            [self populateServerConfig:serverConfigResponse];
+            NSMutableDictionary *persistentBehaviorSettings = [CountlyPersistency.sharedInstance retrieveServerConfig];
+            [self mergeBehaviorSettings:persistentBehaviorSettings withConfig:serverConfigResponse];
+            [CountlyPersistency.sharedInstance storeServerConfig:persistentBehaviorSettings];
+            [self populateServerConfig:persistentBehaviorSettings];
         }
 
         [self notifySdkConfigChange:config]; // if no config let stored ones to be set