fine tuning what gets escaped. This is harder than it should be

dustinrue · Feb 15, 2015 · 1d71ee7 · 1d71ee7
1 parent 3fd83ab
commit 1d71ee7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Source/DefaultBrowserAction.m b/Source/DefaultBrowserAction.m
@@ -149,9 +149,17 @@ - (void)handleURL:(NSString *)url {
     if (!browser) {
         browser = @"com.apple.Safari";
     }
-    NSString *decoded = [url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+    NSString *decodedURL = [url stringByRemovingPercentEncoding];
+    NSString *newURL = (NSString *)CFURLCreateStringByAddingPercentEscapes(
+                                                                           NULL,
+                                                                           (CFStringRef)decodedURL,
+                                                                           (CFStringRef)@"#",
+                                                                           (CFStringRef)@" ",
+                                                                           kCFStringEncodingUTF8 );
+    NSArray *urls = [NSArray arrayWithObject:[NSURL URLWithString:newURL]];
+    [newURL release];
 
-    NSArray *urls = [NSArray arrayWithObject:[NSURL URLWithString:[decoded stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 
     [[NSWorkspace sharedWorkspace] openURLs:urls withAppBundleIdentifier:browser options:NSWorkspaceLaunchDefault additionalEventParamDescriptor:nil launchIdentifiers:nil];
 }