Merge pull request #434 from Countly/fix_multiple_content

fix: safeguard return

Author: turtledreams

CHANGELOG.md

@@ -1,9 +1,11 @@
-## XX.XX.XX
+## 25.4.9
 * Added a new config option disableViewRestartForManualRecording to disable auto close/restart behavior of manual views on app background/foreground actions.
 * Added a new config option "setWebviewDisplayOption: WebViewDisplayOption" to control how Content and Feedback Widgets are presented.
   * IMMERSIVE mode (default): Full-screen display (except cutouts).
   * SAFE_AREA mode: Omits status bar, navigation bar and cutouts when displaying WebView.
 
+* Mitigated an issue where multiple contents could have been displayed in parallel.
+
 ## 25.4.8
 * Mitigated an issue where "giveAllConsent" did not include metrics consent.
 

Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '25.4.8'
+  s.version = '25.4.9'
   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.8'
+  s.version = '25.4.9'
   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

@@ -808,7 +808,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.8;
+				MARKETING_VERSION = 25.4.9;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -840,7 +840,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.8;
+				MARKETING_VERSION = 25.4.9;
 				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.8";
+NSString* const kCountlySDKVersion = @"25.4.9";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";

CountlyContentBuilderInternal.m

@@ -68,12 +68,18 @@ - (void)enterContentZone {
 
     if(_isCurrentlyContentShown){
         CLY_LOG_I(@"%s a content is already shown, skipping" ,__FUNCTION__);
+        return;
     }
 
     [self enterContentZone:@[]];
 }
 
 - (void)enterContentZone:(NSArray<NSString *> *)tags {
+    if(_isCurrentlyContentShown){
+        CLY_LOG_I(@"%s a content is already shown, skipping" ,__FUNCTION__);
+        return;
+    }
+    
     [_minuteTimer invalidate];
     _minuteTimer = nil;
 
@@ -121,6 +127,7 @@ - (void)refreshContentZone {
     }
     if(_isCurrentlyContentShown){
         CLY_LOG_I(@"%s a content is already shown, skipping" ,__FUNCTION__);
+        return;
     }
 
     [self exitContentZone];
@@ -151,6 +158,12 @@ - (void)fetchContents {
 
     if (!CountlyServerConfig.sharedInstance.networkingEnabled)
         return;
+    
+    if(_isCurrentlyContentShown){
+        CLY_LOG_I(@"%s a content is already shown, skipping" ,__FUNCTION__);
+        return;
+    }
+    
     if ([self isRequestQueueLockedThreadSafe]) {
         return;
     }

CountlyTests/TestUtils.swift

@@ -13,7 +13,7 @@ class TestUtils {
     static let commonDeviceId: String = "deviceId"
     static let commonAppKey: String = "appkey"
     static let host: String = "https://testing.count.ly/"
-    static let SDK_VERSION = "25.4.8"
+    static let SDK_VERSION = "25.4.9"
     static let SDK_NAME = "objc-native-ios"
 
     static func cleanup() -> Void {