rhodes 3.4.2 → 3.5.1.12

data/platform/iphone/Classes/Signature/SignatureDelegate.m

@@ -113,7 +113,7 @@ SignatureDelegate* ourSD = nil;
     NSString *fullname;
     NSData *pngImage;
     
-    if (imageFormat == @"png") {
+    if ([@"png" compare:imageFormat options:NSCaseInsensitiveSearch] == NSOrderedSame) {
 	
         filename = [NSString stringWithFormat:@"Image_%@.png", now]; 	
         fullname = [folder stringByAppendingPathComponent:filename];
@@ -286,9 +286,8 @@ void rho_signature_take(char* callback_url, rho_param* p) {
 void rho_signature_visible(bool b, rho_param* p)
 {
     // check for RhoElements :
-    if (!rho_is_rho_elements_extension_can_be_used()) {
+    if (!rho_is_rho_elements_extension_can_be_used(get_app_build_config_item("motorola_license"))) {
         RAWLOG_ERROR("Rho::SignatureCapture.visible() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
-        return;
     }
     
     
@@ -383,9 +382,8 @@ void rho_signature_visible(bool b, rho_param* p)
 void rho_signature_capture(const char* callback_url) 
 {
     // check for RhoElements :
-    if (!rho_is_rho_elements_extension_can_be_used()) {
+    if (!rho_is_rho_elements_extension_can_be_used(get_app_build_config_item("motorola_license"))) {
         RAWLOG_ERROR("Rho::SignatureCapture.capture() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
-        return;
     }
     
 	SignatureDelegate* deleg = [SignatureDelegate getSharedInstance]; 
@@ -398,9 +396,8 @@ void rho_signature_capture(const char* callback_url)
 void rho_signature_clear() 
 {
     // check for RhoElements :
-    if (!rho_is_rho_elements_extension_can_be_used()) {
+    if (!rho_is_rho_elements_extension_can_be_used(get_app_build_config_item("motorola_license"))) {
         RAWLOG_ERROR("Rho::SignatureCapture.clear() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
-        return;
     }
 	SignatureDelegate* deleg = [SignatureDelegate getSharedInstance]; 
     [deleg clearSignatureInlineView];

data/platform/iphone/Classes/SimpleMainView.m

@@ -878,6 +878,22 @@ static BOOL makeHiddenUntilLoadContent = YES;
     return [[webView.request mainDocumentURL] absoluteString];
 }
 
+#define CUR_URL_DICT_KEY @"CUR_URL_DICT_KEY"
+
+-(void) get_current_url_command:(NSMutableDictionary*)dict {
+    NSString* res = [webView stringByEvaluatingJavaScriptFromString:@"window.location.href"];
+    //NSString* res = [[webView.request mainDocumentURL] absoluteString];
+    [dict setValue:res forKey:CUR_URL_DICT_KEY];
+}
+
+- (NSString*)get_current_url:(int)index {
+    NSMutableDictionary* dict = [NSMutableDictionary dictionaryWithCapacity:1];
+    [self performSelectorOnMainThread:@selector(get_current_url_command:) withObject:dict waitUntilDone:YES];
+    NSString* res = (NSString*)[dict valueForKey:CUR_URL_DICT_KEY];
+    return res;
+    //return [webView stringByEvaluatingJavaScriptFromString:@"window.location.href"];
+}
+
 - (void)switchTab:(int)index {
     // Nothing
 }

data/platform/iphone/Classes/SplashViewController.m

@@ -145,7 +145,10 @@
 	splashView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 	splashView.autoresizesSubviews = YES;
 	self.view = splashView;
-    [parentView addSubview:splashView];
+    
+    //[parentView addSubview:splashView];
+    ((UIWindow*)parentView).rootViewController = self;
+    
     return self;
 }
 
@@ -192,6 +195,7 @@
 	NSString *pngDefaultLandscapePath = [NSString stringWithFormat:@"%@/Default-Landscape.png", resourcePath];
 	NSString *pngDefaultLandscapeLeftPath = [NSString stringWithFormat:@"%@/Default-LandscapeLeft.png", resourcePath];
 	NSString *pngDefaultLandscapeRightPath = [NSString stringWithFormat:@"%@/Default-LandscapeRight.png", resourcePath];
+	NSString *pngDefaultiPhone5 = [NSString stringWithFormat:@"%@/Default-568h@2x.png", resourcePath];
 
 	CGRect win_frame = [[[UIApplication sharedApplication] keyWindow] bounds];
 	
@@ -258,6 +262,10 @@
 			if ([fileManager fileExistsAtPath:pngDefault2xPath]) {
 				result = pngDefault2xPath;
 			}
+            // check for iPhone5 screen
+            if (frame.size.height*scales > 1000) {
+                result = pngDefaultiPhone5;
+            }
 		}
 	}
 	if (result == nil) {
@@ -299,6 +307,7 @@
 	NSString *pngDefaultLandscapePath = [NSString stringWithFormat:@"%@/Default-Landscape.png", resourcePath];
 	NSString *pngDefaultLandscapeLeftPath = [NSString stringWithFormat:@"%@/Default-LandscapeLeft.png", resourcePath];
 	NSString *pngDefaultLandscapeRightPath = [NSString stringWithFormat:@"%@/Default-LandscapeRight.png", resourcePath];
+	NSString *pngDefaultiPhone5 = [NSString stringWithFormat:@"%@/Default-568h@2x.png", resourcePath];
 	
 	return (
 			//([fileManager fileExistsAtPath:pngLoadingPath]) ||
@@ -308,6 +317,7 @@
 			([fileManager fileExistsAtPath:pngDefaultPortraitUpsideDownPath]) ||
 			([fileManager fileExistsAtPath:pngDefaultLandscapeLeftPath]) ||
 			([fileManager fileExistsAtPath:pngDefaultLandscapeRightPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultiPhone5]) ||
 			([fileManager fileExistsAtPath:pngDefaultLandscapePath])
 	);
 

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

@@ -253,6 +253,12 @@
 	return [v currentLocation:index];
 }
 
+- (NSString*)get_current_url:(int)index {
+	SimpleMainView* v = [self getSimpleView:index];
+	return [v get_current_url:index];
+}
+
+
 - (void)switchTabCommand:(SimpleMainView*)new_v {
 	int index = 0;
 	int i;

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

@@ -256,6 +256,11 @@
 	return [rvc currentLocation:index];
 }
 
+- (NSString*)get_current_url:(int)index {
+	RightViewController* rvc = [self getRightViewController];
+	return [rvc get_current_url:index];
+}
+
 
 -(UIViewController*)getMainViewController {
     return self;

data/platform/iphone/Classes/TabbedMainView.m

@@ -588,6 +588,10 @@
     return [[self subView:index] currentLocation:0];
 }
 
+- (NSString*)get_current_url:(int)index {
+    return [[self subView:index] get_current_url:0];
+}
+
 - (void)switchTab:(int)index {
     tabbar.selectedIndex = index;
 	[self onSwitchTab];

data/platform/iphone/Classes/WebView.m

@@ -171,3 +171,17 @@ void rho_webview_set_cookie(const char *u, const char *c)
     NSString *cookie = [NSString stringWithUTF8String:c];
     [Rhodes performOnUiThread:runnable arg:url arg:cookie wait:NO];
 }
+
+void rho_webview_save(const char* format, const char* path, int tab_index)
+{
+    RAWLOG_ERROR("rho_webview_save is not implemented at iOS");
+}
+
+VALUE rho_webview_get_current_url(int tab_index) {
+    NSString* str = [[[Rhodes sharedInstance] mainView] get_current_url:tab_index];
+    if (str == nil) {
+        return rho_ruby_create_string("");
+    }
+    return rho_ruby_create_string([str UTF8String]);
+}
+

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.4.0</string>
+	<string>3.5.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>
@@ -50,10 +50,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIRequiredDeviceCapabilities</key>
-	<dict>
-		<key>armv7</key>
-		<true/>
-	</dict>
 </dict>
 </plist>

data/platform/iphone/rbuild/iphone.rake

@@ -129,7 +129,7 @@ def set_app_url_scheme(newname)
 end
 
 BAKUP_FILES = ['rhorunner.xcodeproj', 'Entitlements.plist', 'icon.png', 'icon114.png', 'icon57.png', 'icon72.png', 'Info.plist']
-CLEAR_FILES = ['Default.png', 'Default@2x.png', 'Default-Portrait.png', 'Default-PortraitUpsideDown.png', 'Default-Landscape.png', 'Default-LadscapeLeft.png', 'Default-LandscapeRight.png']
+CLEAR_FILES = ['Default.png', 'Default@2x.png', 'Default-Portrait.png', 'Default-PortraitUpsideDown.png', 'Default-Landscape.png', 'Default-LadscapeLeft.png', 'Default-LandscapeRight.png', 'Default-568h@2x.png']
 
 def make_project_bakup
      BAKUP_FILES.each do |f|
@@ -342,7 +342,7 @@ def set_app_icon(make_bak)
   end
 end
 
-LOADINGIMAGES = ['loading', 'loading@2x', 'loading-Portrait', 'loading-PortraitUpsideDown', 'loading-Landscape', 'loading-LadscapeLeft', 'loading-LandscapeRight']
+LOADINGIMAGES = ['loading', 'loading@2x', 'loading-Portrait', 'loading-PortraitUpsideDown', 'loading-Landscape', 'loading-LadscapeLeft', 'loading-LandscapeRight', 'loading-568h@2x']
 
 def restore_default_images
   puts "restore_default_images"
@@ -495,18 +495,15 @@ namespace "config" do
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
     $tmpdir =  $bindir +"/tmp"
 
-    $devroot = '/Developer' if $devroot.nil?
-    $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim') if $iphonesim.nil?
-
-
+    $devroot = '/Applications/Xcode.app/Contents/Developer' if $devroot.nil?
+    $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_43') if $iphonesim.nil?
     $xcodebuild = $devroot + "/usr/bin/xcodebuild"
-    
     if !File.exists? $xcodebuild
-        $xcodebuild = "/Applications/Xcode.app/Contents/Developer" + "/usr/bin/xcodebuild"
-        $devroot = '/Applications/Xcode.app/Contents/Developer'
-        $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_43')
+        $devroot = '/Developer'
+        $xcodebuild = $devroot + "/usr/bin/xcodebuild"
+        $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
     end
-    
+
     if !File.exists? $xcodebuild
         puts 'ERROR: can not found XCode command line tools'
         puts 'Install XCode to default location' 

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

@@ -55,6 +55,8 @@
 		BDFBD9A510B1B9E500BAAFAB /* home_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A310B1B9E500BAAFAB /* home_btn.png */; };
 		BDFBD9A710B1BA2000BAAFAB /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A610B1BA2000BAAFAB /* icon.png */; };
 		C5D0D0C1153F279A00B8BF21 /* InitMemoryInfoCollector.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5D0D0C0153F279A00B8BF21 /* InitMemoryInfoCollector.mm */; };
+		C5D90EF815F4F58D005F7C86 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = C5D90EF715F4F58D005F7C86 /* Reachability.m */; };
+		C5D90EFB15F4FC92005F7C86 /* NetworkStatusMonitor.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5D90EFA15F4FC92005F7C86 /* NetworkStatusMonitor.mm */; };
 		F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128ADC1069752F002F00E5 /* MapAnnotation.m */; };
 		F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */; };
 		F51668E00FFD5F740079F023 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F51668DF0FFD5F740079F023 /* AudioToolbox.framework */; };
@@ -88,6 +90,7 @@
 		FA52317B12E7511700AB55CC /* esri.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317412E7511700AB55CC /* esri.png */; };
 		FA52317C12E7511700AB55CC /* esri@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317512E7511700AB55CC /* esri@2x.png */; };
 		FA52330112E9204300AB55CC /* BluePushpin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52330012E9204300AB55CC /* BluePushpin@2x.png */; };
+		FA673A5715FCD787005CAD64 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA673A5615FCD787005CAD64 /* CoreMotion.framework */; };
 		FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE6C143B3AF100B8E352 /* RhoMapViewController.m */; };
 		FACA4C781270AC0900777CFF /* LeftViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C711270AC0900777CFF /* LeftViewController.m */; };
 		FACA4C791270AC0900777CFF /* RightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C731270AC0900777CFF /* RightViewController.m */; };
@@ -239,6 +242,10 @@
 		BDFBD9A610B1BA2000BAAFAB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = SOURCE_ROOT; };
 		C5D0D0BF153F279300B8BF21 /* InitMemoryInfoCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitMemoryInfoCollector.h; sourceTree = "<group>"; };
 		C5D0D0C0153F279A00B8BF21 /* InitMemoryInfoCollector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InitMemoryInfoCollector.mm; sourceTree = "<group>"; };
+		C5D90EF615F4F58D005F7C86 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
+		C5D90EF715F4F58D005F7C86 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
+		C5D90EF915F4FC92005F7C86 /* NetworkStatusMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStatusMonitor.h; sourceTree = "<group>"; };
+		C5D90EFA15F4FC92005F7C86 /* NetworkStatusMonitor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStatusMonitor.mm; sourceTree = "<group>"; };
 		F5128ADB1069752F002F00E5 /* MapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapAnnotation.h; path = MapView/MapAnnotation.h; sourceTree = "<group>"; };
 		F5128ADC1069752F002F00E5 /* MapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapAnnotation.m; path = MapView/MapAnnotation.m; sourceTree = "<group>"; };
 		F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GoogleGeocoder.h; path = Classes/MapView/GoogleGeocoder.h; sourceTree = SOURCE_ROOT; };
@@ -295,6 +302,7 @@
 		FA52317412E7511700AB55CC /* esri.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = esri.png; path = ESRI/esri.png; sourceTree = "<group>"; };
 		FA52317512E7511700AB55CC /* esri@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "esri@2x.png"; path = "ESRI/esri@2x.png"; sourceTree = "<group>"; };
 		FA52330012E9204300AB55CC /* BluePushpin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "BluePushpin@2x.png"; path = "ESRI/BluePushpin@2x.png"; sourceTree = "<group>"; };
+		FA673A5615FCD787005CAD64 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		FAC6EE6B143B3AF100B8E352 /* RhoMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoMapViewController.h; path = MapView/RhoMapViewController.h; sourceTree = "<group>"; };
 		FAC6EE6C143B3AF100B8E352 /* RhoMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RhoMapViewController.m; path = MapView/RhoMapViewController.m; sourceTree = "<group>"; };
 		FACA4C701270AC0900777CFF /* LeftViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LeftViewController.h; path = SplitView/LeftViewController.h; sourceTree = "<group>"; };
@@ -316,6 +324,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FA673A5715FCD787005CAD64 /* CoreMotion.framework in Frameworks */,
 				FA3C79E2136ED8BB002302E5 /* CoreMedia.framework in Frameworks */,
 				FA3C79AE136ED523002302E5 /* CoreVideo.framework in Frameworks */,
 				FA4D3F8D136B0A98009D6E63 /* libiconv.dylib in Frameworks */,
@@ -351,6 +360,8 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				C5D90EF615F4F58D005F7C86 /* Reachability.h */,
+				C5D90EF715F4F58D005F7C86 /* Reachability.m */,
 				FA522E6C12DEA74F00AB55CC /* NativeView */,
 				BDC6F34611F4ABBF0056C1C3 /* icon57.png */,
 				BDC6F34711F4ABBF0056C1C3 /* icon72.png */,
@@ -382,6 +393,8 @@
 				BD5B7449113BE2DB00C6070A /* SplashViewController.m */,
 				BD6A6228123E46BB0093E03C /* RhoViewController.h */,
 				BD6A6229123E46BB0093E03C /* RhoViewController.m */,
+				C5D90EF915F4FC92005F7C86 /* NetworkStatusMonitor.h */,
+				C5D90EFA15F4FC92005F7C86 /* NetworkStatusMonitor.mm */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -437,6 +450,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				FA673A5615FCD787005CAD64 /* CoreMotion.framework */,
 				BDA4BA9F109A347400467AB9 /* libz.dylib */,
 				46B007061033776600D0C2F4 /* CoreGraphics.framework */,
 				F516695F0FFD78770079F023 /* AVFoundation.framework */,
@@ -960,7 +974,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "RHO_SOURCE_DIR=${SRCROOT}\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\n\nif [ -e ${RHO_SOURCE_DIR}/Default.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default@2x.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Portrait.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Landscape.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\nfi";
+			shellScript = "RHO_SOURCE_DIR=${SRCROOT}\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\n\nif [ -e ${RHO_SOURCE_DIR}/Default.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default@2x.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Portrait.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Landscape.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-568h@2x.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-568h@2x.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-568h@2x.png ${RHO_TARGET_DIR}\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1018,6 +1032,8 @@
 				FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */,
 				FA14CECD150130DB00734801 /* DateTimePickerViewController.m in Sources */,
 				C5D0D0C1153F279A00B8BF21 /* InitMemoryInfoCollector.mm in Sources */,
+				C5D90EF815F4F58D005F7C86 /* Reachability.m in Sources */,
+				C5D90EFB15F4FC92005F7C86 /* NetworkStatusMonitor.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1068,7 +1084,7 @@
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)",
@@ -1104,7 +1120,7 @@
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)",
@@ -1180,7 +1196,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)",

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>RhoSimulator 3.4.2, Copyright 2010-2012 Rhomobile, Inc.</string>
+	<string>RhoSimulator 3.5.0, Copyright 2010-2012 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

data/platform/shared/common/ExtManager.h

@@ -44,6 +44,13 @@ struct CRhoExtData
     HWND       m_hBrowserWnd;
 };
 
+struct CRhoFloatData
+{
+    float m_fValue;
+
+    CRhoFloatData(float fValue):m_fValue(fValue){}
+};
+
 struct IRhoExtension 
 {
     virtual ~IRhoExtension(){}
@@ -129,6 +136,7 @@ public:
     long OnLicenseError(const wchar_t* szUrlBeingNavigatedTo);
     void OnAppActivate(bool bActivate);
     void OnWindowChanged(LPVOID lparam);
+	DWORD getProcessId();
 
     CRhoExtData makeExtData();
     void close();

data/platform/shared/common/RhoDefs.h

@@ -30,7 +30,8 @@
 #if defined(__SYMBIAN32__)
 # define OS_SYMBIAN
 # undef UNICODE
-
+#elif defined(_WINRT_DLL) || defined(_WP8_LIB)
+#define OS_WP8
 #elif defined(_WIN32_WCE)
 # define OS_WINCE _WIN32_WINCE
 #elif defined(WIN32)
@@ -46,7 +47,7 @@
 #else
 #endif
 
-#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE) || defined(OS_WP8)
 #define WINDOWS_PLATFORM
 #endif