pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] impement accurate path check in catalog links

Browse source 
https://jira.mail.ru/browse/MAPSME-14652
This commit is contained in:
Aleksey Belousov 2020-08-25 18:50:56 +03:00 • committed by Maksim Andrianov
parent 06fba64485
commit 841ea453f9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
View file

@ -169,9 +169,9 @@ final class CatalogWebViewController: WebViewController {
let showOnMapPath = "map"
guard let url = navigationAction.request.url,
url.scheme == "mapsme" ||
url.path.contains("buy_kml") ||
url.path.contains(subscribePath) ||
url.path.contains(showOnMapPath) else {
url.pathComponents.contains("buy_kml") ||
url.pathComponents.contains(subscribePath) ||
url.pathComponents.contains(showOnMapPath) else {
super.webView(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler)
return
}
@ -180,12 +180,12 @@ final class CatalogWebViewController: WebViewController {
decisionHandler(.cancel)
}
if url.path.contains(subscribePath) {
if url.pathComponents.contains(subscribePath) {
showSubscriptionBannerScreen(SubscriptionGroupType(catalogURL: url))
return
}
if url.path.contains(showOnMapPath) {
if url.pathComponents.contains(showOnMapPath) {
guard let components = url.queryParams() else { return }
guard let serverId = components["server_id"] else { return }
showOnMap(serverId)