Fix open trust:// crash (trustwallet#639)

* replace deprecated open url delegate * Fix swiftlint warnings
yuhao-git-star · Apr 17, 2018 · 6be3990 · 6be3990
1 parent 87f5873
commit 6be3990
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Trust/AppDelegate.swift b/Trust/AppDelegate.swift
@@ -64,8 +64,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 //    }
 
     // Respond to URI scheme links
-    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
-        return urlNavigatorCoordinator.application(application, open: url, sourceApplication: sourceApplication, annotation: annotation)
+    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey: Any] = [:]) -> Bool {
+        return urlNavigatorCoordinator.application(app, open: url, options: options)
     }
 
     // Respond to Universal Links

diff --git a/Trust/Core/Coordinators/BranchCoordinator.swift b/Trust/Core/Coordinators/BranchCoordinator.swift
@@ -28,4 +28,8 @@ class BranchCoordinator {
     func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
         return Branch.getInstance().application(application, open: url, sourceApplication: sourceApplication, annotation: annotation)
     }
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey: Any] = [:]) -> Bool {
+        return Branch.getInstance().application(app, open: url, options: options)
+    }
 }
diff --git a/Trust/Core/Coordinators/URLNavigatorCoordinator.swift b/Trust/Core/Coordinators/URLNavigatorCoordinator.swift
@@ -7,8 +7,8 @@ struct URLNavigatorCoordinator {
     let branch = BranchCoordinator()
     let navigator = Navigator()
 
-    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
-        var handled = branch.application(application, open: url, sourceApplication: sourceApplication, annotation: annotation)
+    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey: Any] = [:]) -> Bool {
+        var handled = branch.application(app, open: url, options: options)
         if !handled {
             handled = navigator.open(url)
         }