fix

PostHog · Jan 10, 2024 · 3e113cb · 3e113cb
1 parent 4a206d3
commit 3e113cb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 35 deletions.
diff --git a/PostHog/PostHogSDK.swift b/PostHog/PostHogSDK.swift
@@ -641,15 +641,15 @@ let maxRetryDelay = 30.0
 
         #if os(iOS) || os(tvOS)
             defaultCenter.addObserver(self,
-                                      selector: #selector(captureAppLifecycle),
+                                      selector: #selector(captureAppInstallLifecycle),
                                       name: UIApplication.didFinishLaunchingNotification,
                                       object: nil)
             defaultCenter.addObserver(self,
                                       selector: #selector(captureAppBackgrounded),
                                       name: UIApplication.didEnterBackgroundNotification,
                                       object: nil)
             defaultCenter.addObserver(self,
-                                      selector: #selector(captureAppOpenedFromBackground),
+                                      selector: #selector(captureAppOpened),
                                       name: UIApplication.didBecomeActiveNotification,
                                       object: nil)
         #endif
@@ -663,7 +663,11 @@ let maxRetryDelay = 30.0
         }
     }
 
-    func captureAppInstalled() {
+    @objc func captureAppInstallLifecycle() {
+        if !config.captureApplicationLifecycleEvents {
+            return
+        }
+
         let bundle = Bundle.main
 
         let versionName = bundle.infoDictionary?["CFBundleShortVersionString"] as? String
@@ -718,44 +722,29 @@ let maxRetryDelay = 30.0
         }
     }
 
-    func captureAppOpened() {
+    @objc func captureAppOpened() {
         var props: [String: Any] = [:]
-        props["from_background"] = false
-
-        let bundle = Bundle.main
-
-        let versionName = bundle.infoDictionary?["CFBundleShortVersionString"] as? String
-        let versionCode = bundle.infoDictionary?["CFBundleVersion"] as? String
+        props["from_background"] = appFromBackground
 
-        if versionName != nil {
-            props["version"] = versionName
-        }
-        if versionCode != nil {
-            props["build"] = versionCode
-        }
+        if !appFromBackground {
+            let bundle = Bundle.main
 
-        capture("Application Opened", properties: props)
-    }
+            let versionName = bundle.infoDictionary?["CFBundleShortVersionString"] as? String
+            let versionCode = bundle.infoDictionary?["CFBundleVersion"] as? String
 
-    @objc func captureAppOpenedFromBackground() {
-        var props: [String: Any] = [:]
-        props["from_background"] = appFromBackground
+            if versionName != nil {
+                props["version"] = versionName
+            }
+            if versionCode != nil {
+                props["build"] = versionCode
+            }
 
-        if !appFromBackground {
             appFromBackground = true
         }
 
         capture("Application Opened", properties: props)
     }
 
-    @objc private func captureAppLifecycle() {
-        if !config.captureApplicationLifecycleEvents {
-            return
-        }
-
-        captureAppInstalled()
-    }
-
     @objc func captureAppBackgrounded() {
         if !config.captureApplicationLifecycleEvents {
             return

diff --git a/PostHogTests/PostHogSDKTest.swift b/PostHogTests/PostHogSDKTest.swift
@@ -301,7 +301,7 @@ class PostHogSDKTest: QuickSpec {
         it("capture AppInstalled") {
             let sut = self.getSut()
 
-            sut.captureAppInstalled()
+            sut.captureAppInstallLifecycle()
 
             let events = getBatchedEvents(server)
 
@@ -324,7 +324,7 @@ class PostHogSDKTest: QuickSpec {
             userDefaults.setValue("1", forKey: "PHGBuildKeyV2")
             userDefaults.synchronize()
 
-            sut.captureAppInstalled()
+            sut.captureAppInstallLifecycle()
 
             let events = getBatchedEvents(server)
 
@@ -344,7 +344,7 @@ class PostHogSDKTest: QuickSpec {
         it("capture AppOpenedFromBackground from_background should be false") {
             let sut = self.getSut()
 
-            sut.captureAppOpenedFromBackground()
+            sut.captureAppOpened()
 
             let events = getBatchedEvents(server)
 
@@ -361,8 +361,8 @@ class PostHogSDKTest: QuickSpec {
         it("capture AppOpenedFromBackground from_background should be true") {
             let sut = self.getSut(flushAt: 2)
 
-            sut.captureAppOpenedFromBackground()
-            sut.captureAppOpenedFromBackground()
+            sut.captureAppOpened()
+            sut.captureAppOpened()
 
             let events = getBatchedEvents(server)