Bug 1395124 - Fix issue with first run and second run events in LP. (#…

…3116) r=justindarc
mozilla-mobile · Aug 31, 2017 · 631c293 · 631c293
1 parent b2dd97a
commit 631c293
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/Client/Application/LeanplumIntegration.swift b/Client/Application/LeanplumIntegration.swift
@@ -131,9 +131,7 @@ class LeanplumIntegration {
         userAttributesDict[UserAttributeKeyName.pocketInstalled.rawValue] = !canInstallPocket()
         userAttributesDict[UserAttributeKeyName.signedInSync.rawValue] = profile?.hasAccount()
 
-        Leanplum.start(userAttributes: userAttributesDict)
-
-        Leanplum.onStartResponse({ _ in
+        Leanplum.start(withUserId: nil, userAttributes: userAttributesDict, responseHandler: { _ in
             self.track(eventName: LeanplumEventName.openedApp)
 
             // We need to check if the app is a clean install to use for

diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -2690,7 +2690,6 @@ extension BrowserViewController: IntroViewControllerDelegate {
                 introViewController.modalPresentationStyle = UIModalPresentationStyle.formSheet
             }
             present(introViewController, animated: true) {
-                self.profile.prefs.setInt(1, forKey: IntroViewControllerSeenProfileKey)
                 // On first run (and forced) open up the homepage in the background.
                 let state = self.getCurrentAppState()
                 if let homePageURL = HomePageAccessors.getHomePage(state), let tab = self.tabManager.selectedTab, DeviceInfo.hasConnectivity() {
@@ -2712,16 +2711,20 @@ extension BrowserViewController: IntroViewControllerDelegate {
         self.presentSignInViewController(fxaParams)
     }
 
-    func introViewControllerDidFinish(_ introViewController: IntroViewController) {
+    func introViewControllerDidFinish(_ introViewController: IntroViewController, requestToLogin: Bool) {
+        self.profile.prefs.setInt(1, forKey: IntroViewControllerSeenProfileKey)
         introViewController.dismiss(animated: true) { finished in
             if self.navigationController?.viewControllers.count ?? 0 > 1 {
                 _ = self.navigationController?.popToRootViewController(animated: true)
             }
 
-            guard let deeplink = self.profile.prefs.stringForKey("AdjustDeeplinkKey"), let url = URL(string: deeplink) else {
+            if let deeplink = self.profile.prefs.stringForKey("AdjustDeeplinkKey"), let url = URL(string: deeplink) {
+                self.launchFxAFromDeeplinkURL(url)
                 return
             }
-            self.launchFxAFromDeeplinkURL(url)
+            if requestToLogin {
+                self.presentSignInViewController()
+            }
         }
     }
 
@@ -2749,15 +2752,6 @@ extension BrowserViewController: IntroViewControllerDelegate {
         self.dismiss(animated: true, completion: nil)
     }
 
-    func introViewControllerDidRequestToLogin(_ introViewController: IntroViewController) {
-        introViewController.dismiss(animated: true, completion: { () -> Void in
-            guard let deeplink = self.profile.prefs.stringForKey("AdjustDeeplinkKey"), let url = URL(string: deeplink) else {
-                self.presentSignInViewController()
-                return
-            }
-            self.launchFxAFromDeeplinkURL(url)
-        })
-    }
 }
 
 extension BrowserViewController: FxAContentViewControllerDelegate {

diff --git a/Client/Frontend/Intro/IntroViewController.swift b/Client/Frontend/Intro/IntroViewController.swift
@@ -45,8 +45,7 @@ struct IntroViewControllerUX {
 let IntroViewControllerSeenProfileKey = "IntroViewControllerSeen"
 
 protocol IntroViewControllerDelegate: class {
-    func introViewControllerDidFinish(_ introViewController: IntroViewController)
-    func introViewControllerDidRequestToLogin(_ introViewController: IntroViewController)
+    func introViewControllerDidFinish(_ introViewController: IntroViewController, requestToLogin: Bool)
 }
 
 class IntroViewController: UIViewController, UIScrollViewDelegate {
@@ -271,7 +270,7 @@ class IntroViewController: UIViewController, UIScrollViewDelegate {
 
     func SELstartBrowsing() {
         LeanplumIntegration.sharedInstance.track(eventName: .dismissedOnboarding)
-        delegate?.introViewControllerDidFinish(self)
+        delegate?.introViewControllerDidFinish(self, requestToLogin: false)
     }
 
     func SELback() {
@@ -299,7 +298,7 @@ class IntroViewController: UIViewController, UIScrollViewDelegate {
     }
 
     func SELlogin() {
-		delegate?.introViewControllerDidRequestToLogin(self)
+        delegate?.introViewControllerDidFinish(self, requestToLogin: true)
     }
 
     fileprivate var accessibilityScrollStatus: String {