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

[ios] Fixed opening URLs with # and ?, and opening Matrix from About

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-11-22 22:57:50 +01:00 • committed by Alexander Borsuk
parent 3e7048dcf2
commit 53fecf86b9
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
iphone/Maps/Categories/UIKitCategories.m
View file

@ -177,14 +177,23 @@
- (BOOL)openUrl:(NSString *)urlString inSafari:(BOOL)safari
{
// TODO: This is a temporary workaround to open cyrillic/non-ASCII URLs.
// URLs in OSM are stored in UTF-8. NSURL documentation says:
// URLs in OSM are stored in UTF-8. NSURL constructor documentation says:
// > Must be a URL that conforms to RFC 2396. This method parses URLString according to RFCs 1738 and 1808.
// This deprecated method (almost) properly encodes whole string, while leaving & and / not encoded.
// A better way to encode the URL string should be:
// The right way to encode the URL string should be:
// 1. Split the (non-ASCII) string into components (host, path, query, fragment, etc.)
// 2. Encode each component separately (they have different rules).
// 2. Encode each component separately (they have different allowed characters).
// 3. Merge them back into the string and create NSURL.
NSString * encoded = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSMutableCharacterSet * charset = [[NSMutableCharacterSet alloc] init];
[charset formUnionWithCharacterSet:NSCharacterSet.URLHostAllowedCharacterSet];
[charset formUnionWithCharacterSet:NSCharacterSet.URLPathAllowedCharacterSet];
[charset formUnionWithCharacterSet:NSCharacterSet.URLQueryAllowedCharacterSet];
[charset formUnionWithCharacterSet:NSCharacterSet.URLFragmentAllowedCharacterSet];
[charset addCharactersInString:@"#;/?:@&=+$,"];
NSString * encoded = [urlString stringByAddingPercentEncodingWithAllowedCharacters:charset];
// Matrix has an url with two hashes which doesn't work for NSURL and NSURLComponent.
NSRange const matrixUrl = [encoded rangeOfString:@"#/#"];
if (matrixUrl.location != NSNotFound)
encoded = [encoded stringByReplacingOccurrencesOfString:@"#/#" withString:@"#/%23"];
NSURLComponents * urlc = [NSURLComponents componentsWithString:encoded];
if (!urlc)
{

2
iphone/Maps/UI/Help/AboutController.swift
View file

@ -181,7 +181,7 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi
case 1: self.openUrl("https://github.com/organicmaps/organicmaps/", inSafari: true)
case 2: self.openUrl(L("translated_om_site_url"))
case 3: sendEmailWith(header: "Organic Maps", toRecipients: [kiOSEmail])
case 4: self.openUrl("https://matrix.to/#/%23organicmaps:matrix.org", inSafari: true)
case 4: self.openUrl("https://matrix.to/#/#organicmaps:matrix.org", inSafari: true)
case 5: self.openUrl("https://fosstodon.org/@organicmaps", inSafari: true)
case 6: self.openUrl("https://facebook.com/OrganicMaps", inSafari: true)
case 7: self.openUrl("https://twitter.com/OrganicMapsApp", inSafari: true)