rhodes 7.1.17 → 7.4.1

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/IntentSingleton.m

@@ -73,7 +73,7 @@
     
     if ( appName.length == 0 ) {
     
-        NSURL* url = [NSURL URLWithString:[uri stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+        NSURL* url = [NSURL URLWithString:[uri stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
         if ([[UIApplication sharedApplication] canOpenURL:url]) {
             res = [[UIApplication sharedApplication] openURL:url];
         }
@@ -87,8 +87,8 @@
                                   [data UTF8String]
                                   ];
         
-        NSURL* fullUrl = [NSURL URLWithString:[strFullUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
         
+        NSURL* fullUrl = [NSURL URLWithString:[strFullUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
         RAWLOG_INFO1("IntentSingleton::send: %s", [strFullUrl UTF8String]);
         
         

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NotificationSingleton.m

@@ -411,8 +411,8 @@ static NotificationReminder* reminder = nil;
         return;
     
     NSArray *btn = [buttons objectAtIndex:buttonIndex];
-    NSString *itemId = [[btn objectAtIndex:0] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSString *itemTitle = [[btn objectAtIndex:1] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *itemId = [[btn objectAtIndex:0] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+    NSString *itemTitle = [[btn objectAtIndex:1] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
     
     NSMutableDictionary* callbackResult = [NSMutableDictionary dictionaryWithObjectsAndKeys:itemId, HK_BUTTON_ID, itemTitle, HK_BUTTON_TITLE, [NSNumber numberWithInt:buttonIndex], HK_BUTTON_INDEX, nil];
     

data/lib/commonAPI/coreapi/ext/platform/qt/coreapi.pro

@@ -1,20 +1,17 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += RHODES_VERSION_2
-	QT += core
-}
-
 equals(QT_MAJOR_VERSION, 5) {
-    equals(QT_MINOR_VERSION, 6) {
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
         QT += core
         DEFINES += OS_SAILFISH OS_LINUX
+        CONFIG +=  c++14
+    }
+    greaterThan(QT_MINOR_VERSION, 7): {
         CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2
     }
 }
-
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
-}
 TARGET = coreapi
 TEMPLATE = lib
 
@@ -37,12 +34,14 @@ macx {
 }
 
 unix:!macx {
-  DESTDIR = $$PWD/../../../../../../platform/linux/bin/extensions
-  OBJECTS_DIR = $$PWD/../../../../../../platform/linux/bin/extensions/coreapi
-  INCLUDEPATH += $$PWD/../../../../../../platform/shared/ruby/sailfish
-  SOURCES += src/CNetworkDetect.cpp
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
+    DEFINES += OS_LINUX
+    DESTDIR = $$PWD/../../../../../../platform/linux/bin/extensions
+    OBJECTS_DIR = $$PWD/../../../../../../platform/linux/bin/extensions/coreapi
+    INCLUDEPATH += $$PWD/../../../../../../platform/shared/ruby/linux
+
+    SOURCES += src/CNetworkDetect.cpp
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
 win32 {

data/lib/commonAPI/coreapi/ext/platform/qt/src/CNativeToolbarImpl.cpp

@@ -1,7 +1,7 @@
 #include "../../../shared/generated/cpp/NativeToolbarBase.h"
 #include "common/RhodesApp.h"
 #include "common/RhoConf.h"
-#include "rubyext/NativeToolBarExt.h"
+#include "rubyext/NativeToolbarExt.h"
 #include "qt/rhodes/impl/NativeToolbarImpl.h"
 
 namespace rho {

data/lib/commonAPI/coreapi/ext/platform/wm/src/NetworkDetect.h

@@ -1,7 +1,7 @@
 #ifndef _NETWORKDETECT_H_
 #define _NETWORKDETECT_H_
 #pragma once
-#ifndef _HOST_TRACKER
+#if !defined(_HOST_TRACKER) && !defined(OS_LINUX)
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
@@ -27,4 +27,4 @@ private:  //  Methods
     
 
 };
-#endif
+#endif

data/lib/commonAPI/coreapi/ext/platform/wm/src/NotificationImpl.cpp

@@ -98,6 +98,13 @@ public:
 
 	}
 
+	virtual void setScheduler( const rho::Hashtable<rho::String, rho::String>& propertyMap, rho::apiGenerator::CMethodResult& oResult){
+
+	}
+    virtual void removeScheduler(rho::apiGenerator::CMethodResult& oResult){
+    	
+    }
+
 private:
 #if defined(OS_WINCE)
 	CNotificationLoader* m_pNotifications;

data/lib/commonAPI/coreapi/ext/platform/wm/src/SystemImpl.cpp

@@ -102,9 +102,7 @@ void CSystemImpl::getIsEmulator(CMethodResult& oResult)
     oResult.set(true);
 #else
 
-#ifdef OS_WINDOWS_DESKTOP
-    oResult.set(false);
-#elif OS_SAILFISH
+#if defined(OS_WINDOWS_DESKTOP) || defined (OS_LINUX) || defined (OS_SAILFISH)
     oResult.set(false);
 #else
 

data/lib/commonAPI/coreapi/ext/push.xml

@@ -18,6 +18,8 @@ For FCM:
     fcmSenderID: 'your_fcm_sender_id'
     fcmAppID: 'your_fcm_app_id'
 
+**Supporting FCM Push on iOS** Download GoogleService-Info.plist and put it into the root of your application. Please read guide [Add Firebase to your iOS project](https://firebase.google.com/docs/ios/setup) for more details.
+
 For GCM ( NB: GCM is deprecated, we recommend using FCM push ):
     :::ruby
     capabilities: ["push"]
@@ -32,9 +34,9 @@ For RhoConnect Push Service:
 
 **For Win32(XPE)**, Microsoft Message Queue (MSMQ) and .Net Framework 3.5 also must be installed on the device.
 
-**GCM is no longer supported as a standalone jar file** since being moved to Google Play services. If you have trouble building an Android app with RhoElements 4.0.0 and Push capability, try these steps: 
+**GCM is no longer supported as a standalone jar file** since being moved to Google Play services. If you have trouble building an Android app with RhoElements 4.0.0 and Push capability, try these steps:
 
-1. [Download the GCM r03 sip file](http://dl-ssl.google.com/android/repository/gcm_r03.zip) from Google's repository. 
+1. [Download the GCM r03 sip file](http://dl-ssl.google.com/android/repository/gcm_r03.zip) from Google's repository.
 2. Copy it to sdk/extras and extract it.
 3. Rename the folder to 'gcm'
 
@@ -180,4 +182,4 @@ function pushCallback(params) {
             </EXAMPLE>
         </EXAMPLES>
     </MODULE>
-</API>
+</API>

data/lib/commonAPI/coreapi/ext/shared/ApplicationImpl.cpp

@@ -49,7 +49,7 @@ public:
 
     virtual void getUserFolder(rho::apiGenerator::CMethodResult& oResult)
     {
-#ifdef OS_MACOSX
+#if defined(OS_MACOSX) || defined (OS_LINUX)
         oResult.set( CFilePath::join( rho_native_rhouserpath(), RHO_APPS_DIR) );
 #else
         oResult.set( CFilePath::join( rho_native_rhopath(), RHO_APPS_DIR) );
@@ -115,7 +115,7 @@ public:
     {
         RHOCONF().setString("title_text", title, false);
 
-#if defined(OS_WINCE) || defined (OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
+#if defined(OS_WINCE) || defined (OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR) || defined(OS_LINUX)
         rho_title_change(0, title.c_str());
 #endif
     }

data/lib/commonAPI/coreapi/ext/shared/InitExtension.cpp

@@ -32,13 +32,13 @@ extern "C" void Init_CoreAPI_Extension()
     Init_NewORM_extension();
 //#endif
     Init_Log();
-#if defined(OS_MACOSX) || defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE) || defined(OS_ANDROID) || defined(OS_SAILFISH)
+#if defined(OS_MACOSX) || defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE) || defined(OS_ANDROID) || defined(OS_SAILFISH) || defined(OS_LINUX)
     Init_WebView();
 #elif  defined(OS_UWP)
     Init_WebView_extension(); 
 #endif
 
-#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE) || (defined(OS_MACOSX) && defined(RHODES_EMULATOR)) || defined(OS_ANDROID) || defined(OS_MACOSX)
+#if defined(OS_WINDOWS_DESKTOP)  || defined(OS_LINUX) || defined(OS_WINCE) || (defined(OS_MACOSX) && defined(RHODES_EMULATOR)) || defined(OS_ANDROID) || defined(OS_MACOSX)
     Init_NativeToolbar();
     Init_NativeTabbar();
 #elif defined(OS_UWP)
@@ -46,19 +46,19 @@ extern "C" void Init_CoreAPI_Extension()
     Init_NativeTabbar_extension();
 #endif
 
-#if defined(OS_MACOSX) || defined(RHODES_EMULATOR)
+#if defined(OS_MACOSX) || defined(RHODES_EMULATOR) || defined (OS_LINUX)
     Init_Navbar();
 #endif
 
-#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR) || defined(OS_WINCE) || defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_WINDOWS_DESKTOP)  || defined(OS_LINUX) || defined(RHODES_EMULATOR) || defined(OS_WINCE) || defined(OS_MACOSX) || defined(OS_ANDROID)
     Init_Notification();
 #endif
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID) || defined(WINDOWS_PLATFORM) || defined(OS_SAILFISH)
+#if defined(OS_MACOSX) || defined(OS_ANDROID) || defined(WINDOWS_PLATFORM)  || defined(OS_LINUX) || defined(OS_SAILFISH)
     Init_RhoFile();
 #endif
 
-#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE) || defined(RHODES_EMULATOR)
+#if defined(OS_WINDOWS_DESKTOP)  || defined(OS_LINUX) || defined(OS_WINCE) || defined(RHODES_EMULATOR)
     Init_NativeMenuBar();
 #endif
 
@@ -74,11 +74,11 @@ extern "C" void Init_CoreAPI_Extension()
     Init_Intent();
 #endif
 
-#if defined(OS_ANDROID) || defined(OS_WINCE) || (defined(OS_MACOSX) && !defined(RHODES_EMULATOR)) || defined(OS_UWP)|| defined(OS_WINDOWS_DESKTOP) || defined(OS_SAILFISH) || defined(RHODES_EMULATOR)
+#if defined(OS_ANDROID) || defined(OS_WINCE) || (defined(OS_MACOSX) && !defined(RHODES_EMULATOR)) || defined(OS_UWP)|| defined(OS_WINDOWS_DESKTOP) || defined(OS_SAILFISH) || defined(RHODES_EMULATOR)  || defined(OS_LINUX)
     Init_Timer_extension();
 #endif
 
-#if defined(OS_ANDROID) || defined(OS_UWP) || defined(OS_WINCE) || defined(OS_SAILFISH) || defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(RHODES_EMULATOR))
+#if defined(OS_ANDROID) || defined(OS_UWP) || defined(OS_WINCE) || defined(OS_SAILFISH) || defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(RHODES_EMULATOR)) || defined(OS_WINDOWS_DESKTOP)
     Init_Config_extension();
 #endif
 }

data/lib/commonAPI/coreapi/ext/shared/NetworkDetectBase.cpp

@@ -137,7 +137,7 @@ void CNetworkDetectionBase::run()
   
   if ( m_deleteSelf )
   {
-#if defined(OS_WINDOWS_DESKTOP)// || defined(OS_UWP)
+#if defined(OS_WINDOWS_DESKTOP) // || defined(OS_UWP)
     LOG(INFO) + "Stopping Network Detection Thread - do not delete ";
  #else
      LOG(INFO) + "Stopping Network Detection Thread - delete this";

data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp

@@ -73,6 +73,8 @@ void CSystemImplBase::getPlatform(CMethodResult& oResult)
         oResult.set( L"WINDOWS" );
     else if ( strPlatform.compare("win32") == 0 )
         oResult.set( L"WINDOWS_DESKTOP" );
+    else if ( strPlatform.compare("linux") == 0 )
+        oResult.set( L"LINUX" );
     else if ( strPlatform.compare("wp") == 0 )
         oResult.set( L"WP7" );
     else if ( strPlatform.compare("wp8") == 0 )

data/lib/commonAPI/coreapi/ext/system.xml

@@ -49,6 +49,9 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                     <VALUE constName="PLATFORM_SAILFISH" value ="SAILFISH" productException='eb'>
                         <DESC></DESC>
                     </VALUE>
+                    <VALUE constName="PLATFORM_LINUX" value ="LINUX" productException='eb'>
+                        <DESC></DESC>
+                    </VALUE>
                     <VALUE constName="PLATFORM_UWP" value ="UWP" productException='eb'>
                       <DESC></DESC>
                     </VALUE>

data/lib/commonAPI/devicesecurity/ext/DeviceSecurity.xml

@@ -85,7 +85,7 @@ For instance if you only want your app to be installed from Google Play Store, a
 
             <METHOD name="isRunOnSimulator" access="STATIC" >
                 <DESC>return true if application run on simulator</DESC>
-                <PLATFORM>Android</PLATFORM>
+                <PLATFORM>Android, iOS</PLATFORM>
                 <RETURN type="BOOLEAN"/>
             </METHOD>
 
@@ -136,7 +136,7 @@ For instance if you only want your app to be installed from Google Play Store, a
         <USER_OVERVIEW>
         </USER_OVERVIEW>
 
-       
+
         <VER_INTRODUCED>6.0.0</VER_INTRODUCED>
         <PLATFORM>
          </PLATFORM>

data/lib/commonAPI/devicesecurity/ext/build.bat

@@ -15,7 +15,7 @@ rake --trace
 
 if "%RHO_PLATFORM%" == "win32" (
 
-call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call %RHO_VSCMNTOOLS%
 cd platform\qt
 rake --trace
 

data/lib/commonAPI/devicesecurity/ext/platform/iphone/DeviceSecurity.xcodeproj/project.pbxproj

@@ -285,7 +285,7 @@
 					../../../../../../platform/shared,
 					../../../../../../platform/iphone/Classes,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -313,7 +313,7 @@
 					../../../../../../platform/shared,
 					../../../../../../platform/iphone/Classes,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -334,7 +334,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = DeviceSecurity_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = DeviceSecurity;
 				SDKROOT = iphoneos;
@@ -350,7 +350,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = DeviceSecurity_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = DeviceSecurity;
 				SDKROOT = iphoneos;

data/lib/commonAPI/devicesecurity/ext/platform/iphone/Rakefile

@@ -1,73 +1,20 @@
 require 'fileutils'
 
-USE_STLPORT = true
-
-puts "DeviceSecurity extension !"
-
 namespace "build" do
+    task :all do
+        rhorootdir = ENV['RHO_ROOT']
+        raise "RHO_ROOT is not set" if rhorootdir.nil?
 
-  task :config do
-
-    $targetdir = ENV['TARGET_TEMP_DIR']
-    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
-
-    $tempdir = ENV['TEMP_FILES_DIR']
-    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
-
-    $rootdir = ENV['RHO_ROOT']
-    raise "RHO_ROOT is not set" if $rootdir.nil?
-
-    $xcodebuild = ENV['XCODEBUILD']	
-    raise "XCODEBUILD is not set" if $xcodebuild.nil?
- 
-    $configuration = ENV['CONFIGURATION']	
-    raise "CONFIGURATION is not set" if $configuration.nil?
-
-    $sdk = ENV['SDK_NAME']	
-    raise "SDK_NAME is not set" if $sdk.nil?
-
-    $bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
-    raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
-    
-    $sdkroot = ENV['SDKROOT']
-    raise "SDKROOT is not set" if $sdkroot.nil?
-
-    $arch = ENV['ARCHS']
-    raise "ARCHS is not set" if $arch.nil?
-    
-    $gccbin = $bindir + '/gcc-4.2'
-    $arbin = $bindir + '/ar'
-
-  end
+        require File.join(rhorootdir, 'platform','iphone','rbuild','buildextension')
 
-  task :all => :config do
+        IPhoneBuild.load_env_for_build_rhodes_ios_extension
 
-    iphone_path = '.'
+        extension_name = "DeviceSecurity"
+        extension_lib_name = extension_name
+        extension_xcode_target_name = extension_name
 
-    simulator = $sdk =~ /iphonesimulator/
-
-    if $configuration == 'Distribution'
-       $configuration = 'Release'
+        ret= IPhoneBuild.build_rhodes_ios_extension(extension_name, extension_lib_name, extension_xcode_target_name)
     end
-
-    result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libDeviceSecurity.a'
-    target_lib = $targetdir + '/libDeviceSecurity.a'
-
-    rm_rf 'build'
-    rm_rf target_lib
-
-    args = ['build', '-target', 'DeviceSecurity', '-configuration', $configuration, '-sdk', $sdk]
-
-    require File.join(ENV['RHO_ROOT'], 'platform','iphone','rbuild','iphonecommon')
-
-    ret = IPhoneBuild.run_and_trace($xcodebuild,args)
-
-    # copy result to $targetdir
-    cp result_lib,target_lib
-
-  end
-
-
 end
 
 task :default => "build:all"

data/lib/commonAPI/eventsource/ext/platform/iphone/Eventsource.xcodeproj/project.pbxproj

@@ -224,7 +224,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -245,7 +245,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -266,7 +266,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Eventsource_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = Eventsource;
 				SDKROOT = iphoneos;
@@ -282,7 +282,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Eventsource_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = Eventsource;
 				SDKROOT = iphoneos;

data/lib/commonAPI/eventsource/ext/platform/iphone/Rakefile

@@ -1,75 +1,20 @@
 require 'fileutils'
 
-USE_STLPORT = true
-
-puts "Eventsource extension !"
-
 namespace "build" do
+    task :all do
+        rhorootdir = ENV['RHO_ROOT']
+        raise "RHO_ROOT is not set" if rhorootdir.nil?
 
-  task :config do
-
-    $targetdir = ENV['TARGET_TEMP_DIR']
-    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
-
-    $tempdir = ENV['TEMP_FILES_DIR']
-    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
-
-    $rootdir = ENV['RHO_ROOT']
-    raise "RHO_ROOT is not set" if $rootdir.nil?
-
-    $xcodebuild = ENV['XCODEBUILD']	
-    raise "XCODEBUILD is not set" if $xcodebuild.nil?
- 
-    $configuration = ENV['CONFIGURATION']	
-    raise "CONFIGURATION is not set" if $configuration.nil?
-
-    $sdk = ENV['SDK_NAME']	
-    raise "SDK_NAME is not set" if $sdk.nil?
-
-    $bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
-    raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
-    
-    $sdkroot = ENV['SDKROOT']
-    raise "SDKROOT is not set" if $sdkroot.nil?
-
-    $arch = ENV['ARCHS']
-    raise "ARCHS is not set" if $arch.nil?
-    
-    $gccbin = $bindir + '/gcc-4.2'
-    $arbin = $bindir + '/ar'
-
-  end
-
-  task :all => :config do
+        require File.join(rhorootdir, 'platform','iphone','rbuild','buildextension')
 
-    iphone_path = '.'
+        IPhoneBuild.load_env_for_build_rhodes_ios_extension
 
-    simulator = $sdk =~ /iphonesimulator/
+        extension_name = "Eventsource"
+        extension_lib_name = extension_name
+        extension_xcode_target_name = extension_name
 
-    if $configuration == 'Distribution'
-       $configuration = 'Release'
+        ret= IPhoneBuild.build_rhodes_ios_extension(extension_name, extension_lib_name, extension_xcode_target_name)
     end
-
-    result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libEventsource.a'
-    target_lib = $targetdir + '/libEventsource.a'
-
-    rm_rf 'build'
-    rm_rf target_lib
-
-    args = ['build', '-target', 'Eventsource', '-configuration', $configuration, '-sdk', $sdk]
-
-
-    require   $rootdir + '/lib/build/jake.rb'
-
-    puts Jake.run($xcodebuild,args)
-    ret = $?
-
-    # copy result to $targetdir
-    cp result_lib,target_lib
-
-  end
-
-
 end
 
 task :default => "build:all"

data/lib/commonAPI/hardwarekeys/ext/platform/android/src/com/rho/keycapture/KeyCaptureRhoListener.java

@@ -71,7 +71,14 @@ public class KeyCaptureRhoListener extends AbstractRhoListener
 	private void copyMappingXML()
 	{
 		boolean writeableStorage=true;
-		String rawResourceName=Environment.getExternalStorageDirectory()+"/Android/data/"+RhodesActivity.safeGetInstance().getPackageName()+ "/keycodemapping.xml";
+		String rawResourceName=null;
+		try {
+		    rawResourceName=Environment.getExternalStorageDirectory()+"/Android/data/"+RhodesActivity.safeGetInstance().getPackageName()+ "/keycodemapping.xml";
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+			return;
+		}
 		int resourceId= RhoExtManager.getResourceId("raw","keycodemapping");
 		File resourceFile = new File(rawResourceName);
 		boolean fileExists = resourceFile.exists();
@@ -103,6 +110,9 @@ public class KeyCaptureRhoListener extends AbstractRhoListener
 				
 				resourceFile.delete();
 			}
+			catch (Exception e) {
+				Logger.E(TAG, e);
+			}
 		}
 		else
 		{

data/lib/commonAPI/hardwarekeys/ext/platform/android/src/com/rho/keycapture/KeyCaptureSingleton.java

@@ -342,7 +342,14 @@ public class KeyCaptureSingleton implements IKeyCaptureSingleton
 		Logger.D(TAG, "onKey+: " + keyCode);
 		int disAppCallKey = 1000;
 		IRhoConfig rhoelementsGetConfig= null; //RhoExtManager.getInstance().getConfig("rhoelementsext");
-		IRhoWebView vi=RhodesActivity.safeGetInstance().getMainView().getWebView(0);
+		IRhoWebView vi = null;
+		try{
+		    vi=RhodesActivity.safeGetInstance().getMainView().getWebView(0);
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
+		
 		
 		GoogleWebView web=null;
 
@@ -492,6 +499,9 @@ public class KeyCaptureSingleton implements IKeyCaptureSingleton
 		catch(NumberFormatException e){
 			e.printStackTrace();
 		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
 					
 		return appKeyCode;
 	}
@@ -573,6 +583,9 @@ public class KeyCaptureSingleton implements IKeyCaptureSingleton
 		catch(NumberFormatException e){
 			e.printStackTrace();
 		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
 		
 		return andKeyCode;
 	}

data/lib/commonAPI/hardwarekeys/ext/platform/iphone/HardwareKeys.xcodeproj/project.pbxproj

@@ -266,7 +266,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -287,7 +287,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -308,7 +308,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = HardwareKeys_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = HardwareKeys;
 				SDKROOT = iphoneos;
@@ -324,7 +324,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = HardwareKeys_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = HardwareKeys;
 				SDKROOT = iphoneos;