fix(ios): fix encoding for some URLs

hansemannn · hansemannn · commit 40e66bc4b49c · 2022-04-17T18:40:56.000+02:00
diff --git a/ios/Classes/TiWebdialogModule.m b/ios/Classes/TiWebdialogModule.m
@@ -62,7 +62,9 @@ - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller
 - (SFSafariViewController *)safariController:(NSString *)url withEntersReaderIfAvailable:(BOOL)entersReaderIfAvailable andBarCollapsingEnabled:(BOOL)barCollapsingEnabled
 {
   if (_safariController == nil) {
-    NSURL *safariURL = [NSURL URLWithString:[url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+    NSString *encodedURL = [url stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
+    NSURL *safariURL = [NSURL URLWithString:encodedURL];
+
     if (@available(iOS 11.0, *)) {
       SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc] init];
       config.entersReaderIfAvailable = entersReaderIfAvailable;
diff --git a/ios/Classes/TiWebdialogModuleAssets.m b/ios/Classes/TiWebdialogModuleAssets.m
@@ -3,18 +3,20 @@
  */
 #import "TiWebdialogModuleAssets.h"
 
-extern NSData *filterDataInRange(NSData *thedata, NSRange range);
+extern NSData* filterDataInRange(NSData* thedata, NSRange range);
 
 @implementation TiWebdialogModuleAssets
 
 - (NSData *)moduleAsset
 {
+  
 
   return nil;
 }
 
 - (NSData *)resolveModuleAsset:(NSString *)path
 {
+  
 
   return nil;
 }
diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.0.1
+version: 3.0.2
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: titanium-web-dialog

Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,20 @@`
`3`	`3`	`*/`
`4`	`4`	`#import "TiWebdialogModuleAssets.h"`
`5`	`5`
`6`		`-extern NSData filterDataInRange(NSData thedata, NSRange range);`
	`6`	`+extern NSData* filterDataInRange(NSData* thedata, NSRange range);`
`7`	`7`
`8`	`8`	`@implementation TiWebdialogModuleAssets`
`9`	`9`
`10`	`10`	`- (NSData *)moduleAsset`
`11`	`11`	`{`
	`12`	`+`
`12`	`13`
`13`	`14`	`return nil;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`- (NSData )resolveModuleAsset:(NSString )path`
`17`	`18`	`{`
	`19`	`+`
`18`	`20`
`19`	`21`	`return nil;`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# this is your module manifest and used by Titanium`
`3`	`3`	`# during compilation, packaging, distribution, etc.`
`4`	`4`	`#`
`5`		`-version: 3.0.1`
	`5`	`+version: 3.0.2`
`6`	`6`	`apiversion: 2`
`7`	`7`	`architectures: armv7 arm64 i386 x86_64`
`8`	`8`	`description: titanium-web-dialog`