fix: fixed application installed and updated getting triggered in-cor…

…rectly (#345) Co-authored-by: Desu Sai Venkat <[email protected]> Co-authored-by: Abhishek Pandey <[email protected]>
rudderlabs · Jul 31, 2023 · cbdf123 · cbdf123
1 parent 307e730
commit cbdf123
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 29 deletions.
diff --git a/Sources/Classes/RSApplicationLifeCycleManager.m b/Sources/Classes/RSApplicationLifeCycleManager.m
@@ -73,35 +73,40 @@ - (void) handleAppStateNotification: (NSNotification*) notification {
 }
 #endif
 
+- (void)saveCurrentBuildNumberAndVersion:(NSString *)currentBuildNumber currentVersion:(NSString *)currentVersion {
+    [preferenceManager saveVersionNumber:currentVersion];
+    [preferenceManager saveBuildNumber:currentBuildNumber];
+}
+
 - (void) applicationDidFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+    NSString *previousVersion = [preferenceManager getVersionNumber];
+    NSString* previousBuildNumber = [preferenceManager getBuildNumber];
+
+    NSString *currentVersion = [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"];
+    NSString *currentBuildNumber = [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"];
+
     if (!self->config.trackLifecycleEvents) {
+        [self saveCurrentBuildNumberAndVersion:currentBuildNumber currentVersion:currentVersion];
         return;
     }
-    NSString *previousVersion = [preferenceManager getVersionNumber];
-       NSString *currentVersion = [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"];
-
-       NSString* previousBuildNumber = [preferenceManager getBuildNumber];
-       NSString *currentBuildNumber = [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"];
-
-       if (!previousVersion) {
-           [RSLogger logVerbose:@"RSApplicationLifeCycleManager: applicationDidFinishLaunchingWithOptions: Tracking Application Installed"];
-           [[RSClient sharedInstance] track:@"Application Installed" properties:@{
-               @"version": currentVersion,
-               @"build": currentBuildNumber
-           }];
-           [preferenceManager saveVersionNumber:currentVersion];
-           [preferenceManager saveBuildNumber:currentBuildNumber];
-       } else if ([RSUtils isApplicationUpdated]) {
-           [RSLogger logVerbose:@"RSApplicationLifeCycleManager: applicationDidFinishLaunchingWithOptions: Tracking Application Updated"];
-           [[RSClient sharedInstance] track:@"Application Updated" properties:@{
-               @"previous_version" : previousVersion ?: @"",
-               @"version": currentVersion,
-               @"previous_build": previousBuildNumber ?: @"",
-               @"build": currentBuildNumber
-           }];
-           [preferenceManager saveVersionNumber:currentVersion];
-           [preferenceManager saveBuildNumber:currentBuildNumber];
-       }
+
+    if (!previousVersion) {
+        [RSLogger logVerbose:@"RSApplicationLifeCycleManager: applicationDidFinishLaunchingWithOptions: Tracking Application Installed"];
+        [[RSClient sharedInstance] track:@"Application Installed" properties:@{
+            @"version": currentVersion,
+            @"build": currentBuildNumber
+        }];
+    } else if ([RSUtils isApplicationUpdated]) {
+        [RSLogger logVerbose:@"RSApplicationLifeCycleManager: applicationDidFinishLaunchingWithOptions: Tracking Application Updated"];
+        [[RSClient sharedInstance] track:@"Application Updated" properties:@{
+            @"previous_version" : previousVersion ?: @"",
+            @"version": currentVersion,
+            @"previous_build": previousBuildNumber ?: @"",
+            @"build": currentBuildNumber
+        }];
+    }
+    [self saveCurrentBuildNumberAndVersion:currentBuildNumber currentVersion:currentVersion];
     [self sendApplicationOpenedOnLaunch:launchOptions withVersion:currentVersion];
 }
 

diff --git a/Sources/Classes/RSEventRepository.m b/Sources/Classes/RSEventRepository.m
@@ -120,10 +120,8 @@ - (instancetype)init:(NSString*)_writeKey config:(RSConfig*)_config client:(RSCl
         [RSLogger logDebug:@"EventRepository: Initiating RSApplicationLifeCycleManager"];
         self->applicationLifeCycleManager = [[RSApplicationLifeCycleManager alloc] initWithConfig:config andPreferenceManager:self->preferenceManager andBackGroundModeManager:self->backGroundModeManager andUserSession:self->userSession];
 
-        if (config.trackLifecycleEvents) {
-            [RSLogger logDebug:@"EventRepository: Enabling tracking of application lifecycle events"];
-            [self->applicationLifeCycleManager trackApplicationLifeCycle];
-        }
+        [RSLogger logDebug:@"EventRepository: Enabling tracking of application lifecycle events"];
+        [self->applicationLifeCycleManager trackApplicationLifeCycle];
 
         if (config.recordScreenViews) {
             [RSLogger logDebug:@"EventRepository: Enabling automatic recording of screen views"];