Merge pull request #315 from Countly/ios_changes

fix: add iOS changes

Author: turtledreams

ios/Classes/CountlyiOS/CHANGELOG.md

@@ -3,6 +3,7 @@
 
 * Mitigated an issue where visibility could have been wrongly assigned if a view was closed while going to background. (Experimental!)
 * Mitigated an issue where the user provided URLSessionConfiguration was not applied to direct requests
+* Mitigated an issue where a concurrent modification error could have happen when starting multiple stopped views
 * Mitigated an issue that parsing internal content event segmentation.
 
 ## 24.7.7

ios/Classes/CountlyiOS/CountlyConnectionManager.h

@@ -69,4 +69,6 @@ extern const NSInteger kCountlyGETRequestMaxLength;
 - (NSString *)queryEssentials;
 - (NSString *)appendChecksum:(NSString *)queryString;
 
+- (BOOL)isSessionStarted;
+
 @end

ios/Classes/CountlyiOS/CountlyConnectionManager.m

@@ -16,6 +16,7 @@ @interface CountlyConnectionManager ()
 @property (nonatomic) NSURLSession* URLSession;
 
 @property (nonatomic, strong) NSDate *startTime;
+
 @end
 
 NSString* const kCountlyQSKeyAppKey           = @"app_key";
@@ -105,6 +106,11 @@ - (instancetype)init
     return self;
 }
 
+
+- (BOOL)isSessionStarted {
+    return isSessionStarted;
+}
+
 - (void)resetInstance {
     CLY_LOG_I(@"%s", __FUNCTION__);
     onceToken = 0;

ios/Classes/CountlyiOS/CountlyViewTrackingInternal.m

@@ -436,7 +436,7 @@ - (NSString*)startViewInternal:(NSString *)viewName customSegmentation:(NSDictio
     segmentation[kCountlyVTKeySegment] = CountlyDeviceInfo.osName;
     segmentation[kCountlyVTKeyVisit] = @1;
 
-    if (self.isFirstView)
+    if (self.isFirstView && [CountlyConnectionManager.sharedInstance isSessionStarted])
     {
         self.isFirstView = NO;
         segmentation[kCountlyVTKeyStart] = @1;
@@ -545,27 +545,33 @@ - (void)startStoppedViewsInternal
 {
     // Create an array to store keys for views that need to be removed
     NSMutableArray<NSString *> *keysToRemove = [NSMutableArray array];
-
+    NSMutableArray<NSString *> *keysToStart = [NSMutableArray array];
+    
+    // Collect keys without modifying the dictionary
     [self.viewDataDictionary enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, CountlyViewData * _Nonnull viewData, BOOL * _Nonnull stop) {
         if (viewData.willStartAgain)
         {
-            NSString *viewID = [self startViewInternal:viewData.viewName customSegmentation:viewData.startSegmentation isAutoStoppedView:viewData.isAutoStoppedView];
-            
-            // Retrieve the newly created viewData for the viewID
-            CountlyViewData* viewDataNew = self.viewDataDictionary[viewID];
-            
-            // Copy the segmentation data from the old view to the new view
-            viewDataNew.segmentation = viewData.segmentation.mutableCopy;
-            
-            // Add the old view's ID to the array for removal later
+            [keysToStart addObject:key];
             [keysToRemove addObject:viewData.viewID];
         }
     }];
 
+    // Start the collected views after enumeration
+    for (NSString *key in keysToStart)
+    {
+        CountlyViewData *viewData = self.viewDataDictionary[key];
+        NSString *viewID = [self startViewInternal:viewData.viewName customSegmentation:viewData.startSegmentation isAutoStoppedView:viewData.isAutoStoppedView];
+        
+        // Retrieve and update the newly created viewData
+        CountlyViewData *viewDataNew = self.viewDataDictionary[viewID];
+        viewDataNew.segmentation = viewData.segmentation.mutableCopy;
+    }
+    
     // Remove the entries from the dictionary
     [self.viewDataDictionary removeObjectsForKeys:keysToRemove];
 }
 
+
 - (void)stopAllViewsInternal:(NSDictionary *)segmentation
 {
     // TODO: Should apply all the segmenation operations here at one place instead of doing it for individual view
@@ -759,7 +765,7 @@ - (void)applicationWillTerminate {
 
 - (void)resetFirstView
 {
-    self.isFirstView = NO;
+    self.isFirstView = YES;
 }