Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #8035: Certain schemas not going to the app store #8025

Merged
merged 3 commits into from
Sep 8, 2023
Merged

Fix #8035: Certain schemas not going to the app store #8025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13f3d4
improve isStoreURL check logic
ElonPark Sep 5, 2023
1b4030f
improve isStoreURL check logic (add shortlink url host)
ElonPark Sep 8, 2023
3f5ea7b
refactor isStoreURL check logic
ElonPark Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 6 additions & 7 deletions Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,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!) {
Expand Down