rhodes 2.1.0 → 2.2.0.beta.1

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

@@ -6,11 +6,13 @@
 #include <logging/RhoLogConf.h>
 #include <common/RhodesApp.h>
 #include <sync/SyncThread.h>
+#include <sync/ClientRegister.h>
 
 #include <sys/stat.h>
 #include <sys/resource.h>
 
 #include "rhodes/JNIRhodes.h"
+#include "rhodes/RhoClassFactory.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Rhodes"
@@ -493,6 +495,20 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callActivationCa
     rho_rhodesapp_callAppActiveCallback(active);
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrationId
+  (JNIEnv *env, jobject, jstring jId)
+{
+    std::string id = rho_cast<std::string>(env, jId);
+    rho::sync::CClientRegister::Create(new rho::common::CRhoClassFactory, id.c_str());
+}
+
+RHO_GLOBAL void 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());
+}
+
 RHO_GLOBAL char *rho_timezone()
 {
     static char *tz = NULL;

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

@@ -70,6 +70,9 @@ namespace net
 SSLImpl::SSLImpl()
 {
     JNIEnv *env = jnienv();
+    if (!env) {
+       return;
+    }
     cls = getJNIClass(RHODES_JAVA_CLASS_SSLIMPL);
     if (!cls) return;
     midConstructor = getJNIClassMethod(env, cls, "<init>", "()V");

data/platform/android/Rhodes/res/layout/bt_device_list.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+    <TextView android:id="@+id/title_paired_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/title_paired_devices"
+        android:visibility="gone"
+        android:background="#666"
+        android:textColor="#fff"
+        android:paddingLeft="5dp"
+    />
+    <ListView android:id="@+id/paired_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stackFromBottom="true"
+        android:layout_weight="1"
+    />
+    <TextView android:id="@+id/title_new_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/title_other_devices"
+        android:visibility="gone"
+        android:background="#666"
+        android:textColor="#fff"
+        android:paddingLeft="5dp"
+    />
+    <ListView android:id="@+id/new_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stackFromBottom="true"
+        android:layout_weight="2"
+    />
+    <Button android:id="@+id/button_scan"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/button_scan"
+    />
+</LinearLayout>

data/platform/android/Rhodes/res/layout/bt_device_name.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="18sp"
+    android:padding="5dp"
+/>

data/platform/android/Rhodes/res/values/strings.xml

@@ -19,4 +19,12 @@
     <string name="cancel">Cancel</string>
     <color name="sig_bkgColor">#FFFFFF</color>
     <color name="sig_penColor">#66009A</color>
+    <!--  RhoBluetoothDeviceListActivity -->
+    <string name="scanning">scanning for devices...</string>
+    <string name="select_device">select a device to connect</string>
+    <string name="none_paired">No devices have been paired</string>
+    <string name="none_found">No devices found</string>
+    <string name="title_paired_devices">Paired Devices</string>
+    <string name="title_other_devices">Other Available Devices</string>
+    <string name="button_scan">Scan for devices</string>
 </resources>

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

@@ -73,6 +73,11 @@ public final class AndroidR {
         public static final int sig_clearButton=R.id.sig_clearButton;
         public static final int sig_okButton=R.id.sig_okButton;
         public static final int signature_view=R.id.signature_view;
+        public static final int title_paired_devices=R.id.title_paired_devices;
+        public static final int paired_devices=R.id.paired_devices;
+        public static final int title_new_devices=R.id.title_new_devices;
+        public static final int new_devices=R.id.new_devices;
+        public static final int button_scan=R.id.button_scan;
     }
     public static final class layout {
         public static final int camera=R.layout.camera;
@@ -83,6 +88,8 @@ public final class AndroidR {
         public static final int logoptions=R.layout.logoptions;
         public static final int logview=R.layout.logview;
         public static final int datetime=R.layout.datetime;
+        public static final int bt_device_list=R.layout.bt_device_list;
+        public static final int bt_device_name=R.layout.bt_device_name;
     }
     public static final class menu {
         public static final int options=R.menu.options;
@@ -103,5 +110,12 @@ public final class AndroidR {
         public static final int refresh=R.string.refresh;
         public static final int sync=R.string.sync;
         public static final int to_top=R.string.to_top;
+        public static final int scanning=R.string.scanning;
+        public static final int select_device=R.string.select_device;
+        public static final int none_paired=R.string.none_paired;
+        public static final int none_found=R.string.none_found;
+        public static final int title_paired_devices=R.string.title_paired_devices;
+        public static final int title_other_devices=R.string.title_other_devices;
+        public static final int button_scan=R.string.button_scan;
     }
 }

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

@@ -3,11 +3,13 @@ package com.rhomobile.rhodes;
 public class Capabilities {
 	
 	public static boolean AUDIO_ENABLED = true;
+	public static boolean CALENDAR_ENABLED = true;
 	public static boolean CAMERA_ENABLED = true;
 	public static boolean GPS_ENABLED = true;
 	public static boolean NETWORK_STATE_ENABLED = true;
 	public static boolean PHONE_ENABLED = true;
 	public static boolean PIM_ENABLED = true;
+	public static boolean PUSH_ENABLED = true;
 	public static boolean RECORD_AUDIO_ENABLED = true;
 	public static boolean VIBRATE_ENABLED = true;
 	

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

@@ -0,0 +1,7 @@
+package com.rhomobile.rhodes;
+
+public class Push {
+
+	public static final String SENDER = "support@rhomobile.com";
+	
+}

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

@@ -0,0 +1,58 @@
+package com.rhomobile.rhodes;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class PushReceiver extends BroadcastReceiver {
+	
+	private static final String TAG = "PushReceiver";
+	
+	private static final String REG_ID = "registration_id";
+
+	private void handleRegistration(Context context, Intent intent) {
+		String id = intent.getStringExtra(REG_ID);
+		String error = intent.getStringExtra("error");
+		String unregistered = intent.getStringExtra("unregistered");
+		if (error != null) {
+			Log.d(TAG, "Received error: " + error);
+		}
+		else if (unregistered != null) {
+			Log.d(TAG, "Unregistered: " + unregistered);
+		}
+		else if (id != null) {
+			// TODO: store it in reg_id variable
+			Log.d(TAG, "Registered: id: " + id);
+			RhodesService r = RhodesService.getInstance();
+			if (r == null) {
+				Log.e(TAG, "Rhodes instance is null");
+				return;
+			}
+			r.setPushRegistrationId(id);
+		}
+		else
+			Log.w(TAG, "Unknown registration event");
+	}
+	
+	private void handleMessage(Context context, Intent intent) {
+		RhodesService r = RhodesService.getInstance();
+		if (r == null) {
+			Log.e(TAG, "Rhodes instance is null");
+			return;
+		}
+		r.handlePushMessage(intent);
+	}
+	
+	@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);
+		else
+			Log.w(TAG, "Unknown action received (PUSH): " + action);
+	}
+
+}

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

@@ -0,0 +1,53 @@
+package com.rhomobile.rhodes;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+public class PushService {
+
+	private static final String TAG = "PushService";
+	
+	public static final String C2DM_INTENT_PREFIX = "com.google.android.c2dm.intent.";
+	
+	private static void checkCapabilities() throws IllegalAccessException {
+		if (!Capabilities.PUSH_ENABLED)
+			throw new IllegalAccessException("Capability PUSH disabled");
+	}
+	
+	private static boolean isOsVersionEnough() {
+		int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+		return sdkVersion >= Build.VERSION_CODES.FROYO;
+	}
+	
+	public static void register() throws IllegalAccessException {
+		if (!isOsVersionEnough())
+			return;
+		
+		checkCapabilities();
+		
+		Logger.D(TAG, "Register for PUSH messages");
+		
+		Context ctx = RhodesService.getInstance().getContext();
+		Intent registrationIntent = new Intent(C2DM_INTENT_PREFIX + "REGISTER");
+		registrationIntent.putExtra("app", PendingIntent.getBroadcast(ctx, 0, new Intent(), 0));
+		registrationIntent.putExtra("sender", Push.SENDER);
+		ctx.startService(registrationIntent);
+	}
+	
+	public static void unregister() throws IllegalAccessException {
+		if (!isOsVersionEnough())
+			return;
+		
+		checkCapabilities();
+		
+		Logger.D(TAG, "Unregister from PUSH messages");
+		
+		Context ctx = RhodesService.getInstance().getContext();
+		Intent unregIntent = new Intent(C2DM_INTENT_PREFIX + "UNREGISTER");
+		unregIntent.putExtra("app", PendingIntent.getBroadcast(ctx, 0, new Intent(), 0));
+		ctx.startService(unregIntent);
+	}
+	
+}

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

@@ -22,6 +22,7 @@ package com.rhomobile.rhodes;
 
 import com.rhomobile.rhodes.mainview.MainView;
 
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -33,6 +34,7 @@ import android.view.MenuItem;
 import android.view.Window;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
+import com.rhomobile.rhodes.bluetooth.RhoBluetoothManager;
 
 public class Rhodes extends RhoActivity {
 
@@ -120,4 +122,10 @@ public class Rhodes extends RhoActivity {
 	static {
 		NativeLibraries.load();
 	}
+	
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		RhoBluetoothManager.onActivityResult(requestCode, resultCode, data);
+	}
+	
+	
 }

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

@@ -5,9 +5,11 @@ import java.io.IOException;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Locale;
+import java.util.Set;
 import java.util.TimeZone;
 import java.util.Vector;
 
+import com.rhomobile.rhodes.bluetooth.RhoBluetoothManager;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.geolocation.GeoLocation;
 import com.rhomobile.rhodes.mainview.MainView;
@@ -23,6 +25,7 @@ import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.webview.ChromeClientOld;
 import com.rhomobile.rhodes.webview.RhoWebSettings;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -31,7 +34,9 @@ import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
 import android.os.Process;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
@@ -62,12 +67,16 @@ public class RhodesService {
 		return instance;
 	}
 	
-	private Context ctx;
+	private Activity ctx;
 	
 	public Context getContext() {
 		return ctx;
 	}
 	
+	public Activity getMainActivity() {
+		return ctx;
+	}
+	
 	private RhoLogConf m_rhoLogConf = new RhoLogConf();
 	public RhoLogConf getLogConf() {
 		return m_rhoLogConf;
@@ -90,10 +99,11 @@ public class RhodesService {
 		return uiThreadId;
 	}
 	
-	public void setInfo(Context c, long id, Handler handler) {
+	public void setInfo(Activity c, long id, Handler handler) {
 		ctx = c;
 		uiThreadId = id;
 		uiHandler = handler;
+		RhoBluetoothManager.sharedInstance();
 	}
 	
 	private Handler uiHandler;
@@ -150,6 +160,48 @@ public class RhodesService {
 	private String rootPath = null;
 	private native void nativeInitPath(String rootPath, String sqliteJournalsPath, String apkPath);
 	
+	static PowerManager.WakeLock wakeLockObject = null;
+	static boolean wakeLockEnabled = false;
+	
+	public static int rho_sys_set_sleeping(int enable) {
+		Logger.I(TAG, "rho_sys_set_sleeping("+enable+")");
+		int wasEnabled = 1;
+		if (wakeLockObject != null) {
+			wasEnabled = 0;
+		}
+		if (enable != 0) {
+			// disable lock device
+			PerformOnUiThread.exec( new Runnable() {
+				public void run() {
+					if (wakeLockObject != null) {
+						wakeLockObject.release();
+						wakeLockObject = null;
+						wakeLockEnabled = false;
+					}
+				}
+			}, false);
+		}
+		else {
+			// lock device from sleep
+			PerformOnUiThread.exec( new Runnable() {
+				public void run() {
+					if (wakeLockObject == null) {
+						PowerManager pm = (PowerManager)getInstance().getContext().getSystemService(Context.POWER_SERVICE);
+						if (pm != null) {
+							wakeLockObject = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
+							wakeLockObject.acquire();
+							wakeLockEnabled = true;
+						}
+						else {
+							Logger.E(TAG, "rho_sys_set_sleeping() - Can not get PowerManager !!!");
+						}
+					}
+				}
+			}, false);
+		}
+		return wasEnabled;
+	}
+	
 	private void initRootPath() {
 		ApplicationInfo appInfo = getAppInfo();
 		String dataDir = appInfo.dataDir;
@@ -197,6 +249,7 @@ public class RhodesService {
 					return true;
 			}
 			catch (Exception ex) {
+				Logger.E(TAG, ex.getMessage());
 				continue;
 			}
 		}
@@ -210,6 +263,8 @@ public class RhodesService {
 	}
 	
 	public void hideSplashScreen() {
+		PerformOnUiThread.exec(new Runnable() {
+					public void run() {
 		if (splashScreen != null) {
 			splashScreen.hide(outerFrame);
 			splashScreen = null;
@@ -217,6 +272,8 @@ public class RhodesService {
 		View view = mainView.getView();
 		view.setVisibility(View.VISIBLE);
 		view.requestFocus();
+		}
+				}, false);
 	}
 	
 	public WebView createWebView() {
@@ -325,7 +382,7 @@ public class RhodesService {
 		return instance != null;
 	}
 	
-	public RhodesService(Context c, ViewGroup rootWindow) {
+	public RhodesService(Activity c, ViewGroup rootWindow) {
 		ctx = c;
 		instance = this;
 		
@@ -399,6 +456,15 @@ public class RhodesService {
 		uriHandlers.addElement(new SmsUriHandler(ctx));
 		uriHandlers.addElement(new VideoUriHandler(ctx));
 		
+		try {
+			if (Capabilities.PUSH_ENABLED)
+				PushService.register();
+		} catch (IllegalAccessException e) {
+			Log.e(TAG, e.getMessage());
+			exitApp();
+			return;
+		}
+		
 		Thread init = new Thread(new Runnable() {
 
 			public void run() {
@@ -414,6 +480,22 @@ public class RhodesService {
 	}
 
 	public void exitApp() {
+		try {
+			if (Capabilities.PUSH_ENABLED)
+				PushService.unregister();
+		} catch (IllegalAccessException e) {
+			Log.e(TAG, e.getMessage());
+		}
+		
+		PerformOnUiThread.exec( new Runnable() {
+			public void run() {
+				if (wakeLockObject != null) {
+					wakeLockObject.release();
+					wakeLockObject = null;
+					wakeLockEnabled = false;
+				}
+			}
+		}, false);
 		Process.killProcess(Process.myPid());
 	}
 	
@@ -423,12 +505,38 @@ public class RhodesService {
 				GeoLocation.isKnownPosition();
 				needGeoLocationRestart = false;
 			}
+			PerformOnUiThread.exec( new Runnable() {
+				public void run() {
+					if (wakeLockEnabled) {
+						if (wakeLockObject == null) {
+							PowerManager pm = (PowerManager)getInstance().getContext().getSystemService(Context.POWER_SERVICE);
+							if (pm != null) {
+								Logger.I(TAG, "activityStarted() restore wakeLock object");
+								wakeLockObject = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
+								wakeLockObject.acquire();
+							}
+							else {
+								Logger.E(TAG, "activityStarted() - Can not get PowerManager !!!");
+							}
+						}
+					}
+				}
+			}, false);
 			callActivationCallback(true);
 		}
 		++activitiesActive;
 	}
 	
 	public void activityStopped() {
+		PerformOnUiThread.exec( new Runnable() {
+			public void run() {
+				if (wakeLockObject != null) {
+					Logger.I(TAG, "activityStopped() temporary destroy wakeLock object");
+					wakeLockObject.release();
+					wakeLockObject = null;
+				}
+			}
+		}, false);
 		--activitiesActive;
 		if (activitiesActive == 0) {
 			needGeoLocationRestart = GeoLocation.isAvailable();
@@ -594,6 +702,39 @@ public class RhodesService {
 		TimeZone tz = cal.getTimeZone();
 		return tz.getDisplayName();
 	}
+
+	public native void setPushRegistrationId(String id);
+	
+	private native void callPushCallback(String data);
 	
+	public void handlePushMessage(Intent intent) {
+		Logger.D(TAG, "Receive PUSH message");
+		
+		Bundle extras = intent.getExtras();
+		if (extras == null) {
+			Logger.W(TAG, "Empty PUSH message received");
+			return;
+		}
+		
+		StringBuilder builder = new StringBuilder();
+		
+		Set<String> keys = extras.keySet();
+		for (String key : keys) {
+			Logger.D(TAG, "PUSH item: " + key);
+			Object value = extras.get(key);
+			if (builder.length() > 0)
+				builder.append("&");
+			builder.append(key);
+			builder.append("=");
+			if (value != null)
+				builder.append(value.toString());
+		}
+		
+		String data = builder.toString();
+		Logger.D(TAG, "Received PUSH message: " + data);
+		callPushCallback(data);
+		
+		// TODO: handle alers/sounds/vibrate events
+	}
 	
 }