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

[ios] Fixed local links in Copyright

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-01-25 22:46:52 +01:00 • committed by Alexander Borsuk
parent d05c8de6b8
commit 851b5dd695
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
iphone/Maps/Common/WebViewController.m
View file

@ -132,9 +132,15 @@
- (void)webView:(WKWebView *)webView
decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
NSURLRequest *inRequest = navigationAction.request;
if ([inRequest.URL.host isEqualToString:@"localhost"]) {
NSString *query = inRequest.URL.query;
NSURL *url = navigationAction.request.URL;
// about:blank#localAnchor, e.g. in copyright.html.
if ([url.scheme isEqualToString:@"about"]) {
decisionHandler(WKNavigationActionPolicyAllow);
return;
}
if ([url.host isEqualToString:@"localhost"]) {
NSString *query = url.query;
NSArray<NSString *> *components = [query componentsSeparatedByString:@"="];
if (components.count != 2) {
NSAssert(false, @"Incorrect query:", query);
@ -151,9 +157,8 @@
}
if (self.openInSafari && navigationAction.navigationType == WKNavigationTypeLinkActivated &&
![inRequest.URL.scheme isEqualToString:@"applewebdata"]) // do not try to open local links in Safari
![url.scheme isEqualToString:@"applewebdata"]) // do not try to open local links in Safari
{
NSURL *url = [inRequest URL];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
decisionHandler(WKNavigationActionPolicyCancel);
return;
@ -162,7 +167,7 @@
if (!self.shouldResendHeaders) {
decisionHandler(WKNavigationActionPolicyAllow);
} else {
_m_url = inRequest.URL;
_m_url = url;
self.shouldResendHeaders = NO;
decisionHandler(WKNavigationActionPolicyCancel);
[self performURLRequest];