rhodes 2.2.0 → 2.2.1.beta.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+## 2.2.1
+* #5681741 - Android push: support alert,sync,sound,vibrate commands
+
 ## 2.2.0
 * Bluetooth for all platforms
 * Calendar support for all platforms

data/lib/build/jake.rb

@@ -244,7 +244,7 @@ class Jake
                     Process.kill( 9, f.pid ) 
                 end    
             else
-                puts line
+                puts "RET: " + line
                 $stdout.flush
             end    
           end

data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/error.h

@@ -104,6 +104,7 @@ extern int _zbar_verbosity;
 
 #else
 
+/*
 # ifdef __GNUC__
 #  define zprintf(level, format, args...) do {                          \
             fprintf(stderr, "%s: " format, __func__ , ##args);          \
@@ -115,6 +116,19 @@ extern int _zbar_verbosity;
             ZFLUSH                                                      \
     } while(0)
 # endif
+*/
+
+// Disable console output
+# ifdef __GNUC__
+#  define zprintf(level, format, args...) do {                          \
+    } while(0)
+# else
+#  define zprintf(level, format, ...) do {                              \
+    } while(0)
+# endif
+
+
+
 
 #endif
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.2.0'
+    DBVERSION = '2.2.1'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '2.2.0'
+    DBVERSION = '2.2.1'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.2.0'
+    DBVERSION = '2.2.1'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="22"
-      android:versionName="2.2.0">
+      android:versionCode="23"
+      android:versionName="2.2.1">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h

@@ -45,6 +45,14 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_startRhodesApp
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncAllSources
   (JNIEnv *, jobject, jboolean);
 
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    doSyncSource
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
+  (JNIEnv *, jobject, jstring);
+
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    getOptionsUrl
@@ -160,9 +168,9 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrati
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    callPushCallback
- * Signature: (Ljava/lang/String;)V
+ * Signature: (Ljava/lang/String;)Z
  */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
   (JNIEnv *, jobject, jstring);
 
 #ifdef __cplusplus

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -420,6 +420,13 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncAllSources
     rho_sync_doSyncAllSources(show_status_popup);
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
+  (JNIEnv *env, jobject, jstring sourceObj)
+{
+    std::string source = rho_cast<std::string>(env, sourceObj);
+    rho_sync_doSyncSourceByName(source.c_str());
+}
+
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getOptionsUrl
   (JNIEnv *env, jobject)
 {
@@ -502,11 +509,11 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrat
     rho::sync::CClientRegister::Create(new rho::common::CRhoClassFactory, id.c_str());
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
   (JNIEnv *env, jobject, jstring jData)
 {
     std::string data = rho_cast<std::string>(env, jData);
-    rho_rhodesapp_callPushCallback(data.c_str());
+    return (jboolean)rho_rhodesapp_callPushCallback(data.c_str());
 }
 
 RHO_GLOBAL char *rho_timezone()

data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java

@@ -1,5 +1,6 @@
 package com.rhomobile.rhodes;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -47,12 +48,25 @@ public class PushReceiver extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		String action = intent.getAction();
-		if (action.equals(PushService.C2DM_INTENT_PREFIX + "REGISTRATION"))
-			handleRegistration(context, intent);
-		else if (action.equals(PushService.C2DM_INTENT_PREFIX + "RECEIVE"))
-			handleMessage(context, intent);
+		if (action.equals(PushService.C2DM_INTENT_PREFIX + "REGISTRATION")) {
+			try {
+				handleRegistration(context, intent);
+			}
+			catch (Exception e) {
+				Log.e(TAG, "Can't handle PUSH registration: " + e.getMessage());
+			}
+		}
+		else if (action.equals(PushService.C2DM_INTENT_PREFIX + "RECEIVE")) {
+			try {
+				handleMessage(context, intent);
+			}
+			catch (Exception e) {
+				Log.e(TAG, "Can't handle PUSH message: " + e.getMessage());
+			}
+		}
 		else
 			Log.w(TAG, "Unknown action received (PUSH): " + action);
+		setResult(Activity.RESULT_OK, null /* data */, null /* extra */);
 	}
 
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java

@@ -27,7 +27,7 @@ public class PushService {
 		
 		checkCapabilities();
 		
-		Logger.D(TAG, "Register for PUSH messages");
+		Logger.D(TAG, "Register for PUSH messages (use \"" + Push.SENDER + "\" as sender)");
 		
 		Context ctx = RhodesService.getInstance().getContext();
 		Intent registrationIntent = new Intent(C2DM_INTENT_PREFIX + "REGISTER");

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -9,6 +9,7 @@ import java.util.Set;
 import java.util.TimeZone;
 import java.util.Vector;
 
+import com.rhomobile.rhodes.alert.Alert;
 import com.rhomobile.rhodes.bluetooth.RhoBluetoothManager;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.geolocation.GeoLocation;
@@ -135,6 +136,7 @@ public class RhodesService {
 	private native void startRhodesApp();
 	
 	public native void doSyncAllSources(boolean v);
+	public native void doSyncSource(String source);
 	
 	public native String getOptionsUrl();
 	public native String getStartUrl();
@@ -686,6 +688,11 @@ public class RhodesService {
 		else if (name.equalsIgnoreCase("device_name")) {
 			return Build.DEVICE;
 		}
+		else if (name.equalsIgnoreCase("is_emulator")) 
+		{
+		    String strDevice = Build.DEVICE;
+			return new Boolean(strDevice != null && strDevice.equalsIgnoreCase("generic"));
+		}
 		else if (name.equalsIgnoreCase("os_version")) {
 			return Build.VERSION.RELEASE;
 		}
@@ -705,7 +712,7 @@ public class RhodesService {
 
 	public native void setPushRegistrationId(String id);
 	
-	private native void callPushCallback(String data);
+	private native boolean callPushCallback(String data);
 	
 	public void handlePushMessage(Intent intent) {
 		Logger.D(TAG, "Receive PUSH message");
@@ -719,6 +726,10 @@ public class RhodesService {
 		StringBuilder builder = new StringBuilder();
 		
 		Set<String> keys = extras.keySet();
+		// Remove system related keys
+		keys.remove("collapse_key");
+		keys.remove("from");
+		
 		for (String key : keys) {
 			Logger.D(TAG, "PUSH item: " + key);
 			Object value = extras.get(key);
@@ -732,9 +743,49 @@ public class RhodesService {
 		
 		String data = builder.toString();
 		Logger.D(TAG, "Received PUSH message: " + data);
-		callPushCallback(data);
+		if (callPushCallback(data))
+			return;
 		
-		// TODO: handle alers/sounds/vibrate events
+		String alert = extras.getString("alert");
+		if (alert != null) {
+			Logger.D(TAG, "PUSH: Alert: " + alert);
+			Alert.showPopup(alert);
+		}
+		String sound = extras.getString("sound");
+		if (sound != null) {
+			Logger.D(TAG, "PUSH: Sound file name: " + sound);
+			Alert.playFile("/public/alerts/" + sound, null);
+		}
+		String vibrate = extras.getString("vibrate");
+		if (vibrate != null) {
+			Logger.D(TAG, "PUSH: Vibrate: " + vibrate);
+			int duration;
+			try {
+				duration = Integer.parseInt(vibrate);
+			}
+			catch (NumberFormatException e) {
+				duration = 5;
+			}
+			Logger.D(TAG, "Vibrate " + duration + " seconds");
+			Alert.vibrate(duration);
+		}
+		
+		String syncSources = extras.getString("do_sync");
+		if (syncSources != null) {
+			Logger.D(TAG, "PUSH: Sync:");
+			boolean syncAll = false;
+			for (String source : syncSources.split(",")) {
+				Logger.D(TAG, "url = " + source);
+				if (source.equalsIgnoreCase("all"))
+					syncAll = true;
+				else {
+					doSyncSource(source.trim());
+				}
+			}
+			
+			if (syncAll)
+				doSyncAllSources(true);
+		}
 	}
 	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java

@@ -21,6 +21,7 @@
 package com.rhomobile.rhodes.alert;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.util.Map;
 import java.util.Vector;
 
@@ -54,6 +55,7 @@ public class Alert {
 	private static final String TAG = "Alert";
 	
 	private static Dialog currentAlert = null;
+	private static MediaPlayer currentMP = null;
 	
 	private static native void doCallback(String url, String id, String title);
 	
@@ -283,14 +285,19 @@ public class Alert {
 			vibrator.vibrate(duration);
 		}
 		catch (Exception e) {
-			reportFail("showPopup", e);
+			reportFail("vibrate", e);
 		}
 	}
 	
 	public static void playFile(String fileName, String mediaType) {
 		try {
 			Logger.T(TAG, "playFile: " + fileName + " (" + mediaType + ")");
+			
+			if (currentMP != null)
+				currentMP.release();
+			
 			MediaPlayer mp = new MediaPlayer();
+			currentMP = mp;
 			mp.setOnErrorListener(new MediaPlayer.OnErrorListener() {
 				public boolean onError(MediaPlayer mp, int what, int extra) {
 					Logger.E(TAG, "Error when playing file : " + what + ", " + extra);
@@ -302,9 +309,14 @@ public class Alert {
 			f = new File(f, fileName);
 			if (!f.exists())
 				RhoFileApi.copy(fileName);
+			
 			String source = f.getCanonicalPath();
 			Logger.T(TAG, "Final file name: " + source);
-			mp.setDataSource(source);
+			//mp.setDataSource(source);
+			
+			FileInputStream fs = new FileInputStream(f);
+			mp.setDataSource(fs.getFD());
+			
 			mp.prepare();
 			mp.start();
 		} catch (Exception e) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java

@@ -29,8 +29,9 @@ public class EventStore {
 	private static final String EVENTS_PRIVACY = "visibility";
 	
 	private static void reportFail(String name, Exception e) {
-		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
-		e.printStackTrace();
+		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e != null ? e.getMessage() : "null exception");
+		if ( e != null )
+		    e.printStackTrace();
 	}
 	
 	private static String dateToString(Date date) {
@@ -246,7 +247,15 @@ public class EventStore {
 			
 			Logger.D(TAG, "delete(id)");
 			
-			int rows = getContentResolver().delete(EVENTS_URI, "_id=?", new String[] {id});
+			ContentResolver r = getContentResolver();
+			int rows;
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
+				Uri uri = ContentUris.withAppendedId(EVENTS_URI, Long.parseLong(id));
+				rows = getContentResolver().delete(uri, null, null);
+			}
+			else {
+				rows = r.delete(EVENTS_URI, "_id=?", new String[] {id});
+			}
 			Logger.D(TAG, String.format("%d rows deleted", rows));
 			
 			return null;

data/platform/bb/RubyVM/src/com/rho/RhodesApp.java

@@ -112,7 +112,8 @@ public class RhodesApp
     {
     	return strUrl.startsWith("http://") || strUrl.startsWith("https://") ||
     		strUrl.startsWith("javascript:") || strUrl.startsWith("mailto:")
-    		 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:");    
+    		 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:") ||
+    		 strUrl.startsWith("sms:");    
     }
     
     public String canonicalizeRhoUrl(String url) 

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -172,6 +172,10 @@ public class System {
     		return ObjectFactory.createString(DeviceInfo.getDeviceName());
     	if ( strPropName.equalsIgnoreCase("os_version") )
     		return ObjectFactory.createString(DeviceInfo.getSoftwareVersion());
+    	if ( strPropName.equalsIgnoreCase("rhodes_port") )
+    		return ObjectFactory.createInteger(0);
+    	if ( strPropName.equalsIgnoreCase("is_emulator") )
+    		return ObjectFactory.createBoolean(DeviceInfo.isSimulator());
     	
     	return RubyConstant.QNIL;
     }

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -320,7 +320,15 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         NSString *version = [[UIDevice currentDevice] systemVersion];
         *resValue = rho_ruby_create_string([version UTF8String]);
         return 1;
+    }else if (strcasecmp("is_emulator", szPropName) == 0) {
+        int bSim = 0; 
+#if TARGET_IPHONE_SIMULATOR
+		bSim = 1;
+#endif		
+		*resValue = rho_ruby_create_boolean(bSim);
+        return 1;
     }
+	
     /*
     // Removed because it's possibly dangerous: Apple could reject application
     // used such approach from its AppStore

data/platform/iphone/Classes/RhoMainView.h

@@ -32,4 +32,6 @@
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
 - (void)removeNavBar;
 
+- (UIWebView*)getWebView:(int)tab_index;
+
 @end

data/platform/iphone/Classes/RhoNativeViewManager.mm

@@ -12,7 +12,7 @@
 
 #import "RhoNativeViewManagerOC.h"
 #import "RhoNativeViewManager.h" 
-
+#import "Rhodes.h"
 
 
 	
@@ -196,7 +196,7 @@ static RhoNativeViewManagerOC *instance = NULL;
 }
 
 +(UIWebView*)getWebViewObject:(int)tab_index {
-	return nil;
+	return [[[Rhodes sharedInstance] mainView] getWebView:tab_index];
 }
 
 
@@ -204,6 +204,7 @@ static RhoNativeViewManagerOC *instance = NULL;
 
 
 
+
 void RhoNativeViewManager::registerViewType(const char* viewType, NativeViewFactory* factory) {
 	NativeViewFactoryOCImpl* f = [NativeViewFactoryOCImpl makeFactory:factory];
 	NSString* s = [[NSString alloc] initWithUTF8String:viewType];
@@ -222,3 +223,4 @@ void RhoNativeViewManager::unregisterViewType(const char* viewType) {
 void* RhoNativeViewManager::getWebViewObject(int tab_index) {
 	return [RhoNativeViewManagerOC getWebViewObject:tab_index];
 }
+

data/platform/iphone/Classes/SimpleMainView.h

@@ -35,4 +35,6 @@
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
 - (void)loadView;
 
+- (UIWebView*)getWebView:(int)tab_index;
+
 @end

data/platform/iphone/Classes/SimpleMainView.m

@@ -660,6 +660,10 @@ int rho_sys_get_screen_height();
     return 0;
 }
 
+- (UIWebView*)getWebView:(int)tab_index {
+	return webView;
+}
+
 
 - (void)addNavBar:(UINavigationBar*)navb {
     [self removeNavBar];

data/platform/iphone/Classes/TabbedMainView.h

@@ -22,4 +22,6 @@
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray*)items;
 
+- (UIWebView*)getWebView:(int)tab_index;
+
 @end

data/platform/iphone/Classes/TabbedMainView.m

@@ -205,6 +205,14 @@
     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/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

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

@@ -27,7 +27,6 @@
 		BD38E6DC115CFF14001CE05C /* WebView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD38E6DB115CFF14001CE05C /* WebView.m */; };
 		BD38E755115D1AAC001CE05C /* TabbedMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD38E754115D1AAC001CE05C /* TabbedMainView.m */; };
 		BD486F59124FB66600F8A93F /* Event.m in Sources */ = {isa = PBXBuildFile; fileRef = BD486F58124FB66600F8A93F /* Event.m */; };
-		BD486FE212505FE000F8A93F /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD486FE112505FE000F8A93F /* EventKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		BD5B744B113BE2DB00C6070A /* SplashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD5B7449113BE2DB00C6070A /* SplashViewController.m */; };
 		BD6A622A123E46BB0093E03C /* RhoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6A6229123E46BB0093E03C /* RhoViewController.m */; };
 		BD97AC211160EE8F006960F9 /* RhoAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = BD97AC201160EE8F006960F9 /* RhoAlert.m */; };
@@ -183,7 +182,6 @@
 		BD38E754115D1AAC001CE05C /* TabbedMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabbedMainView.m; sourceTree = "<group>"; };
 		BD486F57124FB66600F8A93F /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Event.h; path = Event/Event.h; sourceTree = "<group>"; };
 		BD486F58124FB66600F8A93F /* Event.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Event.m; path = Event/Event.m; sourceTree = "<group>"; };
-		BD486FE112505FE000F8A93F /* EventKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKit.framework; path = System/Library/Frameworks/EventKit.framework; sourceTree = SDKROOT; };
 		BD5B7448113BE2DB00C6070A /* SplashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplashViewController.h; sourceTree = "<group>"; };
 		BD5B7449113BE2DB00C6070A /* SplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashViewController.m; sourceTree = "<group>"; };
 		BD6A6228123E46BB0093E03C /* RhoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoViewController.h; sourceTree = "<group>"; };
@@ -282,7 +280,6 @@
 				46AD7DB31117AFB9009A974A /* MapKit.framework in Frameworks */,
 				46AD7DB71117AFBF009A974A /* CFNetwork.framework in Frameworks */,
 				FACC2100123A759A0088A447 /* GameKit.framework in Frameworks */,
-				BD486FE212505FE000F8A93F /* EventKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -353,7 +350,6 @@
 				46AD7DB21117AFB9009A974A /* MapKit.framework */,
 				46AD7DB61117AFBF009A974A /* CFNetwork.framework */,
 				FACC20FF123A759A0088A447 /* GameKit.framework */,
-				BD486FE112505FE000F8A93F /* EventKit.framework */,
 			);
 			name = CustomTemplate;
 			sourceTree = "<group>";
@@ -915,7 +911,6 @@
 				CODE_SIGN_IDENTITY = "Don't Code Sign";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
 				COPY_PHASE_STRIP = NO;
-				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -930,7 +925,6 @@
 				);
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "$(EXTENSIONS_LDFLAGS)";
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -963,19 +957,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "$(EXTENSIONS_LDFLAGS)";
-				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"-framework",
-					CoreGraphics,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -991,72 +972,23 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
-				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.0][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
-				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.1][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.0][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.1][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos3.2;
@@ -1086,45 +1018,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				OTHER_LDFLAGS = "$(EXTENSIONS_LDFLAGS)";
-				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.0][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.1][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.0][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.1][arch=*]" = (
-					"-framework",
-					MapKit,
-					"-framework",
-					CFNetwork,
-					"$(EXTENSIONS_LDFLAGS)",
-				);
 				PRODUCT_NAME = rhorunner;
 				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1139,6 +1032,7 @@
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_IDENTITY = "Don't Code Sign";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1147,19 +1041,17 @@
 				IBC_FLATTEN_NIBS = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1175,28 +1067,23 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
-					"-framework",
-					CFNetwork,
-					"-lrhorubylib",
-					"-lrhosynclib",
-					"-ltcmalloc",
-					"-lrholib",
-					"-lrhoextlib",
+					"$(EXTENSIONS_LDFLAGS)",
+					"-weak_framework",
+					EventKit,
 				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos3.2;

data/platform/shared/common/RhodesApp.h

@@ -110,6 +110,7 @@ public:
     void loadUrl(String url);
 
     boolean isLocalServerStarted();
+    const char* getFreeListeningPort();
 
 protected:
     virtual void run();
@@ -117,7 +118,6 @@ protected:
     void initHttpServer();
     void initAppUrls();
 
-    const char* getFreeListeningPort();
     net::INetRequest& getNet(){ return *m_NetRequest; }
 };
 

data/platform/shared/common/RhodesAppBase.cpp

@@ -56,7 +56,8 @@ String CRhodesAppBase::canonicalizeRhoUrl(const String& strUrl)
         strncmp("javascript:", strUrl.c_str(), 11 ) == 0 ||
         strncmp("mailto:", strUrl.c_str(), 7) == 0 ||
         strncmp("tel:", strUrl.c_str(), 4) == 0 ||
-        strncmp("wtai:", strUrl.c_str(), 5) == 0
+        strncmp("wtai:", strUrl.c_str(), 5) == 0 ||
+        strncmp("sms:", strUrl.c_str(), 4) == 0
         )
         return strUrl;
 

data/platform/shared/rubyext/System.cpp

@@ -50,6 +50,12 @@ VALUE rho_sys_get_property(char* szPropName)
 	if (strcasecmp("full_browser",szPropName) == 0) 
         return rho_ruby_create_boolean(1);
 
+	if (strcasecmp("rhodes_port",szPropName) == 0) 
+        return rho_ruby_create_integer(atoi(RHODESAPP().getFreeListeningPort()));
+
+	if (strcasecmp("is_emulator",szPropName) == 0) 
+        return rho_ruby_create_boolean(0);
+
     RAWLOG_ERROR1("Unknown Rho::System property : %s", szPropName);
 
     return rho_ruby_get_NIL();

data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp

@@ -339,6 +339,18 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 		return 1;
 	}
 
+	if (strcasecmp("is_emulator",szPropName) == 0)
+    {
+        bool bEmulator = false;
+#ifdef OS_WINDOWS
+        bEmulator = true;
+#else
+
+#endif
+        *resValue = rho_ruby_create_boolean(bEmulator?1:0);
+        return 1;
+    }
+
     return 0;
 }
 

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.2.0'
+  s.version = '2.2.1.beta.1'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/spec_runner.rb

@@ -20,7 +20,7 @@ class SpecRunner < MSpecScript
 
     config[:files] << "spec/contacts_spec" unless System.get_property('device_name') == 'Win32'
     # Disable events specs on Android because emulator doesn't contain Calendar provider
-    config[:files] << "spec/events_spec"  unless System.get_property('device_name') == 'Win32' or System.get_property('platform') == 'ANDROID'
+    config[:files] << "spec/events_spec"  unless System.get_property('device_name') == 'Win32' or (System.get_property('platform') == 'ANDROID' and System.get_property('is_emulator'))
     
     config[:files] << "spec/barcode_spec" unless System.get_property('device_name') == 'Win32'            
     config[:files] << "spec/mapview_spec"  unless System.get_property('platform') == 'WINDOWS'    

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 62196425
+  prerelease: true
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  - beta
+  - 1
+  version: 2.2.1.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -07:00
+date: 2010-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency