Fix brave/brave-ios#8035: Certain schemas not going to the app store (b…

…rave/brave-ios#8025)
brave · Sep 8, 2023 · 78080bb · 78080bb
1 parent 211f146
commit 78080bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -110,15 +110,14 @@ extension BrowserViewController: WKNavigationDelegate {
   // them then iOS will actually first open Safari, which then redirects to the app store. This works but it will
   // leave a 'Back to Safari' button in the status bar, which we do not want.
   fileprivate func isStoreURL(_ url: URL) -> Bool {
-    if url.scheme == "http" || url.scheme == "https" {
-      if url.host == "itunes.apple.com" {
-        return true
-      }
-    }
-    if url.scheme == "itms-appss" || url.scheme == "itmss" {
+    let isStoreScheme = ["itms-apps", "itms-appss", "itmss"].contains(url.scheme)
+    if isStoreScheme {
       return true
     }
-    return false
+
+    let isHttpScheme = ["http", "https"].contains(url.scheme)
+    let isAppStoreHost = ["itunes.apple.com", "apps.apple.com", "appsto.re"].contains(url.host)
+    return isHttpScheme && isAppStoreHost
   }
 
   // This is the place where we decide what to do with a new navigation action. There are a number of special schemes

diff --git a/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift b/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift
@@ -510,15 +510,14 @@ extension PlaylistWebLoader: WKNavigationDelegate {
   // them then iOS will actually first open Safari, which then redirects to the app store. This works but it will
   // leave a 'Back to Safari' button in the status bar, which we do not want.
   fileprivate func isStoreURL(_ url: URL) -> Bool {
-    if url.scheme == "http" || url.scheme == "https" {
-      if url.host == "itunes.apple.com" {
-        return true
-      }
-    }
-    if url.scheme == "itms-appss" || url.scheme == "itmss" {
+    let isStoreScheme = ["itms-apps", "itms-appss", "itmss"].contains(url.scheme)
+    if isStoreScheme {
       return true
     }
-    return false
+
+    let isHttpScheme = ["http", "https"].contains(url.scheme)
+    let isAppStoreHost = ["itunes.apple.com", "apps.apple.com", "appsto.re"].contains(url.host)
+    return isHttpScheme && isAppStoreHost
   }
 
   func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {