Skip to content

Fix WebView annotation (xcode 16) #4018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex-osm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix WebView annotation (xcode 16) #4018

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa6cc97
Fix WebView annotation (xcode 16)
alex-osm Sep 20, 2024
52ae9d7
use override func webView(_ webView: WKWebView, decidePolicyFor navig…
tigrim Oct 24, 2024
45080d2
Merge branch 'master' into fix_webview_annotation
tigrim Oct 29, 2024
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
67 changes: 34 additions & 33 deletions Sources/Controllers/TravelGuides/article/TravelArticleDialogViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,39 +509,40 @@ final class TravelArticleDialogViewController: OABaseWebViewController, TravelAr
}
}

// override func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping @MainActor @Sendable (WKNavigationActionPolicy) -> Void) {
// let newUrl = OATravelGuidesHelper.normalizeFileUrl(navigationAction.request.url?.absoluteString) ?? ""
// let isWebPage = newUrl.hasPrefix(PAGE_PREFIX_HTTP) || newUrl.hasPrefix(PAGE_PREFIX_HTTPS)
// let isPhoneNumber = newUrl.hasPrefix("tel:") || newUrl.rangeOfCharacter(from: CharacterSet(charactersIn: "-+()% 0123456789").inverted) == nil
// let isEmail = newUrl.isValidEmail()
//
// if newUrl.hasSuffix("showNavigation") {
// // Clicked on Breadcrumbs navigation pannel
// showNavigation()
// decisionHandler(.cancel)
// } else if isPhoneNumber || isEmail {
// decisionHandler(.allow)
// } else if newUrl == blankUrl {
// // On open new TravelGuides page via code
// decisionHandler(.allow)
// } else if newUrl.contains(WIKIVOYAGE_DOMAIN) && isWebPage {
// TravelGuidesUtils.processWikivoyageDomain(url: newUrl, delegate: self)
// decisionHandler(.cancel)
// } else if newUrl.contains(WIKI_DOMAIN) && isWebPage && article != nil {
// self.webView.addSpinner()
// let defaultCoordinates = CLLocation(latitude: article!.lat, longitude: article!.lon)
// TravelGuidesUtils.processWikipediaDomain(defaultLocation: defaultCoordinates, url: newUrl, delegate: self)
// decisionHandler(.cancel)
// } else if isWebPage {
// OAWikiArticleHelper.warnAboutExternalLoad(newUrl, sourceView: self.webView)
// decisionHandler(.cancel)
// } else if newUrl.contains(PREFIX_GEO) {
// handleGeoUrl(newUrl)
// decisionHandler(.cancel)
// } else {
// decisionHandler(.allow)
// }
// }
override func webView(_ webView: WKWebView,
decidePolicyFor navigationAction: WKNavigationAction) async -> WKNavigationActionPolicy {
let newUrl = OATravelGuidesHelper.normalizeFileUrl(navigationAction.request.url?.absoluteString) ?? ""
let isWebPage = newUrl.hasPrefix(PAGE_PREFIX_HTTP) || newUrl.hasPrefix(PAGE_PREFIX_HTTPS)
let isPhoneNumber = newUrl.hasPrefix("tel:") || newUrl.rangeOfCharacter(from: CharacterSet(charactersIn: "-+()% 0123456789").inverted) == nil
let isEmail = newUrl.isValidEmail()

if newUrl.hasSuffix("showNavigation") {
// Clicked on Breadcrumbs navigation panel
showNavigation()
return .cancel
} else if isPhoneNumber || isEmail {
return .allow
} else if newUrl == blankUrl {
// On open new TravelGuides page via code
return .allow
} else if newUrl.contains(WIKIVOYAGE_DOMAIN) && isWebPage {
TravelGuidesUtils.processWikivoyageDomain(url: newUrl, delegate: self)
return .cancel
} else if newUrl.contains(WIKI_DOMAIN) && isWebPage && article != nil {
self.webView.addSpinner()
let defaultCoordinates = CLLocation(latitude: article!.lat, longitude: article!.lon)
TravelGuidesUtils.processWikipediaDomain(defaultLocation: defaultCoordinates, url: newUrl, delegate: self)
return .cancel
} else if isWebPage {
OAWikiArticleHelper.warnAboutExternalLoad(newUrl, sourceView: self.webView)
return .cancel
} else if newUrl.contains(PREFIX_GEO) {
handleGeoUrl(newUrl)
return .cancel
} else {
return .allow
}
}

override func getImagesDownloadMode() -> OADownloadMode! {
OsmAndApp.swiftInstance().data.travelGuidesImagesDownloadMode
Expand Down