rhodes 2.4.1 → 3.0.0.beta.1

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

@@ -93,7 +93,7 @@ public class RhoCryptImpl
 	
 	private static void reportFail(String name, Exception e) 
 	{
-	    Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
+	    Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getClass().getSimpleName() + ": " + e.getMessage());
 	}
 	
     public boolean db_encrypt( String szPartition, ByteBuffer dataIn, ByteBuffer dataOut )
@@ -120,7 +120,7 @@ public class RhoCryptImpl
 	    	initContext(szPartition);
 
             dataOut.rewind();
-	    	m_decryptCipher.doFinal(dataIn, dataOut);            
+	    	m_decryptCipher.doFinal(dataIn, dataOut);
 	    	
 	    	return true;
 		}catch(Exception exc)

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

@@ -77,7 +77,7 @@ public class RhodesActivity extends BaseActivity {
 		//ct.setPriority(Thread.MAX_PRIORITY);
 		uiThreadId = ct.getId();
 
-		if (!RhodesService.isEnableTitle()) {
+		if (!RhodesService.isTitleEnabled()) {
 			requestWindowFeature(Window.FEATURE_NO_TITLE);
 		}
 		else {
@@ -139,26 +139,35 @@ public class RhodesActivity extends BaseActivity {
 	@Override
 	public void onStart() {
 		super.onStart();
-		//sInstance = this;
+	    RhodesService.rhodesActivityStarted(true);
 	}
-	
-	@Override
+
+    @Override
+    public void onPause() 
+    {
+        RhodesService.rhodesActivityStarted(false);
+
+        super.onPause();
+        Log.i(TAG, ">>>>>>>>>>>>>>> onPause()");
+
+        RhodesService r = RhodesService.getInstance();
+        if (r != null)
+            r.callUiDestroyedCallback();
+    }
+
+    @Override
 	public void onStop() 
 	{
 		super.onStop();
-
-		RhodesService r = RhodesService.getInstance();
-		if (r != null)
-			r.callUiDestroyedCallback();
+        Log.i(TAG, ">>>>>>>>>>>>>>> onStop()");
 	}
 	
 	@Override
 	public void onDestroy() {
-		//RhodesService r = RhodesService.getInstance();
-		//if (r != null)
-		//	r.callUiDestroyedCallback();
-		
-		sInstance = null;
+        Log.i(TAG, ">>>>>>>>>>>>>>> onDestroy()");
+        
+        //TODO: Check is it really correct in case activity killed immediately after onPause()
+        sInstance = null;
 		super.onDestroy();
 	}
 	
@@ -357,10 +366,10 @@ public class RhodesActivity extends BaseActivity {
                 startParams = startParams.substring(2);
         }
 
-        if(!RhodesService.canStartApp(startParams, "&#"))
+        if(!RhodesApplication.canStart(startParams))
         {
             Logger.E(TAG, "This is hidden app and can be started only with security key.");
-            getRhodesApplication().exit();
+            RhodesService.exit();
             return;
         }
 

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

@@ -1,60 +1,52 @@
 package com.rhomobile.rhodes;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Application;
+import android.os.Handler;
 import android.os.Process;
 
-public class RhodesApplication extends Application {
-	
-	private List<Runnable> mOnExit = new ArrayList<Runnable>();
+public class RhodesApplication extends Application{
 	
+//    private static final String TAG = NativeApplication.class.getSimpleName();
+    private static Handler mHandler;
 	static {
 		NativeLibraries.load();
 	}
-	
-	static native void setStartParameters(String uri);
-	
-	@Override
-	public void onCreate() {
-		super.onCreate();
-	}
-	
-	public void addOnExitHandler(Runnable action) {
-		synchronized (this) {
-			mOnExit.add(action);
-		}
-	}
-	
-	public boolean removeOnExitHandler(Runnable action) {
-		synchronized (this) {
-			return mOnExit.remove(action);
-		}
+
+    private native static void createRhodesApp();
+    private native static void startRhodesApp();
+    private native static void stopRhodesApp();
+    private native static boolean canStartApp(String strCmdLine, String strSeparators);
+	
+    public static void create()
+    {
+        createRhodesApp();
+    }
+
+    public static void start()
+	{
+	    startRhodesApp();
 	}
-	
-	public void exit() {
-		List<Runnable> onExit = new ArrayList<Runnable>();
-		synchronized (this) {
-			onExit.addAll(mOnExit);
-		}
-		
-		for (Runnable action : onExit) {
-			action.run();
-		}
-		
-		try {
-			RhodesService r = RhodesService.getInstance();
-			if (r != null)
-				r.stopSelf();
-		}
-		catch (Exception e) {}
-		
-		RhodesActivity ra = RhodesActivity.getInstance();
-		if (ra != null)
-			ra.finish();
-		
-		Process.killProcess(Process.myPid());
+
+	public static boolean canStart(String strCmdLine)
+	{
+	    return canStartApp(strCmdLine, "&#");
 	}
 	
+    public static void stop() {
+        
+        mHandler = new Handler();
+        mHandler.postDelayed(new Runnable() {
+            public void run() {
+                stopRhodesApp();
+                Process.sendSignal(Process.myPid(), Process.SIGNAL_QUIT);
+                mHandler.postDelayed(new Runnable() {
+                    public void run() {
+                        Process.killProcess(Process.myPid());
+                    }
+                }, 500);
+            }
+        }, 500);
+    }
+
+
 }

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

@@ -70,7 +70,7 @@ public class RhodesService extends Service {
 	
 	private static final String TAG = RhodesService.class.getSimpleName();
 	
-	private static final boolean DEBUG = false;
+	private static final boolean DEBUG = true;
 	
 	public static final String INTENT_EXTRA_PREFIX = "com.rhomobile.rhodes.";
 	
@@ -114,6 +114,13 @@ public class RhodesService extends Service {
 	private static boolean mCameraAvailable;
 	
 	private static int sActivitiesActive;
+	private static boolean sRhodesActivityStarted = false;
+	
+	synchronized
+	static void rhodesActivityStarted(boolean started) { sRhodesActivityStarted = started; }
+	
+	synchronized
+	public static boolean isRhodesActivityStarted() { return sRhodesActivityStarted; }
 	
 	private static int mGeoLocationInactivityTimeout;
 
@@ -128,8 +135,61 @@ public class RhodesService extends Service {
 	
 	private boolean mNeedGeoLocationRestart = false;
 	
-	static PowerManager.WakeLock wakeLockObject = null;
-	static boolean wakeLockEnabled = false;
+	class PowerWakeLock {
+	    private PowerManager.WakeLock wakeLockObject = null;
+	    private boolean wakeLockEnabled = false;
+
+        synchronized boolean isHeld() {
+            return (wakeLockObject != null) && wakeLockObject.isHeld(); 
+        }
+        synchronized boolean acquire(boolean enable) {
+            if (enable) {
+                Logger.I(TAG, "Enable WakeLock");
+                wakeLockEnabled = true;
+            }
+            if (wakeLockEnabled) {
+                if (wakeLockObject == null) {
+                    PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+                    if (pm != null) {
+                        Logger.I(TAG, "Acquire WakeLock");
+                        wakeLockObject = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
+                        wakeLockObject.setReferenceCounted(false);
+                        wakeLockObject.acquire();
+                    }
+                    else {
+                        Logger.E(TAG, "Can not get PowerManager to acquire WakeLock!!!");
+                    }
+                    return false;
+                }
+                //return wakeLockObject.isHeld();
+                return true;
+            }
+            return false;
+        }
+        synchronized boolean release()
+        {
+            if (wakeLockObject != null) {
+                Logger.I(TAG, "Release WakeLock");
+                wakeLockObject.release();
+                wakeLockObject = null;
+                return true;
+            }
+            return false;
+	    }
+	    
+	    synchronized boolean reset() {
+            if (wakeLockObject != null) {
+                Logger.I(TAG, "Reset WakeLock");
+                wakeLockObject.release();
+                wakeLockObject = null;
+                wakeLockEnabled = false;
+                return true;
+            }
+            return false;
+	    }
+	}
+	
+	private PowerWakeLock wakeLock = new PowerWakeLock();
 	
 	private Vector<UriHandler> mUriHandlers = new Vector<UriHandler>();
 	
@@ -152,9 +212,6 @@ public class RhodesService extends Service {
 	
 	private native void initClassLoader(ClassLoader c);
 	
-	private native void createRhodesApp();
-	private native void startRhodesApp();
-	
 	public native void doSyncAllSources(boolean v);
 	public native void doSyncSource(String source);
 	
@@ -179,15 +236,14 @@ public class RhodesService extends Service {
 	
 	public static native boolean isOnStartPage();
 	
-	public static native boolean canStartApp(String strCmdLine, String strSeparators);
-	
 	public static RhodesService getInstance() {
 		return sInstance;
 	}
 	
-	public static native boolean isEnableTitle();
+	public static native boolean isTitleEnabled();
 	
 	
+    // TODO: Move these methods to RhodesApplication class
 	private void initRootPath() {
 		ApplicationInfo appInfo = getAppInfo();
 		String dataDir = appInfo.dataDir;
@@ -216,6 +272,7 @@ public class RhodesService extends Service {
 		return mRootPath;
 	}
 	
+    // TODO: Move these methods to RhodesApplication class
 	private ApplicationInfo getAppInfo() {
 		Context context = this;
 		String pkgName = context.getPackageName();
@@ -288,7 +345,7 @@ public class RhodesService extends Service {
 			}
 		}
 		
-		createRhodesApp();
+		RhodesApplication.create();
 		
 		RhodesActivity ra = RhodesActivity.getInstance();
 		if (ra != null) {
@@ -335,33 +392,10 @@ public class RhodesService extends Service {
 		mUriHandlers.addElement(new SmsUriHandler(context));
 		mUriHandlers.addElement(new VideoUriHandler(context));
 		
-		getRhodesApplication().addOnExitHandler(new Runnable() {
-			public void run() {
-				PerformOnUiThread.exec( new Runnable() {
-					public void run() {
-						if (wakeLockObject != null) {
-							wakeLockObject.release();
-							wakeLockObject = null;
-							wakeLockEnabled = false;
-						}
-					}
-				}, false);
-			}
-		});
-		
 		try {
 			if (Capabilities.PUSH_ENABLED) {
-				PushService.register();
-				
-				getRhodesApplication().addOnExitHandler(new Runnable() {
-					public void run() {
-						try {
-							PushService.unregister();
-						} catch (IllegalAccessException e) {
-							Log.e(TAG, e.getMessage());
-						}
-					}
-				});
+				if (getPushRegistrationId().length() == 0)
+					PushService.register();
 			}
 		} catch (IllegalAccessException e) {
 			Log.e(TAG, e.getMessage());
@@ -369,7 +403,7 @@ public class RhodesService extends Service {
 			return;
 		}
 		
-		startRhodesApp();
+		RhodesApplication.start();
 		
 		if (sActivitiesActive > 0)
 			handleAppActivation();
@@ -407,10 +441,11 @@ public class RhodesService extends Service {
 	
 	@Override
 	public void onDestroy() {
-		if (DEBUG)
+	
+		if(DEBUG)
 			Log.d(TAG, "+++ onDestroy");
 		sInstance = null;
-		getRhodesApplication().exit();
+		RhodesApplication.stop();
 	}
 	
 	@Override
@@ -454,7 +489,7 @@ public class RhodesService extends Service {
 				String id = intent.getStringExtra(PushReceiver.INTENT_REGISTRATION_ID);
 				if (id == null)
 					throw new IllegalArgumentException("Empty registration id received in service command");
-				Logger.D(TAG, "Received PUSH registration id: " + id);
+				Logger.I(TAG, "Received PUSH registration id: " + id);
 				setPushRegistrationId(id);
 				break;
 			case PushReceiver.INTENT_TYPE_MESSAGE:
@@ -536,12 +571,24 @@ public class RhodesService extends Service {
 		return ra.getMainView();
 	}
 
-	public RhodesApplication getRhodesApplication() {
-		return (RhodesApplication)getApplication();
-	}
-	
 	public static void exit() {
-		getInstance().getRhodesApplication().exit();
+        try {
+            RhodesActivity activity = RhodesActivity.getInstance();
+            if (activity != null)
+                activity.finish();
+            
+            RhodesService service = RhodesService.getInstance();
+            if (service != null)
+            {
+                service.wakeLock.reset();
+                service.stopSelf();
+            }
+            
+            RhodesApplication.stop();
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e.getMessage());
+        }
 	}
 	
 	public void rereadScreenProperties() {
@@ -1087,6 +1134,7 @@ public class RhodesService extends Service {
     }
 
 	private native void setPushRegistrationId(String id);
+	private native String getPushRegistrationId(); 
 	
 	private native boolean callPushCallback(String data);
 	
@@ -1176,79 +1224,38 @@ public class RhodesService extends Service {
 	}
 	
 	private void restoreWakeLockIfNeeded() {
-		PerformOnUiThread.exec( new Runnable() {
-			public void run() {
-				if (wakeLockEnabled) {
-					if (wakeLockObject == null) {
-						PowerManager pm = (PowerManager)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);
+		 wakeLock.acquire(false);
 	}
 	
 	private void stopWakeLock() {
-		PerformOnUiThread.exec( new Runnable() {
-			public void run() {
-				if (wakeLockObject != null) {
-					Logger.I(TAG, "activityStopped() temporary destroy wakeLock object");
-					wakeLockObject.release();
-					wakeLockObject = null;
-				}
-			}
-		}, false);
+		Logger.I(TAG, "activityStopped() temporary release wakeLock object");
+		wakeLock.release();
 	}
 	
 	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) {
-						getInstance();
-						PowerManager pm = (PowerManager)RhodesService.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);
+		RhodesService rs = RhodesService.getInstance();
+        int wasEnabled = rs.wakeLock.isHeld() ? 1 : 0;
+		if(rs != null)
+		{
+		
+	        if (enable != 0) {
+	            // disable lock device
+				wasEnabled = rs.wakeLock.reset() ? 1 : 0;
+			}
+	        else {
+	            // lock device from sleep
+			    PerformOnUiThread.exec(new Runnable() {
+			        public void run() {
+			            RhodesService rs = RhodesService.getInstance();
+			            if(rs != null) rs.wakeLock.acquire(true);
+			            else Logger.E(TAG, "rho_sys_set_sleeping() - No RhodesService has initialized !!!"); }
+			    }, false);
+			}
 		}
 		return wasEnabled;
 	}
 	
-	
-	
 	private void handleAppActivation() {
 		if (DEBUG)
 			Log.d(TAG, "handle app activation");