rhodes 7.4.1 → 7.6.0

data/platform/iphone/Classes/CocoaServer/RhoHTTPConnection.m

@@ -0,0 +1,226 @@
+#import "RhoHTTPConnection.h"
+#import "GCDAsyncSocket.h"
+#import "HTTPServer.h"
+#import "HTTPMessage.h"
+#import "HTTPResponse.h"
+#import "HTTPAuthenticationRequest.h"
+#import "DDNumber.h"
+#import "DDRange.h"
+#import "DDData.h"
+#import "HTTPFileResponse.h"
+#import "HTTPAsyncFileResponse.h"
+#import "WebSocket.h"
+#import "HTTPLogging.h"
+
+
+extern const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength );
+extern void rho_http_free_response( const char* data );
+
+extern void* rho_http_init_headers_list();
+extern void rho_http_add_header( void* list, const char* name, const char* value );
+extern void rho_http_free_headers_list( void* list );
+
+#define HTTP_RESPONSE                      90
+#define HTTP_FINAL_RESPONSE                91
+#define TIMEOUT_WRITE_BODY                   -1
+
+static const int ddLogLevel = LOG_LEVEL_VERBOSE;
+
+@implementation RhoHTTPConnection
+
+
+- (BOOL)supportsMethod:(NSString *)method atPath:(NSString *)path
+{
+
+    if ([method isEqualToString:@"GET"])
+        return YES;
+    
+    if ([method isEqualToString:@"POST"])
+        return YES;
+    
+    if ([method isEqualToString:@"PUT"])
+        return YES;
+
+    if ([method isEqualToString:@"HEAD"])
+        return YES;
+        
+    return NO;
+}
+
+/*
+ - (BOOL)expectsRequestBodyFromMethod:(NSString *)method atPath:(NSString *)path {
+    return YES;
+}
+*/
+
+- (void)startConnection
+{
+    mBodyLen = 0;
+    mBody = nil;
+    mResponseData = nil;
+    [super startConnection];
+}
+
+- (void)prepareForBodyWithSize:(UInt64)contentLength {
+    if (mBody != nil) {
+        //[mBody release];
+        mBody = nil;
+    }
+    mBodyLen = contentLength;
+    mBody = [[NSMutableData alloc] initWithCapacity:contentLength];
+}
+
+- (void)processBodyData:(NSData *)postDataChunk {
+    // only up to 256 Kb !!! - if larger we must accumulate data !
+    if (mBody == nil) {
+        mBody = [[NSMutableData alloc] initWithCapacity:(128*1024)];
+    }
+    [mBody appendData:postDataChunk];
+}
+
+- (void)finishBody
+{
+    if (mBody != nil) {
+        [request setBody:mBody];
+    }
+}
+
+
+- (void)replyToHTTPRequest {
+    
+    NSString *requestUri = [self requestURI];
+    
+    NSURL* nsurl = [NSURL URLWithString:requestUri];
+    NSString *requestMethod = [request method];
+    NSDictionary* requestHeaders = [request allHeaderFields];
+    NSData* requestBody = [request body];
+    
+    
+    
+    
+    
+    const char* uri = [[nsurl path] UTF8String];
+    const char* method = [requestMethod UTF8String];
+    const char* body = [requestBody bytes];
+    int bodylen = (int)requestBody.length;
+    const char* query = [[nsurl query] UTF8String];
+    
+    void* cHeaders = rho_http_init_headers_list();
+    
+    for (NSString* key in requestHeaders) {
+      NSString* value = [requestHeaders objectForKey:key];
+      
+      rho_http_add_header(cHeaders, [key UTF8String], [value UTF8String]);
+      
+    }
+    
+    int len = 0;
+    
+    //if ([requestUri isEqualToString:@"/system/js_api_entrypoint"]) {
+    //    int o= 9;
+    //    o = 0;
+    //}
+    
+    
+    
+    const char* response = rho_http_direct_request(method, uri, query, cHeaders, body, bodylen, &len);
+    
+    rho_http_free_headers_list(cHeaders);
+    if (mBody != nil) {
+        //int c = [mBody retainCount];
+        //[mBody release];
+        mBody = nil;
+        mBodyLen = 0;
+        //[request setBody:nil];
+    }
+
+    
+    //CRhoURLResponse* resp = nil;
+    
+    if ( response != 0 ) {
+      
+      /*
+       // parse http responce for prepare detailed responce instead of raw data
+       // not used currently - just send raw data
+       
+      self.httpStatusCode = 0;
+      self.httpBody = nil;
+      self.httpHeaderName = nil;
+      self.httpHeaders = nil;
+      
+      http_parser_settings settings;
+      settings.on_header_field = on_http_header;
+      settings.on_header_value = on_http_header_value;
+      settings.on_body = on_http_body;
+      settings.on_status = on_http_status;
+      
+      settings.on_headers_complete = on_http_cb;
+      settings.on_message_begin = on_http_cb;
+      settings.on_message_complete = on_http_cb;
+      settings.on_url = on_http_data_cb;
+      http_parser *parser = malloc(sizeof(http_parser));
+      parser->data = self;
+      http_parser_init(parser, HTTP_RESPONSE);
+      http_parser_execute(parser, &settings, response, len);
+      
+      NSString* strHttpVer = [NSString stringWithFormat:@"%d.%d",parser->http_major,parser->http_minor];
+      
+      self.httpStatusCode = parser->status_code;
+      
+      free(parser);
+       */
+        
+        //NSMutableData* responseData = [NSMutableData dataWithCapacity:len];
+        //[responseData appendBytes:response length:len];
+        if (mResponseData != nil) {
+            //[mResponseData release];
+            mResponseData = nil;
+        }
+        mResponseData = [[NSData alloc] initWithBytes:response length:len];
+        //[(NSMutableData*)mResponseData appendBytes:response length:len];
+        rho_http_free_response(response);
+
+        
+        //char a[1];
+        //a[0] = 0;
+        //NSData* zz = [NSData dataWithBytes:a length:1];
+
+        [asyncSocket writeData:mResponseData withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_FINAL_RESPONSE];
+
+        //[mResponseData release];
+
+        //[self finishResponse];
+    }
+    else {
+        [self handleResourceNotFound];
+    }
+    
+    // totally replace responce functionality
+    //[super replyToHTTPRequest];
+}
+
+
+- (void)socket:(GCDAsyncSocket *)sock didWriteDataWithTag:(long)tag
+{
+    // Inform the http response that we're done
+    if ([httpResponse respondsToSelector:@selector(connectionDidClose)])
+    {
+        [httpResponse connectionDidClose];
+    }
+    
+    if (tag == HTTP_FINAL_RESPONSE)
+    {
+        // Cleanup after the last request
+        [self finishResponse];
+        
+        // Terminate the connection
+        [asyncSocket disconnect];
+        
+        mResponseData = nil;
+         
+        // Explictly return to ensure we don't do anything after the socket disconnects
+        return;
+    }
+}
+
+@end

data/platform/iphone/Classes/RhoAppBaseLib-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

data/platform/iphone/Classes/RhoAppBaseStandaloneLib-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

data/platform/iphone/Classes/RhoCryptAESGCM.swift

@@ -0,0 +1,105 @@
+//
+//  RhoCryptAESGCM.swift
+//  RhoAppBaseLib
+//
+//  Created by Dmitry Soldatenkov on 13.04.2023.
+//
+
+import Foundation
+import os
+import CryptoKit
+
+
+@objc(RhoCryptAESGCM)
+public class RhoCryptAESGCM : NSObject {
+    
+    
+    @objc(generate_new_key)
+    public func generate_new_key() -> Data? {
+        if #available(iOS 13.0, *) {
+            let key = SymmetricKey(size: .bits256)
+            let key_data = key.withUnsafeBytes { Data(Array($0)) }
+            return key_data
+        }
+        return nil;
+    }
+    
+    @objc(encrypt_page::)
+    public func encrypt_page(page : Data, key : Data) -> Data? {
+        
+        if #available(iOS 13.0, *) {
+            let data_to_encrypt : Data = page.subdata(in: 0 ..< (page.count-32) )
+            let symm_key = SymmetricKey(data: key)
+            
+            // encrypt
+            do {
+            
+                let sealedBox = try AES.GCM.seal(data_to_encrypt, using: symm_key)
+                
+                //
+                var result_data : Data = sealedBox.ciphertext
+                let nonce_data : Data = Data(sealedBox.nonce)
+                let tag_data : Data = sealedBox.tag
+                
+                let random_4_bytes_data : Data = Data((0 ..< 4).map { _ in UInt8.random(in: UInt8.min ... UInt8.max) })
+                
+                result_data.append(nonce_data)
+                result_data.append(random_4_bytes_data)
+                result_data.append(tag_data)
+
+                return result_data
+            }
+            catch {
+                return nil
+            }
+
+        }
+        else {
+            return nil
+        }
+        
+    }
+    
+    @objc(decrypt_page::)
+    public func decrypt_page(page : Data, key : Data) -> Data? {
+        
+        
+        if #available(iOS 13.0, *) {
+            
+            do {
+                let data_to_decrypt : Data = page.subdata(in: 0 ..< (page.count-32) )
+                
+                let nonce_data : Data = page.subdata(in: (page.count-32) ..< (page.count-32+12))
+                let tag_data : Data = page.subdata(in: (page.count-16) ..< (page.count))
+                
+                let nonce : AES.GCM.Nonce = try AES.GCM.Nonce(data: nonce_data)
+                let symm_key = SymmetricKey(data: key)
+                
+                
+                
+                let sealedBoxRestored = try AES.GCM.SealedBox(nonce: nonce, ciphertext: data_to_decrypt, tag: tag_data)
+                let result_data : Data = try AES.GCM.open(sealedBoxRestored, using: symm_key)
+                
+                return result_data
+            }
+            catch {
+                return nil
+            }
+        }
+        else {
+            return nil
+        }
+        
+    }
+    
+    
+    @objc(is_aes_gcm_available)
+    public func is_aes_gcm_available() -> Bool {
+        if #available(iOS 13.0, *) {
+            return true
+        }
+        return false
+    }
+    
+}
+    

data/platform/iphone/Classes/RhoUIWebView.h

@@ -50,7 +50,7 @@
 
 // UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer;
 
 - (void)loadRequest:(NSURLRequest *)request;
 

data/platform/iphone/Classes/RhoUIWebView.m

@@ -108,7 +108,7 @@
 
 //UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script {
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer{
     return [webview stringByEvaluatingJavaScriptFromString:script];
 }
 

data/platform/iphone/Classes/RhoWKWebView.h

@@ -50,7 +50,7 @@
 
 // UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer;
 
 - (void)loadRequest:(NSURLRequest *)request;
 

data/platform/iphone/Classes/RhoWKWebView.mm

@@ -126,26 +126,116 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
             isDirectRequestActivated = YES;
         }
     }
-    if (isDirectRequestActivated) {
+    BOOL isDirectRequestCustomProtocol = NO;
+    if (rho_conf_is_property_exists("ios_direct_local_requests_with_custom_protocol")!=0) {
+        if (rho_conf_getBool("ios_direct_local_requests_with_custom_protocol")!=0 ) {
+            isDirectRequestCustomProtocol = YES;
+        }
+    }
+
+    if (isDirectRequestActivated || isDirectRequestCustomProtocol) {
+        
+        BOOL isDirectProcessingActivated = NO;
+        
+            
+        if (!isDirectProcessingActivated) {
+            if (isDirectRequestCustomProtocol) {
+                
+                CRhoWKURLProtocol *schemeHandler = [[CRhoWKURLProtocol alloc] init];
+                [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"rhoctp"];
+                isDirectProcessingActivated = YES;
+            }
+        }
+
+#ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_3
+        if (!isDirectProcessingActivated) {
+            
+            try {
+                NSArray *privateStrArr = @[@"Handlers", @"Scheme", @"url", @"_"];
+                NSString *keyName =  [[[privateStrArr reverseObjectEnumerator] allObjects] componentsJoinedByString:@""];
+                
+                CRhoWKURLProtocol *schemeHandler = [[CRhoWKURLProtocol alloc] init];
+                [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"rhoapiprotocol"];
+                NSMutableDictionary *handlers = [configuration valueForKey:keyName];
+                if (handlers != nil) {
+                    handlers[@"http"] = schemeHandler;
+                    handlers[@"https"] = schemeHandler;
+                    isDirectProcessingActivated = YES;
+                }
+            } catch(id anException)  {
+                int o = 9;
+                o = 7;
+
+            }
+        }
+#endif
+
+#ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_2
+        if (!isDirectProcessingActivated) {
+
+            try {
+
+                NSArray *privateStrArr = @[@"Controller", @"Context", @"Browsing", @"K", @"W"];
+                NSString *className =  [[[privateStrArr reverseObjectEnumerator] allObjects] componentsJoinedByString:@""];
+                NSArray *privateStr2Arr = @[@":", @"Protocol", @"Custom", @"For", @"Scheme", @"register"];
+                NSString *selName =  [[[privateStr2Arr reverseObjectEnumerator] allObjects] componentsJoinedByString:@""];
+
+                Class cls = NSClassFromString(className);
+                SEL sel = NSSelectorFromString(selName);
+                
+                if (cls && sel) {
+                    if ([(id)cls respondsToSelector:sel]) {
+                        [(id)cls performSelector:sel withObject:@"http"];
+                        [(id)cls performSelector:sel withObject:@"https"];
+                        isDirectProcessingActivated = YES;
+                    }
+                }
+                // already registered when app started
+                //[NSURLProtocol registerClass:[CRhoURLProtocol class]];
+                
+            } catch(id anException)  {
+                int o = 9;
+                o = 7;
+
+            }
+
+        }
+#endif
+
 #ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
 
-        CRhoWKURLProtocol *schemeHandler = [[CRhoWKURLProtocol alloc] init];
+        if (!isDirectProcessingActivated) {
+            try {
+
+                CRhoWKURLProtocol *schemeHandler = [[CRhoWKURLProtocol alloc] init];
 
-        // replace original static method to our bogus method
-        Method bogusHandle = class_getClassMethod([WKWebView class], @selector(bogushandlesURLScheme:));
-        Method handleOriginal = class_getClassMethod([WKWebView class], @selector(handlesURLScheme:));
-        method_exchangeImplementations(bogusHandle, handleOriginal);
+                // replace original static method to our bogus method
+                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"];
+                [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"http"];
+                [configuration setURLSchemeHandler:schemeHandler forURLScheme:@"https"];
 
-        // return original static method
-        method_exchangeImplementations(bogusHandle, handleOriginal);
-#else
-        RAWLOG_ERROR("You can not enable ios_direct_local_requests if you not added IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING capability to build.yml !!!");
+                // return original static method
+                method_exchangeImplementations(bogusHandle, handleOriginal);
+                isDirectProcessingActivated = YES;
+            } catch(id anException)  {
+                int o = 9;
+                o = 7;
+            }
+        }
 #endif
+        
+        if (!isDirectProcessingActivated) {
+            RAWLOG_ERROR("You can not enable ios_direct_local_requests if you not added IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING or/and APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_2 or/and APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_3 capability/s to build.yml !!!");
+        }
     }
+    
+    configuration.preferences.javaScriptCanOpenWindowsAutomatically = YES;
+    //configuration.limitsNavigationsToAppBoundDomains = NO;
+    
     WKWebView* w = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
 
     //w.scalesPageToFit = YES;
@@ -191,10 +281,15 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 
 //UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script {
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer{
         __block NSString *resultString = nil;
         __block BOOL finished = NO;
 
+    if (!wantAnswer) {
+        [webview evaluateJavaScript:script completionHandler:nil];
+        return nil;
+    }
+    
         [webview evaluateJavaScript:script completionHandler:^(id result, NSError *error) {
             if (error == nil) {
                 if (result != nil) {
@@ -206,7 +301,7 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
             finished = YES;
         }];
 
-        while (!finished)
+        while (!finished && wantAnswer)
         {
             [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
         }
@@ -271,7 +366,7 @@ static void dumpClassInfo(Class c, int inheritanceDepth)
 - (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation {
     // force Ajax CommonAPI calls
     NSString* jscode = @"window['__rho_nativeBridgeType']='ajax'";
-    [self stringByEvaluatingJavaScriptFromString:jscode];
+    [self stringByEvaluatingJavaScriptFromString:jscode wantAnswer:NO];
 
     [delegate webViewDidFinishLoad:self];
 }

data/platform/iphone/Classes/RhoWebView.h

@@ -54,7 +54,7 @@
 
 //UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer;
 
 - (void)loadRequest:(NSURLRequest *)request;
 

data/platform/iphone/Classes/RhoWebViewFabrique.m

@@ -49,12 +49,18 @@
 
     BOOL shouldMakeWkWebView = YES;
     BOOL isDirectRequestActivated = NO;
+    BOOL isDirectRequestCustomProtocol = NO;
     BOOL isWKWebViewCLassExist = NO;
     if (rho_conf_is_property_exists("ios_direct_local_requests")!=0) {
         if (rho_conf_getBool("ios_direct_local_requests")!=0 ) {
             isDirectRequestActivated = YES;
         }
     }
+    if (rho_conf_is_property_exists("ios_direct_local_requests_with_custom_protocol")!=0) {
+        if (rho_conf_getBool("ios_direct_local_requests_with_custom_protocol")!=0 ) {
+            isDirectRequestCustomProtocol = YES;
+        }
+    }
     if (rho_conf_is_property_exists("ios_use_WKWebView")!=0) {
         if (rho_conf_getBool("ios_use_WKWebView")==0 ) {
 #ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
@@ -72,10 +78,15 @@
 
     if (shouldMakeWkWebView) {
         RAWLOG_INFO("Try to create WKWebView ...");
-        if (isDirectRequestActivated) {
+        if (isDirectRequestActivated && (!isDirectRequestCustomProtocol)) {
 #ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
+
+#elif defined APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_2
+
+#elif defined APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_3
+
 #else
-            RAWLOG_ERROR("You can not enable ios_direct_local_requests if you not added IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING capability to build.yml !!!");
+            RAWLOG_ERROR("You can not enable ios_direct_local_requests if you not added IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING or/and APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_2 or/and APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING_METHOD_3 capability to build.yml !!!");
 #endif
         }
         if (isWKWebViewCLassExist) {

data/platform/iphone/Classes/Rhodes.m

@@ -489,6 +489,9 @@ static Rhodes *instance = NULL;
             picker.allowsEditing = NO;
         }
 #endif
+      
+        delegateObject.isCaptureProcessRunning = YES;
+        
         // Show picker
 #ifdef __IPHONE_3_2
         if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && (type != UIImagePickerControllerSourceTypeCamera)) {

data/platform/iphone/Classes/SimpleMainView.m

@@ -732,7 +732,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	
 	//[self loadHTMLString:datas];
     NSString* jscode = [NSString stringWithFormat:@"document.body.style.backgroundColor = \"#%6X\";", bkg_color];
-    [self.rhoWebView stringByEvaluatingJavaScriptFromString:jscode];
+    [self.rhoWebView stringByEvaluatingJavaScriptFromString:jscode wantAnswer:NO];
 
 	//self.webView.hidden = YES;
 }
@@ -983,7 +983,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		[self.view.superview bringSubviewToFront:self.view];
     }
     RAWLOG_INFO1("Executing JS: %s", [js UTF8String]);
-    [rhoWebView stringByEvaluatingJavaScriptFromString:js];
+    [rhoWebView stringByEvaluatingJavaScriptFromString:js wantAnswer:NO];
 }
 
 - (NSString*)currentLocation:(int)index {
@@ -993,7 +993,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 #define CUR_URL_DICT_KEY @"CUR_URL_DICT_KEY"
 
 -(void) get_current_url_command:(NSMutableDictionary*)dict {
-    NSString* res = [rhoWebView stringByEvaluatingJavaScriptFromString:@"window.location.href"];
+    NSString* res = [rhoWebView stringByEvaluatingJavaScriptFromString:@"window.location.href" wantAnswer:YES];
     //NSString* res = [[webView.request mainDocumentURL] absoluteString];
     [dict setValue:res forKey:CUR_URL_DICT_KEY];
 }
@@ -1131,7 +1131,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 #if defined(RHO_NO_RUBY_API)
     if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"] && ![scheme isEqualToString:@"file"])
 #else
-        if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"] && ![scheme isEqualToString:@"file"])
+        if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"] && ![scheme isEqualToString:@"rhoctp"] && ![scheme isEqualToString:@"file"])
 #endif
             external = YES;
         else {
@@ -1181,7 +1181,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void)webViewDidFinishLoad:(id<RhoWebView,NSObject>)webView {
     // Disable default context menu on touch
-    [rhoWebView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout = \"none\";"];
+    [rhoWebView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout = \"none\";" wantAnswer:NO];
     
     PROF_STOP("BROWSER_PAGE");