rhodes 5.5.0.3 → 5.5.0.7

data/platform/iphone/Classes/RhoWKWebView.h

@@ -0,0 +1,87 @@
+/*------------------------------------------------------------------------
+ * (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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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
+ *------------------------------------------------------------------------*/
+
+
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
+#import "RhoWebView.h"
+
+@interface RhoWKWebView : NSObject<RhoWebView, WKNavigationDelegate> {
+    WKWebView *webview;
+    id<RhoWebViewDelegate,NSObject> delegate;
+}
+
+@property (nonatomic,retain) WKWebView *webview;
+@property (nonatomic,retain) id<RhoWebViewDelegate,NSObject> delegate;
+
+- (id)initWithFrame:(CGRect)frame;
+
+- (void) setupDelegate:(id<RhoWebViewDelegate,NSObject>)delegate;
+
+- (UIView*)view;
+
+- (UIView*)containerView;
+
+- (NSString*)currentLocation;
+
+// UIWebView
+
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+
+- (void)loadRequest:(NSURLRequest *)request;
+
+- (void)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL;
+
+- (void)stopLoading;
+
+- (void)reload;
+
+- (void)goBack;
+
+- (void)goForward;
+
+
+
+// WKNavigationDelegate
+//   UIWebViewDelegate -> WKNavigationDelegate migrate
+//     didFailLoadWithError => didFailNavigation
+//     webViewDidFinishLoad => didFinishNavigation
+//     webViewDidStartLoad => didStartProvisionalNavigation
+//     shouldStartLoadWithRequest => decidePolicyForNavigationAction
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler;
+//- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler;
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(null_unspecified WKNavigation *)navigation;
+//- (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(null_unspecified WKNavigation *)navigation;
+//- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error;
+//- (void)webView:(WKWebView *)webView didCommitNavigation:(null_unspecified WKNavigation *)navigation;
+- (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation;
+- (void)webView:(WKWebView *)webView didFailNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error;
+//- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler;
+
+
+@end
+

data/platform/iphone/Classes/RhoWKWebView.m

@@ -0,0 +1,187 @@
+/*------------------------------------------------------------------------
+ * (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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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
+ *------------------------------------------------------------------------*/
+
+
+
+#import "RhoWKWebView.h"
+#import "RhoMainView.h"
+#include "logging/RhoLog.h"
+#include "common/RhoConf.h"
+
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoWKWebView"
+
+
+@implementation RhoWKWebView
+
+@synthesize webview, delegate;
+
+- (id)initWithFrame:(CGRect)frame {
+    [self init];
+    WKWebView* w = [[WKWebView alloc] initWithFrame:frame];
+    //w.scalesPageToFit = YES;
+    if ( !rho_conf_getBool("WebView.enableBounce") )
+        [[w scrollView] setBounces:NO];
+    w.userInteractionEnabled = YES;
+    w.multipleTouchEnabled = YES;
+    w.clipsToBounds = NO;
+    //w.dataDetectorTypes = UIDataDetectorTypeNone;
+    w.navigationDelegate = 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;
+}
+
+- (UIView*)view {
+    return self.webview;
+}
+
+- (NSString*)currentLocation {
+    return [webview.URL absoluteString];
+}
+
+- (void) setupDelegate:(id<RhoWebViewDelegate,NSObject>)delegate {
+    self.delegate = delegate;
+}
+
+- (UIView*)containerView {
+    return self.webview.scrollView;
+}
+
+
+
+
+//UIWebView
+
+- (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) {
+                    resultString = [NSString stringWithFormat:@"%@", result];
+                }
+            } else {
+                NSLog(@"WKWebView.evaluateJavaScript error : %@", error.localizedDescription);
+            }
+            finished = YES;
+        }];
+        
+        while (!finished)
+        {
+            [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+        }
+        
+        return resultString;
+}
+
+- (void)loadRequest:(NSURLRequest *)request {
+    [webview loadRequest:request];
+}
+
+- (void)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL {
+    [webview loadHTMLString:string baseURL:baseURL];
+}
+
+- (void)stopLoading {
+    [webview stopLoading];
+}
+
+- (void)reload {
+    [webview reload];
+}
+
+- (void)goBack {
+    [webview goBack];
+}
+
+- (void)goForward {
+    [webview goForward];
+}
+
+
+
+
+// WKNavigationDelegate
+//   UIWebViewDelegate -> WKNavigationDelegate migrate
+//     didFailLoadWithError => didFailNavigation
+//     webViewDidFinishLoad => didFinishNavigation
+//     webViewDidStartLoad => didStartProvisionalNavigation
+//     shouldStartLoadWithRequest => decidePolicyForNavigationAction
+
+- (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;
+    }
+    BOOL result = YES;
+    if (delegate != nil) {
+        result = [delegate shouldStartLoadWithRequest:self request:navigationAction.request navigationType:navType];
+    }
+    if (result) {
+        decisionHandler(WKNavigationActionPolicyAllow);
+    }
+    else {
+        decisionHandler(WKNavigationActionPolicyCancel);
+    }
+}
+
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(null_unspecified WKNavigation *)navigation {
+    [delegate webViewDidStartLoad:self];
+}
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation {
+    [delegate webViewDidFinishLoad:self];
+}
+
+- (void)webView:(WKWebView *)webView didFailNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error {
+    [delegate didFailLoadWithError:self error:error];
+}
+
+@end
+

data/platform/iphone/Classes/RhoWebView.h

@@ -0,0 +1,72 @@
+/*------------------------------------------------------------------------
+* (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
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* 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
+*------------------------------------------------------------------------*/
+
+#import <UIKit/UIKit.h>
+
+
+@protocol RhoWebView;
+
+@protocol RhoWebViewDelegate <NSObject>
+
+@optional
+- (BOOL)shouldStartLoadWithRequest:(id<RhoWebView,NSObject>)webView request:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType;
+- (void)webViewDidStartLoad:(id<RhoWebView,NSObject>)webView;
+- (void)webViewDidFinishLoad:(id<RhoWebView,NSObject>)webView;
+- (void)didFailLoadWithError:(id<RhoWebView,NSObject>)webView error:(NSError *)error;
+
+@end
+
+
+
+@protocol RhoWebView <NSObject>
+
+
+- (UIView*)view;
+
+- (void) setupDelegate:(id<RhoWebViewDelegate,NSObject>)delegate;
+
+- (NSString*)currentLocation;
+
+- (UIView*)containerView;
+
+//UIWebView
+
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+
+- (void)loadRequest:(NSURLRequest *)request;
+
+- (void)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL;
+
+- (void)stopLoading;
+
+- (void)reload;
+
+- (void)goBack;
+
+- (void)goForward;
+
+
+@end

data/platform/iphone/Classes/RhoWebViewFabrique.h

@@ -0,0 +1,35 @@
+/*------------------------------------------------------------------------
+ * (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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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
+ *------------------------------------------------------------------------*/
+
+#import <UIKit/UIKit.h>
+#import "RhoWebView.h"
+
+@interface RhoWebViewFabrique : NSObject {
+}
+
++ (id<RhoWebView,NSObject>)createRhoWebViewWithFrame:(CGRect)frame;
+
+@end

data/platform/iphone/Classes/RhoWebViewFabrique.m

@@ -0,0 +1,87 @@
+/*------------------------------------------------------------------------
+ * (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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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
+ *------------------------------------------------------------------------*/
+
+#import "RhoWebViewFabrique.h"
+#import <WebKit/WebKit.h>
+
+#import "RhoUIWebView.h"
+#import "RhoWKWebView.h"
+
+#import "common/RhoConf.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoWebViewFabrique"
+
+
+@implementation RhoWebViewFabrique
+
++ (id<RhoWebView,NSObject>)createRhoWebViewWithFrame:(CGRect)frame {
+    
+    BOOL shouldMakeWkWebView = NO;
+    BOOL isDirectRequestActivated = 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_use_WKWebView")!=0) {
+        if (rho_conf_getBool("ios_use_WKWebView")!=0 ) {
+            shouldMakeWkWebView = YES;
+        }
+    }
+    if (NSClassFromString(@"WKWebView")) {
+        isWKWebViewCLassExist = YES;
+    }
+    
+    id<RhoWebView,NSObject> webView = nil;
+    
+    if (shouldMakeWkWebView) {
+        RAWLOG_INFO("Try to create WKWebView ...");
+        if (isDirectRequestActivated) {
+            RAWLOG_ERROR("can not make WKWebView because ios_direct_local_requests is ACTIVATED !!!");
+        }
+        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 !!!");
+            }
+        }
+    }
+    if (webView == nil) {
+        RAWLOG_INFO("Try to create UIWebView ...");
+        webView = [[RhoUIWebView alloc] initWithFrame:frame];
+        RAWLOG_INFO("UIWebView was created OK !");
+    }
+
+    return webView;
+}
+
+@end