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

[ios] Fixed opening of non-ASCII URLs

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-05-19 08:53:26 +02:00 • committed by Viktor Govako
parent 280f6f81ee
commit d5ac7c2cfe
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,16 @@
- (BOOL)openUrl:(NSString *)urlString inSafari:(BOOL)safari
{
NSURLComponents * urlc = [NSURLComponents componentsWithString:urlString];
// TODO: This is a temporary workaround to open cyrillic/non-ASCII URLs.
// URLs in OSM are stored in UTF-8. NSURL 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:
// 1. Split the (non-ASCII) string into components (host, path, query, fragment, etc.)
// 2. Encode each component separately (they have different rules).
// 3. Merge them back into the string and create NSURL.
NSString * encoded = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSURLComponents * urlc = [NSURLComponents componentsWithString:encoded];
if (!urlc)
{
NSAssert(false, @"Invalid URL %@", urlString);