rhodes 7.1.17 → 7.4.1

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -314,6 +314,69 @@
         img = newImg;
          */
     }
+
+    
+    // normalize orientation
+    if ([theImage imageOrientation] != UIImageOrientationUp) {
+        
+        CGImageRef cgImage = [img CGImage];
+        CGColorSpaceRef rgb_space = CGColorSpaceCreateDeviceRGB();
+        
+        int curWidth = CGImageGetWidth(cgImage);
+        int curHeight = CGImageGetHeight(cgImage);
+        
+        int newWidth = curWidth;
+        int newHeight = curHeight;
+
+        if (([theImage imageOrientation] == UIImageOrientationLeft) || ([theImage imageOrientation] == UIImageOrientationRight)) {
+            newWidth = curHeight;
+            newHeight = curWidth;
+        }
+        
+        void * data = malloc(newWidth*newHeight*4);
+        
+        CGContextRef cgContext = CGBitmapContextCreate( data,
+                                                       newWidth,
+                                                       newHeight,
+                                                       8,
+                                                       newWidth*4,
+                                                       rgb_space,
+                                                       kCGImageAlphaNoneSkipLast);
+        
+        CGFloat rotation = 0.0;
+        
+        if ([theImage imageOrientation] == UIImageOrientationLeft) {
+            rotation = 90.0 * M_PI / 180.0;
+        }
+        if ([theImage imageOrientation] == UIImageOrientationRight) {
+            rotation = 270.0 * M_PI / 180.0;
+        }
+        if ([theImage imageOrientation] == UIImageOrientationDown) {
+            rotation = 180.0 * M_PI / 180.0;
+        }
+
+        
+        CGContextTranslateCTM(cgContext, ((double)newWidth) / 2.0f, ((double)newHeight) / 2.0f);
+        CGContextRotateCTM(cgContext, rotation);
+        
+        
+        CGContextDrawImage(cgContext, CGRectMake(-(((double)curWidth) / 2.0f), -(((double)curHeight) / 2.0f), curWidth, curHeight), cgImage);
+        
+        CGImageRef rgbImage = CGBitmapContextCreateImage(cgContext);
+        //[img release];
+        UIImage* newImg = [UIImage imageWithCGImage:rgbImage scale:1.0 orientation:UIImageOrientationUp];
+        if (img != theImage) {
+            //[img release];
+        }
+        img = newImg;
+        
+        CGColorSpaceRelease(rgb_space);
+        CGImageRelease(rgbImage);
+        CGContextRelease(cgContext);
+        free(data);
+        
+    }
+    
     
     int imageWidth = (int)img.size.width;
     int imageHeight = (int)img.size.height;

data/platform/iphone/Classes/RhoAlert.m

@@ -196,8 +196,8 @@ static BOOL is_current_alert_status = NO;
         return;
     
     NSArray *btn = [buttons objectAtIndex:buttonIndex];
-    NSString *itemId = [[btn objectAtIndex:0] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSString *itemTitle = [[btn objectAtIndex:1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *itemId = [[btn objectAtIndex:0] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+    NSString *itemTitle = [[btn objectAtIndex:1] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
     
     rho_rhodesapp_callPopupCallback([callback UTF8String], [itemId UTF8String], [itemTitle UTF8String]);
     [self release];

data/platform/iphone/Classes/RhoUIWebView.h

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 #import "common/app_build_capabilities.h"
 

data/platform/iphone/Classes/RhoUIWebView.m

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 
 #import "common/app_build_capabilities.h"

data/platform/iphone/Classes/RhoWKWebView.h

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 
 
@@ -30,7 +30,7 @@
 #import <WebKit/WKWebViewConfiguration.h>
 #import "RhoWebView.h"
 
-@interface RhoWKWebView : NSObject<RhoWebView, WKNavigationDelegate> {
+@interface RhoWKWebView : NSObject<RhoWebView, WKNavigationDelegate, WKUIDelegate> {
     WKWebView *webview;
     id<RhoWebViewDelegate,NSObject> delegate;
 }
@@ -84,5 +84,8 @@
 //- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler;
 
 
-@end
+- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler;
+- (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL result))completionHandler;
+- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString *result))completionHandler;
 
+@end

data/platform/iphone/Classes/RhoWKWebView.mm

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 
 
@@ -31,6 +31,8 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 
+#import "Rhodes.h"
+
 #import "URLProtocol/CRhoWKURLProtocol.h"
 
 
@@ -65,26 +67,26 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
     {
         dumpClassInfo(superClass, (inheritanceDepth + 1));
     }
-    
+
     int i = 0;
     unsigned int mc = 0;
-    
+
     const char* className = class_getName(c);
-    
+
     Method* mlist = class_copyMethodList(c, &mc);
     for (i = 0; i < mc; i++)
     {
         Method method = mlist[i];
         SEL methodSelector = method_getName(method);
         const char* methodName = sel_getName(methodSelector);
-        
+
         const char *typeEncodings = method_getTypeEncoding(method);
-        
+
         char returnType[80];
         method_getReturnType(method, returnType, 80);
-        
+
         NSLog(@"%2.2d %s ==> %s (%s)", inheritanceDepth, className, methodName, (typeEncodings == Nil) ? "" : typeEncodings);
-        
+
         int ac = method_getNumberOfArguments(method);
         int a = 0;
         for (a = 0; a < ac; a++) {
@@ -107,12 +109,17 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 
 - (id)initWithFrame:(CGRect)frame {
     [self init];
-    
+
     WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
     if ( rho_conf_getBool("enable_media_playback_without_gesture") == 1 ) {
         configuration.mediaPlaybackRequiresUserAction = NO;
     }
 
+    if ( rho_conf_getBool("WebView.allowsInlineMediaPlayback") == 1 ) {
+        configuration.allowsInlineMediaPlayback = YES;
+    }
+
+
     BOOL isDirectRequestActivated = NO;
     if (rho_conf_is_property_exists("ios_direct_local_requests")!=0) {
         if (rho_conf_getBool("ios_direct_local_requests")!=0 ) {
@@ -128,8 +135,8 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
         Method bogusHandle = class_getClassMethod([WKWebView class], @selector(bogushandlesURLScheme:));
         Method handleOriginal = class_getClassMethod([WKWebView class], @selector(handlesURLScheme:));
         method_exchangeImplementations(bogusHandle, handleOriginal);
-    
-    
+
+
         [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"http"];
         [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"https"];
 
@@ -140,7 +147,7 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 #endif
     }
     WKWebView* w = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
-    
+
     //w.scalesPageToFit = YES;
     if ( !rho_conf_getBool("WebView.enableBounce") )
         [[w scrollView] setBounces:NO];
@@ -149,16 +156,17 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
     w.clipsToBounds = NO;
     //w.dataDetectorTypes = UIDataDetectorTypeNone;
     w.navigationDelegate = self;
+    w.UIDelegate= self;
     w.autoresizesSubviews = YES;
     //w.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.tag = RHO_TAG_WEBVIEW;
-    
+
     //assert([w retainCount] == 1);
     self.webview = w;
-    
-    
-    
+
+
+
     return self;
 }
 
@@ -186,7 +194,7 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 - (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script {
         __block NSString *resultString = nil;
         __block BOOL finished = NO;
-        
+
         [webview evaluateJavaScript:script completionHandler:^(id result, NSError *error) {
             if (error == nil) {
                 if (result != nil) {
@@ -197,12 +205,12 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
             }
             finished = YES;
         }];
-        
+
         while (!finished)
         {
             [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
         }
-        
+
         return resultString;
 }
 
@@ -241,9 +249,9 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 //     shouldStartLoadWithRequest => decidePolicyForNavigationAction
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
-    
+
     //NSLog(@"$$$$$ NavigationAction with URL = %@", [[navigationAction request] URL]);
-    
+
     BOOL result = YES;
     if (delegate != nil) {
         result = [delegate shouldStartLoadWithRequest:self request:navigationAction.request];
@@ -264,7 +272,7 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
     // force Ajax CommonAPI calls
     NSString* jscode = @"window['__rho_nativeBridgeType']='ajax'";
     [self stringByEvaluatingJavaScriptFromString:jscode];
-    
+
     [delegate webViewDidFinishLoad:self];
 }
 
@@ -272,5 +280,60 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
     [delegate didFailLoadWithError:self error:error];
 }
 
-@end
 
+
+- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
+{
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
+                                                                   message:message
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+        completionHandler();
+    }]];
+
+    [[[[Rhodes sharedInstance] mainView] getMainViewController] presentViewController:alert animated:YES completion:nil];
+}
+
+- (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL result))completionHandler
+{
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
+                                                                   message:message
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+        completionHandler(NO);
+    }]];
+
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        completionHandler(YES);
+    }]];
+
+    [[[[Rhodes sharedInstance] mainView] getMainViewController] presentViewController:alert animated:YES completion:nil];
+}
+
+- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString *result))completionHandler
+{
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
+                                                                   message:prompt
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+
+    [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+        textField.placeholder = prompt;
+        textField.secureTextEntry = NO;
+        textField.text = defaultText;
+    }];
+
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+        completionHandler(nil);
+    }]];
+
+    [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        completionHandler([alert.textFields.firstObject text]);
+    }]];
+
+    [[[[Rhodes sharedInstance] mainView] getMainViewController] presentViewController:alert animated:YES completion:nil];
+}
+
+
+@end

data/platform/iphone/Classes/RhoWebView.h

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2016 TAU Technologies, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,8 +20,8 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
-* http://tau-technologies.com
+*
+* http://tau-platform.com
 *------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>

data/platform/iphone/Classes/RhoWebViewFabrique.h

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>

data/platform/iphone/Classes/RhoWebViewFabrique.m

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * http://tau-technologies.com
+ * http://tau-platform.com
  *------------------------------------------------------------------------*/
 
 #import "RhoWebViewFabrique.h"
@@ -46,7 +46,7 @@
 @implementation RhoWebViewFabrique
 
 + (id<RhoWebView,NSObject>)createRhoWebViewWithFrame:(CGRect)frame {
-    
+
     BOOL shouldMakeWkWebView = YES;
     BOOL isDirectRequestActivated = NO;
     BOOL isWKWebViewCLassExist = NO;
@@ -67,9 +67,9 @@
     if (NSClassFromString(@"WKWebView")) {
         isWKWebViewCLassExist = YES;
     }
-    
+
     id<RhoWebView,NSObject> webView = nil;
-    
+
     if (shouldMakeWkWebView) {
         RAWLOG_INFO("Try to create WKWebView ...");
         if (isDirectRequestActivated) {

data/platform/iphone/Classes/Rhodes.m

@@ -92,6 +92,9 @@ void rho_geoimpl_init();
 static BOOL app_created = NO;
 
 
+#define BLUR_VIEW_TAG 527196
+
+
 @interface RhoActivateTask : NSObject {}
 + (void)run;
 @end
@@ -159,6 +162,37 @@ static Rhodes *instance = NULL;
     return [Rhodes sharedInstance]->application;
 }
 
+
+- (void)blurCurrentView
+{
+    UIView *captured = [[[[Rhodes sharedInstance] mainView] getMainViewController].view snapshotViewAfterScreenUpdates:NO];
+
+    UIView *blurView = nil;
+    if ([UIVisualEffectView class]){
+        blurView        = [[UIVisualEffectView alloc]initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleRegular]];
+        blurView.frame  = captured.bounds;
+        [captured addSubview:blurView];
+    }
+    else {
+        UIToolbar *toolBar  = [[UIToolbar alloc] initWithFrame:captured.bounds];
+        toolBar.barStyle    = UIBarStyleBlackTranslucent;
+        [captured addSubview:toolBar];
+    }
+    captured.tag = BLUR_VIEW_TAG;
+    
+    if ([[[[Rhodes sharedInstance] mainView] getMainViewController].view viewWithTag:BLUR_VIEW_TAG]){
+        return;
+    }
+    [[[[Rhodes sharedInstance] mainView] getMainViewController].view addSubview:captured];
+}
+
+- (void)unblurCirrentView
+{
+    [[[[[Rhodes sharedInstance] mainView] getMainViewController].view viewWithTag:BLUR_VIEW_TAG] removeFromSuperview];
+}
+
+
+
 + (CGRect)applicationFrame {
     CGRect frame = [[UIScreen mainScreen] applicationFrame];
     //CGRect sbFrame = [[UIApplication sharedApplication] statusBarFrame];
@@ -829,8 +863,8 @@ static void displayStatusChanged(CFNotificationCenterRef center, void *observer,
     RAWLOG_INFO("Create new detached thread for initialization stuff");
     [NSThread detachNewThreadSelector:@selector(doRhoInit) toTarget:self withObject:nil];
     
-    RAWLOG_INFO(@"Init all windows");
-    
+    RAWLOG_INFO("Init all windows");
+
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
     
 #ifndef RHO_STANDALONE_LIB
@@ -1417,6 +1451,13 @@ withCompletionHandler:(void(^)())completionHandler {
         
         [[RhoExtManagerSingletone getExtensionManager] applicationDidBecomeActive: application];
     }
+    
+#ifndef RHO_STANDALONE_LIB
+    if ([SplashViewController isReplaceContentWhenSnapshot]) {
+        [self unblurCirrentView];
+    }
+#endif
+
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
@@ -1430,6 +1471,13 @@ withCompletionHandler:(void(^)())completionHandler {
     }
     rho_rhodesapp_callAppActiveCallback(0);
     rho_rhodesapp_canstartapp("", ", ");
+    
+#ifndef RHO_STANDALONE_LIB
+    if ([SplashViewController isReplaceContentWhenSnapshot]) {
+        [self blurCurrentView];
+    }
+#endif
+    
     [self saveLastUsedTime];
 }
 
@@ -1438,12 +1486,12 @@ withCompletionHandler:(void(^)())completionHandler {
     
     
 #ifndef RHO_STANDALONE_LIB
-    if ([SplashViewController isReplaceContentWhenSnapshot]) {
-        if (splashViewControllerSnapShot == nil) {
-            splashViewControllerSnapShot = [[SplashViewController alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-        }
-        [self.window.rootViewController presentViewController:[splashViewControllerSnapShot retain] animated:NO completion:NULL];
-    }
+    //if ([SplashViewController isReplaceContentWhenSnapshot]) {
+    //    if (splashViewControllerSnapShot == nil) {
+    //        splashViewControllerSnapShot = [[SplashViewController alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    //    }
+    //    [self.window.rootViewController presentViewController:[splashViewControllerSnapShot retain] animated:NO completion:NULL];
+    //}
 #endif
 
     RAWLOG_INFO("Application go to background");
@@ -1492,9 +1540,9 @@ withCompletionHandler:(void(^)())completionHandler {
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
 #ifndef RHO_STANDALONE_LIB
-    if ([SplashViewController isReplaceContentWhenSnapshot]) {
-        [self.window.rootViewController dismissViewControllerAnimated:NO completion:NO];
-    }
+    //if ([SplashViewController isReplaceContentWhenSnapshot]) {
+    //    [self.window.rootViewController dismissViewControllerAnimated:NO completion:NO];
+    //}
 #endif
     [self registerForNotifications];
 }
@@ -1551,7 +1599,7 @@ withCompletionHandler:(void(^)())completionHandler {
     
     if ([[url scheme] isEqualToString:url0]) {
         NSString *startparams = @"";
-        NSString *fullurl = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        NSString *fullurl = [[url absoluteString] stringByRemovingPercentEncoding];
         
         NSRange range = [fullurl rangeOfString:@":"];
         if ((range.location > 0) && (range.length > 0)) {

data/platform/iphone/Classes/SimpleMainView.m

@@ -769,8 +769,8 @@ static BOOL makeHiddenUntilLoadContent = YES;
     // in the same manner as with those which are not. In case if 'url' is already encoded,
     // encodedUrl will be exactly the same as original one whereas if original url was not
     // encoded, encodedUrl will contain correct encoded version
-    NSString *decodedUrl = [url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSString *encodedUrl = [decodedUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *decodedUrl = [url stringByRemovingPercentEncoding];
+    NSString *encodedUrl = [decodedUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
     
     // additional check for anchor for file:// prefix
     if ([encodedUrl hasPrefix:@"file://"]) {

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.m

@@ -245,8 +245,8 @@ int on_http_cb(http_parser* parser) { return 0; }
         }
         NSString* loc = [self.httpHeaders objectForKey:@"location"];
         
-        NSString* escaped = [loc stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         
+        NSString* escaped = [loc stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
         url = [NSURL URLWithString:escaped];
         
         if ( url != nil )
@@ -262,7 +262,7 @@ int on_http_cb(http_parser* parser) { return 0; }
             }
               
             NSString* spath = [url path];
-            spath = [spath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+            spath = [spath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
 
               
             if (force_https) {
@@ -277,7 +277,7 @@ int on_http_cb(http_parser* parser) { return 0; }
             if ( squery != nil )
             {
                 // decode query back to original state
-                squery = [squery stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                squery = [squery stringByRemovingPercentEncoding];
                 [s appendFormat:@"?%@", squery];
             }
             

data/platform/iphone/Classes/URLProtocol/CRhoWKURLProtocol.m

@@ -166,7 +166,7 @@ extern int rho_nodejs_get_port();
                 loc = [_headers objectForKey:@"Location"];
             }
             if (loc != nil) {
-                NSString* escaped = [loc stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                NSString* escaped = [loc stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
                 NSURL* _url = [NSURL URLWithString:escaped];
 
                 NSMutableURLRequest* _redirReq = [NSMutableURLRequest requestWithURL:_url];

data/platform/iphone/Classes/rho/net/IPhoneNetRequest.mm

@@ -481,7 +481,7 @@ public:
       encodedUrl = [NSString stringWithUTF8String:url.c_str()];
 
       // encode whole URL for NSURLComponents ( url with {id} not pass by NSURLComponents)
-      encodedUrl = [encodedUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+      encodedUrl = [encodedUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
 
       NSURLComponents* components = [NSURLComponents componentsWithString:encodedUrl];