rhodes 6.2.0 → 7.1.17

data/platform/iphone/Classes/{RhoWKWebView.m → RhoWKWebView.mm}

@@ -31,10 +31,75 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 
+#import "URLProtocol/CRhoWKURLProtocol.h"
+
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoWKWebView"
 
+#import "common/app_build_capabilities.h"
+
+#ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
+
+#import <objc/runtime.h>
+
+
+
+@interface WKWebView (RhoAltMethod)
++ (BOOL)bogushandlesURLScheme:(NSString *)urlScheme;
+@end
+
+@implementation WKWebView (RhoAltMethod)
+
++ (BOOL)bogushandlesURLScheme:(NSString *)urlScheme {
+    return false;
+}
+
+@end
+
+
+static void dumpClassInfo(Class c, int inheritanceDepth)
+{
+    Class superClass = class_getSuperclass(c);
+    if (superClass != Nil)
+    {
+        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++) {
+            char argumentType[80];
+            method_getArgumentType(method, a, argumentType, 80);
+            NSLog(@"   Argument no #%d: %s", a, argumentType);
+        }
+    }
+}
+
+#endif //APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
+
+
+
+
 
 @implementation RhoWKWebView
 
@@ -44,10 +109,38 @@
     [self init];
     
     WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
-    if ( rho_conf_getBool("enable_media_playback_without_gesture") == 1 )
+    if ( rho_conf_getBool("enable_media_playback_without_gesture") == 1 ) {
         configuration.mediaPlaybackRequiresUserAction = NO;
+    }
+
+    BOOL isDirectRequestActivated = NO;
+    if (rho_conf_is_property_exists("ios_direct_local_requests")!=0) {
+        if (rho_conf_getBool("ios_direct_local_requests")!=0 ) {
+            isDirectRequestActivated = YES;
+        }
+    }
+    if (isDirectRequestActivated) {
+#ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
+
+        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);
+    
     
+        [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 !!!");
+#endif
+    }
     WKWebView* w = [[WKWebView alloc] initWithFrame:frame configuration:configuration];
+    
     //w.scalesPageToFit = YES;
     if ( !rho_conf_getBool("WebView.enableBounce") )
         [[w scrollView] setBounces:NO];
@@ -60,6 +153,7 @@
     //w.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.tag = RHO_TAG_WEBVIEW;
+    
     //assert([w retainCount] == 1);
     self.webview = w;
     
@@ -148,25 +242,11 @@
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
     
-    UIWebViewNavigationType navType = UIWebViewNavigationTypeOther;
-    if (navigationAction.navigationType == WKNavigationTypeLinkActivated) {
-        navType = UIWebViewNavigationTypeLinkClicked;
-    }
-    if (navigationAction.navigationType == WKNavigationTypeFormSubmitted) {
-        navType = UIWebViewNavigationTypeFormSubmitted;
-    }
-    if (navigationAction.navigationType == WKNavigationTypeBackForward) {
-        navType = UIWebViewNavigationTypeBackForward;
-    }
-    if (navigationAction.navigationType == WKNavigationTypeReload) {
-        navType = UIWebViewNavigationTypeReload;
-    }
-    if (navigationAction.navigationType == WKNavigationTypeFormResubmitted) {
-        navType = UIWebViewNavigationTypeFormResubmitted;
-    }
+    //NSLog(@"$$$$$ NavigationAction with URL = %@", [[navigationAction request] URL]);
+    
     BOOL result = YES;
     if (delegate != nil) {
-        result = [delegate shouldStartLoadWithRequest:self request:navigationAction.request navigationType:navType];
+        result = [delegate shouldStartLoadWithRequest:self request:navigationAction.request];
     }
     if (result) {
         decisionHandler(WKNavigationActionPolicyAllow);

data/platform/iphone/Classes/RhoWebView.h

@@ -32,7 +32,7 @@
 @protocol RhoWebViewDelegate <NSObject>
 
 @optional
-- (BOOL)shouldStartLoadWithRequest:(id<RhoWebView,NSObject>)webView request:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType;
+- (BOOL)shouldStartLoadWithRequest:(id<RhoWebView,NSObject>)webView request:(NSURLRequest *)request;
 - (void)webViewDidStartLoad:(id<RhoWebView,NSObject>)webView;
 - (void)webViewDidFinishLoad:(id<RhoWebView,NSObject>)webView;
 - (void)didFailLoadWithError:(id<RhoWebView,NSObject>)webView error:(NSError *)error;

data/platform/iphone/Classes/RhoWebViewFabrique.m

@@ -27,12 +27,18 @@
 #import "RhoWebViewFabrique.h"
 #import <WebKit/WebKit.h>
 
+#import "common/app_build_capabilities.h"
+
+#ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
 #import "RhoUIWebView.h"
+#endif
+
 #import "RhoWKWebView.h"
 
 #import "common/RhoConf.h"
 #include "logging/RhoLog.h"
 
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoWebViewFabrique"
 
@@ -41,7 +47,7 @@
 
 + (id<RhoWebView,NSObject>)createRhoWebViewWithFrame:(CGRect)frame {
     
-    BOOL shouldMakeWkWebView = NO;
+    BOOL shouldMakeWkWebView = YES;
     BOOL isDirectRequestActivated = NO;
     BOOL isWKWebViewCLassExist = NO;
     if (rho_conf_is_property_exists("ios_direct_local_requests")!=0) {
@@ -50,8 +56,12 @@
         }
     }
     if (rho_conf_is_property_exists("ios_use_WKWebView")!=0) {
-        if (rho_conf_getBool("ios_use_WKWebView")!=0 ) {
-            shouldMakeWkWebView = YES;
+        if (rho_conf_getBool("ios_use_WKWebView")==0 ) {
+#ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
+            shouldMakeWkWebView = NO;
+#else
+            RAWLOG_ERROR("You can not use UIWebView without capability IOS_UIWEBVIEW in build.yml !!!");
+#endif
         }
     }
     if (NSClassFromString(@"WKWebView")) {
@@ -63,24 +73,26 @@
     if (shouldMakeWkWebView) {
         RAWLOG_INFO("Try to create WKWebView ...");
         if (isDirectRequestActivated) {
-            RAWLOG_ERROR("can not make WKWebView because ios_direct_local_requests is ACTIVATED !!!");
+#ifdef APP_BUILD_CAPABILITY_IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING
+#else
+            RAWLOG_ERROR("You can not enable ios_direct_local_requests if you not added IOS_WKWEBVIEW_HTTP_DIRECT_PROCESSING capability to build.yml !!!");
+#endif
+        }
+        if (isWKWebViewCLassExist) {
+            webView = [[RhoWKWebView alloc] initWithFrame:frame];
+            RAWLOG_INFO("WKWebView was created OK !");
         }
         else {
-            if (isWKWebViewCLassExist) {
-                webView = [[RhoWKWebView alloc] initWithFrame:frame];
-                RAWLOG_INFO("WKWebView was created OK !");
-            }
-            else {
-                RAWLOG_ERROR("can not make WKWebView because iOS version < 8.0 - can not find WKWebView class !!!");
-            }
+            RAWLOG_ERROR("can not make WKWebView  - can not find WKWebView class !!!");
         }
     }
+#ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
     if (webView == nil) {
         RAWLOG_INFO("Try to create UIWebView ...");
         webView = [[RhoUIWebView alloc] initWithFrame:frame];
         RAWLOG_INFO("UIWebView was created OK !");
     }
-
+#endif
     return webView;
 }
 

data/platform/iphone/Classes/Rhodes.h

@@ -56,7 +56,8 @@
 #define NSFoundationVersionNumber_iOS_9_x_Max 1299
 #endif
 
-NSString *const kGCMMessageIDKey = @"gcm.message_id";
+//NSString *const kGCMMessageIDKey = @"gcm.message_id";
+//#define kGCMMessageIDKey @"gcm.message_id"
 
 @interface Rhodes : NSObject <UIApplicationDelegate,
     UITabBarControllerDelegate, AVAudioPlayerDelegate, UIAlertViewDelegate, UNUserNotificationCenterDelegate>
@@ -106,6 +107,8 @@ NSString *const kGCMMessageIDKey = @"gcm.message_id";
 
 + (Rhodes*)sharedInstance;
 
++(void) makeSharedInstance;
+
 + (UIApplication*)application;
 
 + (CGRect)applicationFrame;
@@ -126,6 +129,8 @@ NSString *const kGCMMessageIDKey = @"gcm.message_id";
 
 +(void)restart_app;
 
+- (BOOL)didFinishLaunchingWithOptionsInternal:(NSDictionary *)launchOptions application:(UIApplication *)application;
+
 - (UIWindow*)rootWindow;
 
 - (void)playStart:(NSString*)fileName mediaType:(NSString*)type;
@@ -162,4 +167,4 @@ NSString *const kGCMMessageIDKey = @"gcm.message_id";
 
 - (void)registerForRemoteNotification;
 
-@end
+@end

data/platform/iphone/Classes/Rhodes.m

@@ -45,10 +45,18 @@
 #import "CRhoURLProtocol.h"
 #import "RhoExtManager/RhoExtManagerSingletone.h"
 
+
+#ifdef RHO_STANDALONE_LIB
+#import "RhoMainViewStubImpl.h"
+#endif
+
+
 int rho_rhodesapp_check_mode();
 void rho_splash_screen_start();
 
 
+//NSString* kGCMMessageIDKey = @"gcm.message_id";
+
 /*
 use this non-public code for see level of memory warning 
  
@@ -142,6 +150,11 @@ static Rhodes *instance = NULL;
     return instance;
 }
 
++(void) makeSharedInstance {
+    instance = [[Rhodes alloc] init];
+}
+
+
 + (UIApplication*)application {
     return [Rhodes sharedInstance]->application;
 }
@@ -278,7 +291,7 @@ static Rhodes *instance = NULL;
 
 - (void)openMapLocation:(NSString*)query {
 	[self hideSplash];
-    NSURL* url = [NSURL URLWithString:[@"http://maps.google.com/?" stringByAppendingString:query]];
+    NSURL* url = [NSURL URLWithString:[@"https://maps.google.com/?" stringByAppendingString:query]];
     [[UIApplication sharedApplication] openURL:url];
 }
 
@@ -820,9 +833,10 @@ static void displayStatusChanged(CFNotificationCenterRef center, void *observer,
     
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
     
+#ifndef RHO_STANDALONE_LIB
+
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
     
-    
     const char* fs = get_app_build_config_item("iphone_full_screen");
     if (fs == NULL) {
         fs = "0";
@@ -856,7 +870,13 @@ static void displayStatusChanged(CFNotificationCenterRef center, void *observer,
 	}
 	
     [window makeKeyAndVisible];
-
+#else
+    
+    // standalone lib mode - no own UI
+    mainView = nil;
+    mainView = [[RhoMainViewStubImpl alloc] init];
+    
+#endif
  
 	CGRect rrr = [application statusBarFrame];
 	
@@ -1126,7 +1146,8 @@ static void displayStatusChanged(CFNotificationCenterRef center, void *observer,
 
 
 #ifdef __IPHONE_3_0
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+- (BOOL)didFinishLaunchingWithOptionsInternal:(NSDictionary *)launchOptions application:(UIApplication *)application {
     
     self.mBlockExit = NO;
 
@@ -1246,6 +1267,11 @@ static void displayStatusChanged(CFNotificationCenterRef center, void *observer,
 	return NO;
 }
 
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    return [self didFinishLaunchingWithOptionsInternal:launchOptions application:application];
+}
+
+
 #ifdef APP_BUILD_CAPABILITY_PUSH
 #if 0
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
@@ -1270,9 +1296,9 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 withCompletionHandler:(void(^)())completionHandler {
 #endif
     NSDictionary *userInfo = response.notification.request.content.userInfo;
-    if (userInfo[kGCMMessageIDKey]) {
-        NSLog(@"Message ID: %@", userInfo[kGCMMessageIDKey]);
-    }
+    //if (userInfo[kGCMMessageIDKey]) {
+    //    NSLog(@"Message ID: %@", userInfo[kGCMMessageIDKey]);
+    //}
     
     // Print full message.
     NSLog(@"%@", userInfo);
@@ -1410,13 +1436,15 @@ withCompletionHandler:(void(^)())completionHandler {
 #ifdef __IPHONE_4_0
 - (void)applicationDidEnterBackground:(UIApplication *)app {
     
+    
+#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];
     }
-    
+#endif
 
     RAWLOG_INFO("Application go to background");
     rho_rhodesapp_callUiDestroyedCallback();
@@ -1463,9 +1491,11 @@ withCompletionHandler:(void(^)())completionHandler {
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
+#ifndef RHO_STANDALONE_LIB
     if ([SplashViewController isReplaceContentWhenSnapshot]) {
         [self.window.rootViewController dismissViewControllerAnimated:NO completion:NO];
     }
+#endif
     [self registerForNotifications];
 }
 #endif
@@ -1588,3 +1618,11 @@ BOOL rho_main_is_rotation_locked() {
 void rho_main_set_rotation_locked(BOOL locked) {
     [[Rhodes sharedInstance] setRotationLocked:locked];
 }
+
+
+
+//void rhomobile_lib_start_app() {
+ //   [Rhodes makeSharedInstance];
+//    [[Rhodes sharedInstance] didFinishLaunchingWithOptionsInternal:[NSMutableDictionary dictionaryWithCapacity:5] application:[UIApplication sharedApplication]];
+    
+//}

data/platform/iphone/Classes/SimpleMainView.m

@@ -329,7 +329,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
     tb.autoresizesSubviews = YES;
     tb.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
  	
-	assert([tb retainCount] == 1);
+	//assert([tb retainCount] == 1);
     return tb;
 }
 
@@ -348,7 +348,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void)addToolbar:(NSDictionary*)bar_info {
     [self removeToolbar];
-    assert(!toolbar);
+    //assert(!toolbar);
     
     if (!bar_info)
         return;
@@ -637,11 +637,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void)viewDidLoad {
     UIView *root = self.view;
-    
+
     root.userInteractionEnabled = YES;
  	root.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 	root.autoresizesSubviews = YES;
-    
+
 	if (nativeView) {
           [root addSubview:[nativeView getView]];
 	}
@@ -649,22 +649,22 @@ static BOOL makeHiddenUntilLoadContent = YES;
         [root addSubview:[rhoWebView view]];
         [rhoWebView setupDelegate:self];
 	}
-	assert(!nativeView || [nativeView retainCount] == 2);
+	//assert(!nativeView || [nativeView retainCount] == 2);
 	//assert(!webView || [webView retainCount] == 2);
     if (toolbar)
         [root addSubview:toolbar];
-    assert(!toolbar || [toolbar retainCount] == 2);
+    //assert(!toolbar || [toolbar retainCount] == 2);
     if (navbar)
         [root addSubview:navbar];
-    assert(!navbar || [navbar retainCount] == 2);
+    //assert(!navbar || [navbar retainCount] == 2);
 }
 
 - (void)viewDidUnload {
     [super viewDidUnload];
     //assert(!nativeView || [nativeView retainCount] == 1);
     //assert(!webView || [webView retainCount] == 1);
-    assert(!toolbar || [toolbar retainCount] == 1);
-    assert(!navbar || [navbar retainCount] == 1);
+    //assert(!toolbar || [toolbar retainCount] == 1);
+    //assert(!navbar || [navbar retainCount] == 1);
 }
 
 - (void)dealloc {
@@ -946,7 +946,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
         //else {
 
         NSString *redirect = nil;
-        if ([cleared_url hasPrefix:@"file:"] || rho_rhodesapp_is_nodejs_app()) {
+        if ([cleared_url hasPrefix:@"file:"] || rho_rhodesapp_is_nodejs_app() || rho_rhodesapp_is_rubynodejs_app()) {
             redirect = cleared_url;
         }
         else {
@@ -1023,7 +1023,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
     [self removeNavBar];
     
     navbar = navb;
-    assert([navbar retainCount] == 1);
+    //assert([navbar retainCount] == 1);
     RAWLOG_INFO1("navbar retain count: %d", (int)[navbar retainCount]);
 	navbar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 	navbar.autoresizesSubviews = YES;
@@ -1050,7 +1050,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
     wFrame.size.height -= nFrame.size.height;
 
     [root addSubview:navbar];
-    assert([navbar retainCount] > 1);
+    //assert([navbar retainCount] > 1);
     
     [self setContentRect:wFrame];
 }
@@ -1109,7 +1109,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 
 
-- (BOOL)shouldStartLoadWithRequest:(id<RhoWebView,NSObject>)webView  request:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
+- (BOOL)shouldStartLoadWithRequest:(id<RhoWebView,NSObject>)webView  request:(NSURLRequest *)request {
 
     NSURL *url = [request URL];
     if (!url)
@@ -1220,9 +1220,18 @@ static BOOL makeHiddenUntilLoadContent = YES;
     self.url_after_set_background = nil;
     
     
+    if (rho_rhodesapp_is_rubynodejs_app()) {
+        const char* ruby_url_c = rho_rhodesapp_rubyhomeurl();
+        NSString* ruby_url = [NSString stringWithUTF8String:ruby_url_c];
+        NSString* jscode = [NSString stringWithFormat:@"window['__rho_apiAjaxURL']='%@/system/js_api_entrypoint'", ruby_url];
+        [self executeJs:jscode tab:self.thisTabIndex];
+    }
+
+
     NSString* jscode = [NSString stringWithFormat:@"window['__rhoJsVmID']='%@'", [NSNumber numberWithInt:self.thisTabIndex]];
     //[self executeJs:@"alert('hello')" tab:self.thisTabIndex];
     [self executeJs:jscode tab:self.thisTabIndex];
+    
     //[self executeJs:@"alert(window['__rhoJsVmID'])" tab:self.thisTabIndex];