rhodes 5.5.0.3 → 5.5.0.7

data/platform/iphone/Classes/SplitView/RightViewController.h

@@ -48,7 +48,6 @@
 
 //- (UIView*)view;
 
-- (UIWebView*)detachWebView;
 
 - (void)loadHTMLString:(NSString*)data;
 
@@ -68,7 +67,8 @@
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
 - (void)removeNavBar;
 
-- (UIWebView*)getWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)detachRhoWebView;
 
 -(void)callCallback:(int)new_index;
 

data/platform/iphone/Classes/SplitView/RightViewController.m

@@ -142,7 +142,7 @@ void rho_webview_refresh(int index);
             SimpleMainView *subController = nil;
             //SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:parent.view frame:rect];
             if (is_use_current_view_for_tab) {
-                subController = [[SimpleMainView alloc] initWithParentView:parent.view frame:rect webview:[[parent getCreationTimeMainView] detachWebView]];
+                subController = [[SimpleMainView alloc] initWithParentView:parent.view frame:rect rhowebview:[[parent getCreationTimeMainView] detachRhoWebView]];
             }
             else {
                 subController = [[SimpleMainView alloc] initWithParentView:parent.view frame:rect];
@@ -262,11 +262,6 @@ void rho_webview_refresh(int index);
 }
 
 
-- (UIWebView*)detachWebView {
-	SimpleMainView* v = [self getSimpleView:-1];
-	return [v detachWebView];
-}
-
 - (void)loadHTMLString:(NSString*)data {
 	SimpleMainView* v = [self getSimpleView:-1];
 	[v loadHTMLString:data];
@@ -376,12 +371,16 @@ void rho_webview_refresh(int index);
 	[v removeNavBar];
 }
 
-- (UIWebView*)getWebView:(int)tab_index {
-	SimpleMainView* v = [self getSimpleView:index];
-	return [v getWebView:tab_index];
-}
 
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index {
+    SimpleMainView* v = [self getSimpleView:index];
+    return [v getRhoWebView:tab_index];
+}
 
+- (id<RhoWebView,NSObject>)detachRhoWebView {
+    SimpleMainView* v = [self getSimpleView:-1];
+    return [v detachRhoWebView];
+}
 
 - (void)dealloc {
 	[itemsData release];

data/platform/iphone/Classes/SplitView/SplittedMainView.h

@@ -50,8 +50,6 @@
 
 //- (UIView*)view;
 
-- (UIWebView*)detachWebView;
-
 - (void)loadHTMLString:(NSString*)data;
 
 - (void)back:(int)index;
@@ -70,7 +68,8 @@
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
 - (void)removeNavBar;
 
-- (UIWebView*)getWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)detachRhoWebView;
 
 - (id<RhoMainView>)getCreationTimeMainView;
 

data/platform/iphone/Classes/SplitView/SplittedMainView.m

@@ -238,11 +238,18 @@ static void updateViewRect(CGRect* pRect)
 }
 
 
-- (UIWebView*)detachWebView {
-	RightViewController* rvc = [self getRightViewController];
-	return [rvc detachWebView];
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index {
+    RightViewController* rvc = [self getRightViewController];
+    return [rvc getRhoWebView:tab_index];
+}
+
+- (id<RhoWebView,NSObject>)detachRhoWebView {
+    RightViewController* rvc = [self getRightViewController];
+    return [rvc detachRhoWebView];
 }
 
+
+
 - (void)loadHTMLString:(NSString*)data {
 	RightViewController* rvc = [self getRightViewController];
 	[rvc loadHTMLString:data];
@@ -329,10 +336,6 @@ static void updateViewRect(CGRect* pRect)
 	[rvc removeNavBar];
 }
 
-- (UIWebView*)getWebView:(int)tab_index {
-	RightViewController* rvc = [self getRightViewController];
-	return [rvc getWebView:tab_index];
-}
  
 -(void)setTabBarBadge:(NSString*)badge_text tab_index:(int)tab_index {
     // nothing

data/platform/iphone/Classes/TabbedMainView.h

@@ -64,7 +64,8 @@
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info;
 
-- (UIWebView*)getWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)detachRhoWebView;
 
 - (void)onViewWillActivate:(RhoViewController*)view;
 

data/platform/iphone/Classes/TabbedMainView.m

@@ -493,7 +493,7 @@
 			}
 			else {
 				if (is_use_current_view_for_tab) {
-					subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame webview:[v detachWebView]];
+					subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame rhowebview:[v detachRhoWebView]];
 				}
 				else {
 					subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame];
@@ -631,11 +631,21 @@
 }
 
 // RhoMainView implementation
-- (UIWebView*)detachWebView {
+
+
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index {
+    if (tab_index == -1) {
+        tab_index = [self activeTab];
+    }
+    return [[self subView:tab_index] getRhoWebView:-1];
+}
+
+- (id<RhoWebView,NSObject>)detachRhoWebView {
     int n = [self activeTab];
-    return [[self subView:n] detachWebView];
+    return [[self subView:n] detachRhoWebView];
 }
 
+
 - (void)loadHTMLString:(NSString *)data {
     [[self subView:[self activeTab]] loadHTMLString:data];
 }
@@ -755,13 +765,6 @@
     return tabindex;
 }
 
-- (UIWebView*)getWebView:(int)tab_index {
-	if (tab_index == -1) {
-		tab_index = [self activeTab];
-	}
-	return [[self subView:tab_index] getWebView:-1];
-}
-
 
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
     [[self subView:[self activeTab]] addNavBar:title left:left right:right];

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

@@ -166,8 +166,20 @@ int on_http_cb(http_parser* parser) { return 0; }
           //our URL;
           if ( ([url host] == nil) && ([url port] == nil ) && ( [url scheme]==nil) && ( [url path] != nil ) )
           {
-            NSMutableString* s = [NSMutableString stringWithFormat:@"http://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
+              NSMutableString* s = nil;//[NSMutableString stringWithFormat:@"https://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
             
+            bool force_https = false;
+            if (rho_conf_is_property_exists("ios_https_local_server")!=0) {
+                force_https = rho_conf_getBool("ios_https_local_server")!=0;
+            }
+            if (force_https) {
+                 s = [NSMutableString stringWithFormat:@"https://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
+            }
+            else {
+                s = [NSMutableString stringWithFormat:@"http://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
+            }
+  
+              
             if ( [url query] != nil )
             {
               // decode query back to original state
@@ -317,6 +329,13 @@ int on_http_cb(http_parser* parser) { return 0; }
       return NO;
     }
 
+    const char* scheme = [[url scheme] UTF8String];
+    if (scheme != 0) {
+        if ((strcmp(scheme, "http") !=0 ) && (strcmp(scheme, "https") !=0 )) {
+            return NO;
+        }
+    }
+    
     const char* host = [[url host] UTF8String];
   
     if ( 0 == host )
@@ -324,16 +343,13 @@ int on_http_cb(http_parser* parser) { return 0; }
       return YES;
     }
   
-    const char* scheme = [[url scheme] UTF8String];
-  
     NSNumber* p = [url port];
     int port = (nil==p)?80:[[url port] intValue];
   
     int rhoPort = rho_http_get_port();
 
     return (
-      ( (0==scheme) || (strcmp(scheme, "http") ==0 ))
-      && ((port == rhoPort))
+      ((port == rhoPort))
       && ( (strcmp(host,"127.0.0.1")==0) || (strcmp(host,"localhost")==0)  )
     );
 }

data/platform/iphone/Classes/WebView.m

@@ -224,7 +224,7 @@ void rho_webview_set_cookie(const char *u, const char *c)
 
 void rho_webview_save(const char* format, const char* path, int tab_index)
 {
-    UIView *webvw = [[[Rhodes sharedInstance] mainView] getWebView:tab_index];
+    UIView *webvw = [[[[Rhodes sharedInstance] mainView] getRhoWebView:tab_index] view];
 
     webvw.frame=CGRectMake(webvw.frame.origin.x, webvw.frame.origin.y, webvw.frame.size.width, webvw.frame.size.height);
     UIGraphicsBeginImageContextWithOptions(webvw.frame.size, NO, 0.0f);

data/platform/iphone/RhoAppBaseLib/RhoAppBaseLib.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		C04F28E019CAF3CA003E34BD /* RunnableWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = C04F28DE19CAF3CA003E34BD /* RunnableWrapper.h */; };
 		C04F28E119CAF3CA003E34BD /* RunnableWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = C04F28DF19CAF3CA003E34BD /* RunnableWrapper.mm */; };
-		C5BA525F1A93ADF90095DE4A /* NetRequestImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5BA525E1A93ADF90095DE4A /* NetRequestImpl.mm */; };
 		C5BA525F1A93ADF90095DE4A /* IPhoneNetRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5BA525E1A93ADF90095DE4A /* IPhoneNetRequest.mm */; };
 		C5DFBB31185B6FB400DB6BDB /* IAppMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = C5DFBB30185B6FB400DB6BDB /* IAppMessageReceiver.h */; };
 		FA11F249192121BF00FB1301 /* IRhoExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = FA11F248192121BF00FB1301 /* IRhoExtension.h */; };
@@ -120,11 +119,18 @@
 		FA89817D18917EB700AF5E39 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA20C286182B04140036D304 /* SignatureViewController.m */; };
 		FA89817E18917EBA00AF5E39 /* SignatureParam.h in Headers */ = {isa = PBXBuildFile; fileRef = FA20C287182B04140036D304 /* SignatureParam.h */; };
 		FAA5A5AE182B0E9B00590B1F /* rhorunner_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = FAA5A5AD182B0E9B00590B1F /* rhorunner_Prefix.pch */; };
+		FAA714911DDCA89E00E5E7AD /* RhoWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA714901DDCA89E00E5E7AD /* RhoWebView.h */; };
+		FAA714961DDCAB6D00E5E7AD /* RhoUIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA714921DDCAB6D00E5E7AD /* RhoUIWebView.h */; };
+		FAA714971DDCAB6D00E5E7AD /* RhoUIWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = FAA714931DDCAB6D00E5E7AD /* RhoUIWebView.m */; };
+		FAA714981DDCAB6D00E5E7AD /* RhoWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA714941DDCAB6D00E5E7AD /* RhoWKWebView.h */; };
+		FAA714991DDCAB6D00E5E7AD /* RhoWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = FAA714951DDCAB6D00E5E7AD /* RhoWKWebView.m */; };
+		FAA7149F1DDCAE2B00E5E7AD /* RhoWebViewFabrique.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA7149D1DDCAE2B00E5E7AD /* RhoWebViewFabrique.h */; };
+		FAA714A01DDCAE2B00E5E7AD /* RhoWebViewFabrique.m in Sources */ = {isa = PBXBuildFile; fileRef = FAA7149E1DDCAE2B00E5E7AD /* RhoWebViewFabrique.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		C04F28DE19CAF3CA003E34BD /* RunnableWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunnableWrapper.h; sourceTree = "<group>"; };
-		C04F28DF19CAF3CA003E34BD /* RunnableWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RunnableWrapper.mm; sourceTree = "<group>"; };		
+		C04F28DF19CAF3CA003E34BD /* RunnableWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RunnableWrapper.mm; sourceTree = "<group>"; };
 		C5BA525D1A93AD6D0095DE4A /* IPhoneNetRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IPhoneNetRequest.h; path = rho/net/IPhoneNetRequest.h; sourceTree = "<group>"; };
 		C5BA525E1A93ADF90095DE4A /* IPhoneNetRequest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = IPhoneNetRequest.mm; path = rho/net/IPhoneNetRequest.mm; sourceTree = "<group>"; };
 		C5DFBB30185B6FB400DB6BDB /* IAppMessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IAppMessageReceiver.h; sourceTree = "<group>"; };
@@ -245,6 +251,14 @@
 		FA20C299182B04140036D304 /* SplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashViewController.m; sourceTree = "<group>"; };
 		FA20C29A182B04140036D304 /* IPushNotificationsReceiver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPushNotificationsReceiver.h; sourceTree = "<group>"; };
 		FAA5A5AD182B0E9B00590B1F /* rhorunner_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhorunner_Prefix.pch; path = ../rhorunner_Prefix.pch; sourceTree = "<group>"; };
+		FAA714901DDCA89E00E5E7AD /* RhoWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoWebView.h; sourceTree = "<group>"; };
+		FAA714921DDCAB6D00E5E7AD /* RhoUIWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoUIWebView.h; sourceTree = "<group>"; };
+		FAA714931DDCAB6D00E5E7AD /* RhoUIWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoUIWebView.m; sourceTree = "<group>"; };
+		FAA714941DDCAB6D00E5E7AD /* RhoWKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoWKWebView.h; sourceTree = "<group>"; };
+		FAA714951DDCAB6D00E5E7AD /* RhoWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoWKWebView.m; sourceTree = "<group>"; };
+		FAA7149B1DDCADC100E5E7AD /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.1.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; };
+		FAA7149D1DDCAE2B00E5E7AD /* RhoWebViewFabrique.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoWebViewFabrique.h; sourceTree = "<group>"; };
+		FAA7149E1DDCAE2B00E5E7AD /* RhoWebViewFabrique.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoWebViewFabrique.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -265,6 +279,7 @@
 				08FB7795FE84155DC02AAC07 /* Source */,
 				C6A0FF2B0290797F04C91782 /* Documentation */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
+				FAA7149A1DDCADC100E5E7AD /* Frameworks */,
 			);
 			name = RhoAppBaseLib;
 			sourceTree = "<group>";
@@ -438,6 +453,13 @@
 		FA20C254182B04140036D304 /* MainView */ = {
 			isa = PBXGroup;
 			children = (
+				FAA7149D1DDCAE2B00E5E7AD /* RhoWebViewFabrique.h */,
+				FAA7149E1DDCAE2B00E5E7AD /* RhoWebViewFabrique.m */,
+				FAA714921DDCAB6D00E5E7AD /* RhoUIWebView.h */,
+				FAA714931DDCAB6D00E5E7AD /* RhoUIWebView.m */,
+				FAA714941DDCAB6D00E5E7AD /* RhoWKWebView.h */,
+				FAA714951DDCAB6D00E5E7AD /* RhoWKWebView.m */,
+				FAA714901DDCA89E00E5E7AD /* RhoWebView.h */,
 				FA20C24E182B04140036D304 /* SplitView */,
 				FA20C24F182B04140036D304 /* RhoMainView.h */,
 				FA20C250182B04140036D304 /* SimpleMainView.h */,
@@ -628,6 +650,14 @@
 			path = ../Classes;
 			sourceTree = "<group>";
 		};
+		FAA7149A1DDCADC100E5E7AD /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FAA7149B1DDCADC100E5E7AD /* WebKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -647,9 +677,11 @@
 				FA20C2E1182B07D10036D304 /* RhoMapViewController.h in Headers */,
 				FA20C2BA182B07A50036D304 /* RhoAlert.h in Headers */,
 				FA20C300182B07EE0036D304 /* sslimpl.h in Headers */,
+				FAA714911DDCA89E00E5E7AD /* RhoWebView.h in Headers */,
 				FA20C2CA182B07BA0036D304 /* Event.h in Headers */,
 				FA11F2521921224400FB1301 /* RhoExtManagerSingletone.h in Headers */,
 				FA20C307182B08080036D304 /* NetworkStatusMonitor.h in Headers */,
+				FAA714981DDCAB6D00E5E7AD /* RhoWKWebView.h in Headers */,
 				FA20C2ED182B07DA0036D304 /* NVViewController.h in Headers */,
 				FA20C2EF182B07DA0036D304 /* NVDelegate.h in Headers */,
 				FA20C2F7182B07EB0036D304 /* RhoCryptImpl.h in Headers */,
@@ -658,6 +690,7 @@
 				FA20C30B182B08080036D304 /* RhoDelegate.h in Headers */,
 				FA20C2C0182B07AA0036D304 /* AppManagerI.h in Headers */,
 				FA20C2DF182B07CB0036D304 /* TabbedMainView.h in Headers */,
+				FAA7149F1DDCAE2B00E5E7AD /* RhoWebViewFabrique.h in Headers */,
 				FA20C2FD182B07EB0036D304 /* SplashScreenImpl.h in Headers */,
 				FA20C311182B08080036D304 /* SplashViewController.h in Headers */,
 				FA20C30F182B08080036D304 /* RhoViewController.h in Headers */,
@@ -688,6 +721,7 @@
 				FA20C2EB182B07D50036D304 /* NativeBar.h in Headers */,
 				FA20C313182B08080036D304 /* IPushNotificationsReceiver.h in Headers */,
 				FA20C2BE182B07AA0036D304 /* AppManager.h in Headers */,
+				FAA714961DDCAB6D00E5E7AD /* RhoUIWebView.h in Headers */,
 				FA20C2B8182B07A10036D304 /* CRhoURLProtocol.h in Headers */,
 				FA20C2D2182B07C50036D304 /* LogOptionsController.h in Headers */,
 				FA20C2CF182B07C50036D304 /* InitMemoryInfoCollector.h in Headers */,
@@ -749,8 +783,9 @@
 			files = (
 				FA20C2C9182B07B60036D304 /* DateTimePickerViewController.m in Sources */,
 				FA11F2531921224400FB1301 /* RhoExtManagerSingletone.m in Sources */,
+				FAA714991DDCAB6D00E5E7AD /* RhoWKWebView.m in Sources */,
 				FA11F24F1921221E00FB1301 /* RhoExtManagerImpl.m in Sources */,
-        FA87B5DD1A82A1B00073EE44 /* PickImageDelegate.m in Sources */,
+				FA87B5DD1A82A1B00073EE44 /* PickImageDelegate.m in Sources */,
 				FA20C303182B07F20036D304 /* RingtoneManager.m in Sources */,
 				FA20C2EC182B07D50036D304 /* NativeBar.m in Sources */,
 				FA20C2CE182B07C40036D304 /* InitMemoryInfoCollector.mm in Sources */,
@@ -764,6 +799,7 @@
 				FA20C30C182B08080036D304 /* RhoDelegate.m in Sources */,
 				FA20C2F8182B07EB0036D304 /* RhoCryptImpl.mm in Sources */,
 				FA20C2C7182B07B60036D304 /* DateTimePicker.m in Sources */,
+				FAA714A01DDCAE2B00E5E7AD /* RhoWebViewFabrique.m in Sources */,
 				FA20C2FE182B07EB0036D304 /* SplashScreenImpl.cpp in Sources */,
 				FA89817918917EAD00AF5E39 /* SignatureView.m in Sources */,
 				FA20C2D7182B07CB0036D304 /* RightViewController.m in Sources */,
@@ -772,6 +808,7 @@
 				FA20C2F6182B07E20036D304 /* phonebook.m in Sources */,
 				FA20C2D0182B07C50036D304 /* LogViewController.m in Sources */,
 				FA20C2C6182B07B60036D304 /* DateTime.m in Sources */,
+				FAA714971DDCAB6D00E5E7AD /* RhoUIWebView.m in Sources */,
 				FA20C2CD182B07BE0036D304 /* LocationController.m in Sources */,
 				FA20C2EA182B07D10036D304 /* MapAnnotation.m in Sources */,
 				FA20C2E4182B07D10036D304 /* MapViewManager.m in Sources */,

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -104,6 +104,7 @@
 		FA1D452618D9E2BC0010CCF9 /* app_build_capabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1D452518D9E2BC0010CCF9 /* app_build_capabilities.h */; };
 		FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */ = {isa = PBXBuildFile; fileRef = FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */; };
 		FA6B222617026477009D1398 /* MethodResultConvertor.h in Headers */ = {isa = PBXBuildFile; fileRef = FA6B222517026477009D1398 /* MethodResultConvertor.h */; };
+		FAA714A91DDE5B6F00E5E7AD /* RhoNativeViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA714A81DDE5B6F00E5E7AD /* RhoNativeViewManager.h */; };
 		FAC6EE5B143B1FC800B8E352 /* BaseMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE4F143B1FC800B8E352 /* BaseMapEngine.cpp */; };
 		FAC6EE5C143B1FC800B8E352 /* BaseMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE50143B1FC800B8E352 /* BaseMapEngine.h */; };
 		FAC6EE5D143B1FC800B8E352 /* ESRIMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE51143B1FC800B8E352 /* ESRIMapEngine.cpp */; };
@@ -239,6 +240,7 @@
 		FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = app_build_configs.c; path = ../../shared/common/app_build_configs.c; sourceTree = SOURCE_ROOT; };
 		FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = app_build_configs.h; path = ../../shared/common/app_build_configs.h; sourceTree = SOURCE_ROOT; };
 		FA6B222517026477009D1398 /* MethodResultConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MethodResultConvertor.h; path = ../../shared/api_generator/MethodResultConvertor.h; sourceTree = "<group>"; };
+		FAA714A81DDE5B6F00E5E7AD /* RhoNativeViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoNativeViewManager.h; path = ../../shared/common/RhoNativeViewManager.h; sourceTree = "<group>"; };
 		FAC6EE4F143B1FC800B8E352 /* BaseMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BaseMapEngine.cpp; path = ../../shared/common/map/BaseMapEngine.cpp; sourceTree = "<group>"; };
 		FAC6EE50143B1FC800B8E352 /* BaseMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseMapEngine.h; path = ../../shared/common/map/BaseMapEngine.h; sourceTree = "<group>"; };
 		FAC6EE51143B1FC800B8E352 /* ESRIMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ESRIMapEngine.cpp; path = ../../shared/common/map/ESRIMapEngine.cpp; sourceTree = "<group>"; };
@@ -354,6 +356,7 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				FAA714A81DDE5B6F00E5E7AD /* RhoNativeViewManager.h */,
 				FA1D452518D9E2BC0010CCF9 /* app_build_capabilities.h */,
 				FAC6EE4C143B1F1E00B8E352 /* map */,
 				A22F9EFD14605D12006D8F1A /* phonebook */,
@@ -585,6 +588,7 @@
 				BDD11ECE113664E700349BE3 /* rhoparams.h in Headers */,
 				5C798935113BD148005F8736 /* GeoLocation.h in Headers */,
 				BD8DF8891147C8090041A968 /* SplashScreen.h in Headers */,
+				FAA714A91DDE5B6F00E5E7AD /* RhoNativeViewManager.h in Headers */,
 				5C59BF4E115B4BC300E96ADE /* unzip.h in Headers */,
 				5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */,
 				5CA2DE9111B01EF000B868D5 /* ThreadQueue.h in Headers */,

data/platform/iphone/rbuild/iphone.rake

@@ -1921,6 +1921,32 @@ namespace "build" do
           end
         end
 
+        #http_connection_domains
+        if !hash.has_key?("NSAppTransportSecurity")
+            hash['NSAppTransportSecurity'] = {}
+        end
+        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoads")
+            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoads'] = true
+        end
+        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoadsInWebContent")
+            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoadsInWebContent'] = true
+        end
+        if $app_config["iphone"].has_key?("http_connection_domains")
+          http_connection_domains = $app_config["iphone"]["http_connection_domains"]
+          if http_connection_domains.kind_of?(Array)
+              hash['NSAppTransportSecurity']['NSExceptionDomains'] = {}
+              http_connection_domains.each do |domain|
+                  domain_hash = {}
+                  domain_hash['NSIncludesSubdomains'] = true
+                  domain_hash['NSTemporaryExceptionAllowsInsecureHTTPLoads'] = true
+                  domain_hash['NSTemporaryExceptionMinimumTLSVersion'] = 'TLSv1.0'
+
+                  hash['NSAppTransportSecurity']['NSExceptionDomains'][domain.to_s] = domain_hash
+              end
+          end
+        end
+
+
          set_app_icon(false)
          set_default_images(false, hash)
       end
@@ -2033,6 +2059,31 @@ namespace "build" do
           end
         end
 
+        #http_connection_domains
+        if !hash.has_key?("NSAppTransportSecurity")
+            hash['NSAppTransportSecurity'] = {}
+        end
+        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoads")
+            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoads'] = true
+        end
+        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoadsInWebContent")
+            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoadsInWebContent'] = true
+        end
+        if $app_config["iphone"].has_key?("http_connection_domains")
+          http_connection_domains = $app_config["iphone"]["http_connection_domains"]
+          if http_connection_domains.kind_of?(Array)
+              hash['NSAppTransportSecurity']['NSExceptionDomains'] = {}
+              http_connection_domains.each do |domain|
+                  domain_hash = {}
+                  domain_hash['NSIncludesSubdomains'] = true
+                  domain_hash['NSTemporaryExceptionAllowsInsecureHTTPLoads'] = true
+                  domain_hash['NSTemporaryExceptionMinimumTLSVersion'] = 'TLSv1.0'
+
+                  hash['NSAppTransportSecurity']['NSExceptionDomains'][domain.to_s] = domain_hash
+              end
+          end
+        end
+
         set_app_icon(false)
         set_default_images(false, hash)
       end