Merge pull request #2622 from AlphaWallet/support-awallet-custom-url-…

…scheme-for-just-switching-to-app-no-op Support awallet: custom URL scheme for just switching to app and doing nothing else
AlphaWallet · Mar 9, 2021 · 95acc96 · 95acc96
2 parents 8865173 + 0c19024
commit 95acc96
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/AlphaWallet/AppCoordinator.swift b/AlphaWallet/AppCoordinator.swift
@@ -317,6 +317,10 @@ extension AppCoordinator: InCoordinatorDelegate {
         guard universalLinkCoordinator == nil else { return }
         handleUniversalLink(url: url)
     }
+
+    func handleCustomUrlScheme(_ url: URL, forCoordinator coordinator: InCoordinator) {
+        _ = handleOpen(url: url)
+    }
 }
 
 extension AppCoordinator: UniversalLinkCoordinatorDelegate {

diff --git a/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift b/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift
@@ -13,6 +13,7 @@ protocol DappBrowserCoordinatorDelegate: class {
     func didSentTransaction(transaction: SentTransaction, inCoordinator coordinator: DappBrowserCoordinator)
     func importUniversalLink(url: URL, forCoordinator coordinator: DappBrowserCoordinator)
     func handleUniversalLink(_ url: URL, forCoordinator coordinator: DappBrowserCoordinator)
+    func handleCustomUrlScheme(_ url: URL, forCoordinator coordinator: DappBrowserCoordinator)
 }
 
 final class DappBrowserCoordinator: NSObject, Coordinator {
@@ -470,6 +471,10 @@ extension DappBrowserCoordinator: BrowserViewControllerDelegate {
     func handleUniversalLink(_ url: URL, inBrowserViewController viewController: BrowserViewController) {
         delegate?.handleUniversalLink(url, forCoordinator: self)
     }
+
+    func handleCustomUrlScheme(_ url: URL, inBrowserViewController viewController: BrowserViewController) {
+        delegate?.handleCustomUrlScheme(url, forCoordinator: self)
+    }
 }
 
 extension DappBrowserCoordinator: BrowserHistoryViewControllerDelegate {

diff --git a/AlphaWallet/Browser/ViewControllers/BrowserViewController.swift b/AlphaWallet/Browser/ViewControllers/BrowserViewController.swift
@@ -12,6 +12,7 @@ protocol BrowserViewControllerDelegate: class {
     func dismissKeyboard(inBrowserViewController viewController: BrowserViewController)
     func forceUpdate(url: URL, inBrowserViewController viewController: BrowserViewController)
     func handleUniversalLink(_ url: URL, inBrowserViewController viewController: BrowserViewController)
+    func handleCustomUrlScheme(_ url: URL, inBrowserViewController viewController: BrowserViewController)
 }
 
 final class BrowserViewController: UIViewController {
@@ -226,6 +227,10 @@ extension BrowserViewController: WKNavigationDelegate {
             delegate?.handleUniversalLink(url, inBrowserViewController: self)
             return decisionHandler(.cancel)
         }
+        if url.scheme == ShareContentAction.scheme {
+            delegate?.handleCustomUrlScheme(url, inBrowserViewController: self)
+            return decisionHandler(.cancel)
+        }
 
         decisionHandler(.allow)
     }

diff --git a/AlphaWallet/InCoordinator.swift b/AlphaWallet/InCoordinator.swift
@@ -12,6 +12,7 @@ protocol InCoordinatorDelegate: class {
     func assetDefinitionsOverrideViewController(for coordinator: InCoordinator) -> UIViewController?
     func importUniversalLink(url: URL, forCoordinator coordinator: InCoordinator)
     func handleUniversalLink(_ url: URL, forCoordinator coordinator: InCoordinator)
+    func handleCustomUrlScheme(_ url: URL, forCoordinator coordinator: InCoordinator)
 }
 
 enum Tabs {
@@ -912,6 +913,10 @@ extension InCoordinator: DappBrowserCoordinatorDelegate {
     func handleUniversalLink(_ url: URL, forCoordinator coordinator: DappBrowserCoordinator) {
         delegate?.handleUniversalLink(url, forCoordinator: self)
     }
+
+    func handleCustomUrlScheme(_ url: URL, forCoordinator coordinator: DappBrowserCoordinator) {
+        delegate?.handleCustomUrlScheme(url, forCoordinator: self)
+    }
 }
 
 extension InCoordinator: StaticHTMLViewControllerDelegate {

diff --git a/AlphaWallet/Share/ShareContentAction.swift b/AlphaWallet/Share/ShareContentAction.swift
@@ -8,21 +8,26 @@
 import Foundation
 
 enum ShareContentAction {
-
     static let scheme = "awallet"
 
     private enum Host: String {
         case openURL
         case openText
+        case openApp
     }
 
     case url(URL)
     case string(String)
+    case openApp
 
     init?(_ url: URL) {
-        guard let scheme = url.scheme, scheme == ShareContentAction.scheme, let hostValue = url.host, let host = Host(rawValue: hostValue) else {
+        guard let scheme = url.scheme, scheme == ShareContentAction.scheme else {
             return nil
         }
+        guard let hostValue = url.host, let host = Host(rawValue: hostValue) else {
+            self = .openApp
+            return
+        }
 
         let components = URLComponents(url: url, resolvingAgainstBaseURL: true)
         switch host {
@@ -36,6 +41,9 @@ enum ShareContentAction {
                 return nil
             }
             self = .string(value)
+        case .openApp:
+            //Impossible to reach here
+            return nil
         }
     }
 
@@ -45,6 +53,8 @@ enum ShareContentAction {
             return Host.openURL.rawValue
         case .string:
             return Host.openText.rawValue
+        case .openApp:
+            return ""
         }
     }
 
@@ -67,6 +77,8 @@ enum ShareContentAction {
             components.queryItems = [
                 .init(name: "q", value: text)
             ]
+        case .openApp:
+            return .init()
         }
 
         return components

diff --git a/AlphaWallet/Share/UrlSchemeCoordinator.swift b/AlphaWallet/Share/UrlSchemeCoordinator.swift
@@ -51,9 +51,12 @@ class UrlSchemeCoordinator: UrlSchemeCoordinatorType {
             break //NOTE: here we can add parsing Addresses from string
         case .url(let url):
             inCoordinator.openURLInBrowser(url: url)
+        case .openApp:
+            //No-op. Just switching to the app
+            break
         }
 
-        pendingUrl = .none 
+        pendingUrl = .none
     }
 
     private func canHandle(url: URL) -> Bool {