feat: iOS 25.4.0

Author: arifBurakDemiray

ios/Classes/CountlyiOS/CHANGELOG.md

@@ -1,7 +1,11 @@
-## XX.XX.XX
-* Deprecated the experimental configuration function enableServerConfiguration and it will do nothing. It is now enabled by default and can be controlled directly from the server.
+## 25.4.0
+* ! Minor breaking change ! Removed UIDevice.currentDevice.identifierForVendor usage in device id generation. The SDK now exclusively uses random UUIDs for device id generation.
 
+* Added a Content feature method "refreshContentZone" that does a manual refresh.
 * Extended server configuration capabilities of the SDK.
+* Added a config parameter to provide server config in the initialization "sdkBehaviorSettings: NSString".
+
+* Deprecated the experimental configuration function enableServerConfiguration and it will do nothing. It is now enabled by default and can be controlled directly from the server.
 
 ## 25.1.2
 * Mitigated an issue where the safe area resolution was not correctly calculated for the content zone on certain iOS devices.

ios/Classes/CountlyiOS/Countly.m

@@ -92,8 +92,8 @@ - (void)startWithConfig:(CountlyConfig *)config
 
     config = [self checkAndFixInternalLimitsConfig:config];
 
-    [CountlyServerConfig.sharedInstance retrieveServerConfigFromStorage: config.serverConfiguration];
-    
+  [CountlyServerConfig.sharedInstance retrieveServerConfigFromStorage:config.sdkBehaviorSettings];
+
     CountlyCommon.sharedInstance.maxKeyLength = config.sdkInternalLimits.getMaxKeyLength;
     CountlyCommon.sharedInstance.maxValueLength = config.sdkInternalLimits.getMaxValueSize;
     CountlyCommon.sharedInstance.maxSegmentationValues = config.sdkInternalLimits.getMaxSegmentationValues;
@@ -167,8 +167,8 @@ - (void)startWithConfig:(CountlyConfig *)config
     CountlyDeviceInfo.sharedInstance.customMetrics = [customMetricsTruncated cly_limited:@"Custom metric"];
 
     [Countly.user save];
-    // If something added related to server config, make sure to check CountlyServerConfig.notifySdkConfigChange
-    [CountlyServerConfig.sharedInstance fetchServerConfig: config];
+  // If something added related to server config, make sure to check CountlyServerConfig.notifySdkConfigChange
+    [CountlyServerConfig.sharedInstance fetchServerConfig:config];
 
 #if (TARGET_OS_IOS)
     CountlyFeedbacksInternal.sharedInstance.message = config.starRatingMessage;
@@ -227,9 +227,9 @@ - (void)startWithConfig:(CountlyConfig *)config
     if ([config.features containsObject:CLYCrashReporting])
     {
         CountlyCrashReporter.sharedInstance.isEnabledOnInitialConfig = YES;
-        
-        if (CountlyServerConfig.sharedInstance.crashReportingEnabled) {
-            [CountlyCrashReporter.sharedInstance startCrashReporting];
+        if (CountlyServerConfig.sharedInstance.crashReportingEnabled)
+        {
+        [CountlyCrashReporter.sharedInstance startCrashReporting];
         }
     }
 
@@ -238,10 +238,10 @@ - (void)startWithConfig:(CountlyConfig *)config
     {
         // Print deprecation flag for feature
         CountlyViewTrackingInternal.sharedInstance.isEnabledOnInitialConfig = YES;
-        if (CountlyServerConfig.sharedInstance.viewTrackingEnabled) {
+        if (CountlyServerConfig.sharedInstance.viewTrackingEnabled)
+        {
             [CountlyViewTrackingInternal.sharedInstance startAutoViewTracking];
         }
-        [CountlyViewTrackingInternal.sharedInstance startAutoViewTracking];
     }
     if (config.automaticViewTrackingExclusionList) {
         [CountlyViewTrackingInternal.sharedInstance addAutoViewTrackingExclutionList:config.automaticViewTrackingExclusionList];
@@ -257,7 +257,6 @@ - (void)startWithConfig:(CountlyConfig *)config
     if (config.globalViewSegmentation) {
         [CountlyViewTrackingInternal.sharedInstance setGlobalViewSegmentation:config.globalViewSegmentation];
     }
-    
     timer = [NSTimer timerWithTimeInterval:config.updateSessionPeriod target:self selector:@selector(onTimer:) userInfo:nil repeats:YES];
     [NSRunLoop.mainRunLoop addTimer:timer forMode:NSRunLoopCommonModes];
 
@@ -447,7 +446,7 @@ - (void)resume
 - (void)applicationDidBecomeActive:(NSNotification *)notification
 {
     CLY_LOG_D(@"App enters foreground");
-    [CountlyServerConfig.sharedInstance fetchServerConfigIfTimeIsUp];
+  [CountlyServerConfig.sharedInstance fetchServerConfigIfTimeIsUp];
     [self resume];
 }
 
@@ -861,13 +860,12 @@ - (void)recordEvent:(NSString *)key segmentation:(NSDictionary *)segmentation co
         CLY_LOG_W(@"A reserved event detected for key: '%@', event will not be recorded.", key);
         return;
     }
-
     if (!CountlyServerConfig.sharedInstance.customEventTrackingEnabled)
     {
         CLY_LOG_D(@"'recordEvent' is aborted: Custom Event Tracking is disabled from server config!");
         return;
     }
-    
+
     NSDictionary* truncated = [segmentation cly_truncated:@"Event segmentation"];
     segmentation = [truncated cly_limited:@"Event segmentation"];
 

ios/Classes/CountlyiOS/CountlyCommon.m

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

ios/Classes/CountlyiOS/CountlyConfig.h

@@ -662,20 +662,18 @@ typedef enum : NSUInteger
  */
 @property (nonatomic) BOOL enableOrientationTracking;
 
-#pragma mark -
-
 /**
  * This is an experimental feature and it can have breaking changes
  * For enabling fetching and application of server config values.
  * @discussion If set, Server Config values from Countly Server will be fetched at the beginning of a session.
- * @deprecated and will do nothing
  */
-@property (nonatomic) BOOL enableServerConfiguration;
+@property(nonatomic) BOOL enableServerConfiguration DEPRECATED_MSG_ATTRIBUTE("Will do nothing");
+;
 
 /**
  * Set the server configuration to be set while initializing the SDK
  */
-@property (nonatomic, copy) NSString* serverConfiguration;
+@property(nonatomic, copy) NSString *sdkBehaviorSettings;
 
 #if (TARGET_OS_IOS)
 /**

ios/Classes/CountlyiOS/CountlyContentBuilder.h

@@ -15,17 +15,26 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)sharedInstance;
 
 /**
- * This is an experimental feature and it can have breaking changes
- * Opt in user for the content fetching and updates
+ * Enables content fetching and updates for the user.
+ * This method opts the user into receiving content updates
+ * and ensures that relevant data is fetched accordingly.
  */
 - (void)enterContentZone;
 
 /**
- * This is an experimental feature and it can have breaking changes
- * Opt out user for the content fetching and updates
+ * Disables content fetching and updates for the user.
+ * This method opts the user out of receiving content updates
+ * and stops any ongoing content retrieval processes.
  */
 - (void)exitContentZone;
 
+/**
+ * Triggers a manual refresh of the content zone.
+ * This method forces an update by fetching the latest content,
+ * ensuring the user receives the most up-to-date information.
+ */
+- (void)refreshContentZone;
+
 #endif
 NS_ASSUME_NONNULL_END
 @end

ios/Classes/CountlyiOS/CountlyContentBuilder.m

@@ -41,6 +41,11 @@ - (void)exitContentZone
 {
     [CountlyContentBuilderInternal.sharedInstance exitContentZone];
 }
+- (void)refreshContentZone
+{
+    [CountlyContentBuilderInternal.sharedInstance refreshContentZone];
+
+}
 - (void)changeContent:(NSArray<NSString *> *)tags
 {
     [CountlyContentBuilder.sharedInstance changeContent:tags];

ios/Classes/CountlyiOS/CountlyContentBuilderInternal.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)enterContentZone:(NSArray<NSString *> *)tags;
 - (void)exitContentZone;
 - (void)changeContent:(NSArray<NSString *> *)tags;
+- (void)refreshContentZone;
 
 #endif
 NS_ASSUME_NONNULL_END

ios/Classes/CountlyiOS/CountlyContentBuilderInternal.m

@@ -12,9 +12,13 @@
 
 @implementation CountlyContentBuilderInternal {
     BOOL _isRequestQueueLocked;
+    BOOL _isCurrentlyContentShown;
     NSTimer *_requestTimer;
     NSTimer *_minuteTimer;
 }
+
+NSInteger const contentInitialDelay = 4;
+
 #if (TARGET_OS_IOS)
 + (instancetype)sharedInstance {
     static CountlyContentBuilderInternal *instance = nil;
@@ -31,12 +35,18 @@ - (instancetype)init
     {
         self.zoneTimerInterval = 30.0;
         _requestTimer = nil;
+        _isCurrentlyContentShown = NO;
     }
 
     return self;
 }
 
 - (void)enterContentZone {
+    
+    if(_isCurrentlyContentShown){
+        CLY_LOG_I(@"%s, a content is already shown, skipping" ,__FUNCTION__);
+    }
+    
     [self enterContentZone:@[]];
 }
 
@@ -53,13 +63,21 @@ - (void)enterContentZone:(NSArray<NSString *> *)tags {
     }
 
     self.currentTags = tags;
+    int contentDelay = 0;
 
-    [self fetchContents];;
-    _requestTimer = [NSTimer scheduledTimerWithTimeInterval:self.zoneTimerInterval
-                                                     target:self
-                                                   selector:@selector(fetchContents)
-                                                   userInfo:nil
-                                                    repeats:YES];
+    if (CountlyCommon.sharedInstance.timeSinceLaunch < contentInitialDelay) {
+        contentDelay = contentInitialDelay;
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(contentDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
+    {
+        [self fetchContents];;
+        self->_requestTimer = [NSTimer scheduledTimerWithTimeInterval:self->_zoneTimerInterval
+                                                         target:self
+                                                       selector:@selector(fetchContents)
+                                                       userInfo:nil
+                                                        repeats:YES];
+    });
 }
 
 - (void)exitContentZone {
@@ -73,6 +91,25 @@ - (void)changeContent:(NSArray<NSString *> *)tags {
     }
 }
 
+- (void)refreshContentZone {
+    if (![CountlyServerConfig.sharedInstance refreshContentZoneEnabled])
+    {
+        return;
+    }
+    if(_isCurrentlyContentShown){
+        CLY_LOG_I(@"%s, a content is already shown, skipping" ,__FUNCTION__);
+    }
+    
+    [self exitContentZone];
+    [CountlyConnectionManager.sharedInstance attemptToSendStoredRequests];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
+    {
+        [self enterContentZone];
+    });
+    
+}
+
 #pragma mark - Private Methods
 
 - (void)clearContentState {
@@ -88,7 +125,9 @@ - (void)clearContentState {
 - (void)fetchContents {
     if (!CountlyConsentManager.sharedInstance.consentForContent)
         return;
-    
+
+    if (!CountlyServerConfig.sharedInstance.networkingEnabled)
+        return;
     if  (_isRequestQueueLocked) {
         return;
     }
@@ -130,24 +169,25 @@ - (void)fetchContents {
 
 - (NSURLRequest *)fetchContentsRequest
 {
-    NSString* queryString = [CountlyConnectionManager.sharedInstance queryEssentials];
+    NSString *queryString = [CountlyConnectionManager.sharedInstance queryEssentials];
     NSString *resolutionJson = [self resolutionJson];
-    queryString = [queryString stringByAppendingFormat:@"&%@=%@",
-                   @"resolution", resolutionJson.cly_URLEscaped];
-    
-    queryString = [CountlyConnectionManager.sharedInstance appendChecksum:queryString];
-    
+    queryString = [queryString stringByAppendingFormat:@"&%@=%@", @"method", kCountlyCBFetchContent];
+    queryString = [queryString stringByAppendingFormat:@"&%@=%@", @"resolution", resolutionJson.cly_URLEscaped];
+
     NSArray *components = [CountlyDeviceInfo.locale componentsSeparatedByCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"_-"]];
+    queryString = [queryString stringByAppendingFormat:@"&%@=%@", @"la", components.firstObject];
 
-    queryString = [queryString stringByAppendingFormat:@"&%@=%@",
-                   @"la", components.firstObject];
-    
-    NSString* URLString = [NSString stringWithFormat:@"%@%@?%@",
-                           CountlyConnectionManager.sharedInstance.host,
-                           kCountlyEndpointContent,
-                           queryString];
-    
-    NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:URLString]];
+    NSString *deviceType = CountlyDeviceInfo.deviceType;
+    if (deviceType)
+    {
+        queryString = [queryString stringByAppendingFormat:@"&%@=%@", @"dt", deviceType];
+    }
+
+    queryString = [CountlyConnectionManager.sharedInstance appendChecksum:queryString];
+
+    NSString *URLString = [NSString stringWithFormat:@"%@%@?%@", CountlyConnectionManager.sharedInstance.host, kCountlyEndpointContent, queryString];
+
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:URLString]];
     return request;
 }
 
@@ -244,11 +284,13 @@ - (void)showContentWithHtmlPath:(NSString *)urlString placementCoordinates:(NSDi
         [webViewManager createWebViewWithURL:url frame:frame appearBlock:^
          {
             CLY_LOG_I(@"%s, Webview appeared", __FUNCTION__);
+            self->_isCurrentlyContentShown = YES;
             [self clearContentState];
         } dismissBlock:^
          {
             CLY_LOG_I(@"%s, Webview dismissed", __FUNCTION__);
-            self->_minuteTimer = [NSTimer scheduledTimerWithTimeInterval:60.0
+            self->_isCurrentlyContentShown = NO;
+            self->_minuteTimer = [NSTimer scheduledTimerWithTimeInterval:self->_zoneTimerInterval
                                                              target:self
                                                            selector:@selector(enterContentZone)
                                                            userInfo:nil
@@ -260,4 +302,4 @@ - (void)showContentWithHtmlPath:(NSString *)urlString placementCoordinates:(NSDi
     });
 }
 #endif
-@end
+@end

ios/Classes/CountlyiOS/CountlyDeviceInfo.h

@@ -27,6 +27,7 @@ typedef enum : NSUInteger
 - (CLYDeviceIDTypeValue)deviceIDTypeValue;
 
 + (NSString *)device;
++ (NSString *)deviceType;
 + (NSString *)architecture;
 + (NSString *)osName;
 + (NSString *)osVersion;

ios/Classes/CountlyiOS/CountlyDeviceInfo.m

@@ -107,9 +107,6 @@ - (NSString *)ensafeDeviceID:(NSString *)deviceID
     if (deviceID.length)
         return deviceID;
 
-#if (TARGET_OS_IOS || TARGET_OS_VISION || TARGET_OS_TV)
-    return UIDevice.currentDevice.identifierForVendor.UUIDString;
-#else
     NSString* UUID = [CountlyPersistency.sharedInstance retrieveNSUUID];
     if (!UUID)
     {
@@ -118,7 +115,6 @@ - (NSString *)ensafeDeviceID:(NSString *)deviceID
     }
 
     return UUID;
-#endif
 }
 
 - (BOOL)isDeviceIDTemporary