[iOS] [14075] Fixes deep linking UI transitioning.

OpenStack-mobile · Jul 18, 2018 · 93cf273 · 93cf273
1 parent a7a3056
commit 93cf273
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift b/OpenStack Summit/OpenStack Summit/LaunchScreenViewController.swift
@@ -42,10 +42,7 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
 
     private var digitLabels = [UILabel]()
 
-    private var willTransition = false  {
-
-        didSet { configureView() }
-    }
+    private var deepLinking = false
 
     private var state: State = .loadingSummits {
 
@@ -281,12 +278,8 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
 
     private func showRevealController(_ sender: AnyObject? = nil, delay: Double = 0, completion: ((MainRevealViewController) -> ())? = nil) {
 
-        self.willTransition = true
-
         let revealViewController = MainRevealViewController()
 
-        self.willTransition = false
-
         DispatchQueue.main.asyncAfter(deadline: dispatchTime(from: delay)) {
 
             self.show(revealViewController, sender: sender)
@@ -342,14 +335,12 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
                     controller.summit = latestSummit
 
                     #if DEBUG
-
-                        if SummitManager.shared.summit.value == 0 {
-
-                            SummitManager.shared.summit.value = latestSummit.identifier
-                        }
-                    #else
+                    if SummitManager.shared.summit.value == 0 {
 
                         SummitManager.shared.summit.value = latestSummit.identifier
+                    }
+                    #else
+                    SummitManager.shared.summit.value = latestSummit.identifier
                     #endif
 
                     controller.loadData()
@@ -365,9 +356,9 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
 
                 if Store.shared.isLoggedIn {
 
-                    showRevealController(self, delay: 2)
-
                     state = .transitioning
+
+                    if !deepLinking { showRevealController(self, delay: 2) }
                 }
                 else {
 
@@ -414,16 +405,24 @@ final class LaunchScreenViewController: UIViewController, MessageEnabledViewCont
 
     func view(data: AppActivitySummitDataType, identifier: Identifier) {
 
-        showRevealController(self) { $0.view(data: data, identifier: identifier) }
+        deepLinking = true
+
+        showRevealController(self) {
+            $0.view(data: data, identifier: identifier)
+        }
     }
 
     func view(screen: AppActivityScreen) {
 
+        deepLinking = true
+
         showRevealController(self) { $0.view(screen: screen) }
     }
 
     func search(_ searchTerm: String) {
 
+        deepLinking = true
+
         showRevealController(self) { $0.search(searchTerm) }
     }