rhodes 3.0.0.beta.5 → 3.0.0.beta.6

data/lib/framework/rho/rho.rb

@@ -190,8 +190,9 @@ if defined?( RHODES_EMULATOR )
     end
 else
     def load_models_from_file(app_manifest_filename=nil)
+if defined? RHO_WP7    
 		return unless Rho::file_exist?(app_manifest_filename)
-
+end
         f = File.open(app_manifest_filename)
         _load_models_from_file(f)    
         f.close

data/platform/android/Rhodes/AndroidManifest.xml

@@ -17,7 +17,8 @@
         <activity
             android:name="com.rhomobile.rhodes.RhodesActivity"
             android:label="@string/app_name"
-            android:configChanges="orientation|keyboardHidden">
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

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

@@ -189,6 +189,16 @@ RHO_GLOBAL void rho_sys_run_app(const char *appname, VALUE params)
     env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(appname).get(), jParams);
 }
 
+RHO_GLOBAL void rho_sys_bring_to_front()
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "bringToFront", "()V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid);
+}
+
 RHO_GLOBAL void rho_sys_open_url(const char *url)
 {
     JNIEnv *env = jnienv();

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

@@ -42,7 +42,7 @@ public class RhodesActivity extends BaseActivity {
 	static final String RHO_START_PARAMS_KEY = "RhoStartParams";
 	static final String RHO_URL_START_KEY = "RhoUrlStart";
 	
-	private static RhodesActivity sInstance;
+	private static RhodesActivity sInstance = null;
 	
 	private Handler mHandler;
 	
@@ -92,8 +92,11 @@ public class RhodesActivity extends BaseActivity {
 		mHandler.post(mSetup);
 		
 		sInstance = this;
+
+		Log.i(TAG, ">>>>>>>>>>>>>>> onCreate()");
 		
 		notifyUiCreated();
+        RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityCreated);
 	}
 	
 	private void notifyUiCreated() {
@@ -136,15 +139,27 @@ public class RhodesActivity extends BaseActivity {
 		, false);
 	}
 
+	@Override
+	protected void onNewIntent(Intent intent) {
+	    super.onNewIntent(intent);
+        Log.i(TAG, ">>>>>>>>>>>>>>> onNewIntent()");
+	}
+	
 	@Override
 	public void onStart() {
 		super.onStart();
 	    RhodesService.rhodesActivityStarted(true);
-	}
+
+        Log.i(TAG, ">>>>>>>>>>>>>>> onStart()");
+        
+        RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityStarted);
+}
 
     @Override
     public void onPause() 
     {
+        RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityPaused);
+
         RhodesService.rhodesActivityStarted(false);
 
         super.onPause();

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

@@ -1,12 +1,14 @@
 package com.rhomobile.rhodes;
 
+import java.util.Vector;
+
 import android.app.Application;
 import android.os.Handler;
 import android.os.Process;
 
 public class RhodesApplication extends Application{
 	
-//    private static final String TAG = NativeApplication.class.getSimpleName();
+    private static final String TAG = RhodesApplication.class.getSimpleName();
     private static Handler mHandler;
 	static {
 		NativeLibraries.load();
@@ -25,6 +27,7 @@ public class RhodesApplication extends Application{
     public static void start()
 	{
 	    startRhodesApp();
+        stateChanged(AppState.AppStarted);
 	}
 
 	public static boolean canStart(String strCmdLine)
@@ -48,5 +51,127 @@ public class RhodesApplication extends Application{
         }, 500);
     }
 
+    public interface StateHandler
+    {
+        boolean run();
+    }
+    
+    enum AppState
+    {
+        Undefined("Undefined") {
+            @Override
+            public boolean canHandle(AppState state) { return false; }
+        },
+        AppStarted("AppStarted") {
+            @Override
+            public boolean canHandle(AppState state) { return state == this; }
+        },
+        AppActivated("AppActivated") {
+            @Override
+            public boolean canHandle(AppState state) { return (state == this) || (state == AppStarted); }
+        },
+        AppDeactivated("AppDEactivated") {
+            @Override
+            public boolean canHandle(AppState state) { return (state == this) || (state == AppStarted); }
+        };
+        
+        private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
+        private String TAG;
+        
+        private AppState(String tag) { TAG = tag; }
+        
+        private synchronized void handle()
+        {
+            Logger.T(TAG, "Running AppState handlers: " + TAG);
+            Vector<StateHandler> doneHandlers = new Vector<StateHandler>();
+            for (StateHandler handler: mHandlers) {
+                if (handler.run()) {
+                    doneHandlers.add(handler);
+                }
+            }
+            mHandlers.removeAll(doneHandlers);
+        }
+        
+        public synchronized void addHandler(StateHandler handler) { mHandlers.add(handler); }
+        public abstract boolean canHandle(AppState state);
+        
+        static public void handleState(AppState state) { state.handle(); }
+    }
+    
+    enum UiState
+    {
+        Undefined("Undefined") {
+            @Override
+            public boolean canHandle(UiState state) { return false; }
+        },
+        MainActivityCreated("MainActivityCreated") {
+            @Override
+            public boolean canHandle(UiState state) { return state == this; }
+        },
+        MainActivityStarted("MainActivityStarted") {
+            @Override
+            public boolean canHandle(UiState state) { return (state == this) || (state == MainActivityCreated); }
+        },
+        MainActivityPaused("MainActivityPaused") {
+            @Override
+            public boolean canHandle(UiState state) { return (state == this) || (state == MainActivityCreated); }
+        };
+
+        private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
+        public String TAG;
+        
+        private UiState(String tag) { TAG = tag; }
+        
+        private synchronized void handle()
+        {
+            Logger.T(TAG, "Running AppState handlers: " + TAG);
+            Vector<StateHandler> doneHandlers = new Vector<StateHandler>();
+            for (StateHandler handler: mHandlers) {
+                if (handler.run()) {
+                    doneHandlers.add(handler);
+                }
+            }
+            mHandlers.removeAll(doneHandlers);
+        }
+        
+        public synchronized void addHandler(StateHandler handler) { mHandlers.add(handler); }
+        public abstract boolean canHandle(UiState state);
+        
+        static public void handleState(UiState state) { state.handle(); }
+    }
+
+    private static AppState sAppState = AppState.Undefined;
+    private static UiState sUiState = UiState.Undefined;
+    
+    public static void runWhen(AppState state, StateHandler handler) {
+        if (sAppState.canHandle(state)) {
+            Logger.T(TAG, "Running AppState handler immediately: " + state.TAG);
+            if (handler.run())
+                return;
+        }
+        state.addHandler(handler);
+        Logger.T(TAG, "AppState handler added: " + state.TAG);
+    }
+
+    public static void runWhen(UiState state, StateHandler handler) {
+        if (sUiState.canHandle(state)) {
+            Logger.T(TAG, "Running UiState handler immediately: " + state.TAG);
+            if (handler.run())
+                return;
+        }
+        state.addHandler(handler);
+        Logger.T(TAG, "UiState handler added: " + state.TAG);
+    }
+
+    public static void stateChanged(AppState state)
+    {
+        sAppState = state;
+        AppState.handleState(state); 
+    }
+    public static void stateChanged(UiState state)
+    {
+        sUiState = state;
+        UiState.handleState(state);
+    }
 
 }

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

@@ -40,6 +40,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -55,6 +56,7 @@ import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.telephony.TelephonyManager;
@@ -85,7 +87,7 @@ public class RhodesService extends Service {
 	private static final String ACTION_ASK_CANCEL_DOWNLOAD = "com.rhomobile.rhodes.DownloadManager.ACTION_ASK_CANCEL_DOWNLOAD";
 	private static final String ACTION_CANCEL_DOWNLOAD = "com.rhomobile.rhodes.DownloadManager.ACTION_CANCEL_DOWNLOAD";
 	
-	private static RhodesService sInstance;
+	private static RhodesService sInstance = null;
 	
 	private final IBinder mBinder = new LocalBinder();
 	
@@ -102,8 +104,6 @@ public class RhodesService extends Service {
 	
 	private NotificationManager mNM;
 	
-	//private MainView mMainView;
-	
 	private static int mScreenWidth;
 	private static int mScreenHeight;
 	private static int mScreenOrientation;
@@ -117,7 +117,9 @@ public class RhodesService extends Service {
 	private static boolean sRhodesActivityStarted = false;
 	
 	synchronized
-	static void rhodesActivityStarted(boolean started) { sRhodesActivityStarted = started; }
+	static void rhodesActivityStarted(boolean started) {
+	    sRhodesActivityStarted = started;
+	}
 	
 	synchronized
 	public static boolean isRhodesActivityStarted() { return sRhodesActivityStarted; }
@@ -210,6 +212,8 @@ public class RhodesService extends Service {
 		return false;
 	}
 	
+	Handler mHandler = null;
+	
 	private native void initClassLoader(ClassLoader c);
 	
 	public native void doSyncAllSources(boolean v);
@@ -404,7 +408,7 @@ public class RhodesService extends Service {
 		}
 		
 		RhodesApplication.start();
-		
+
 		if (sActivitiesActive > 0)
 			handleAppActivation();
 	}
@@ -493,9 +497,18 @@ public class RhodesService extends Service {
 				setPushRegistrationId(id);
 				break;
 			case PushReceiver.INTENT_TYPE_MESSAGE:
-				Bundle extras = intent.getBundleExtra(PushReceiver.INTENT_EXTRAS);
+				final Bundle extras = intent.getBundleExtra(PushReceiver.INTENT_EXTRAS);
 				Logger.D(TAG, "Received PUSH message: " + extras);
-				handlePushMessage(extras);
+				RhodesApplication.runWhen(
+				        RhodesApplication.AppState.AppStarted,
+				        new RhodesApplication.StateHandler() {
+                            @Override
+                            public boolean run()
+                            {
+                                handlePushMessage(extras);
+                                return true;
+                            }
+                        });
 				break;
 			default:
 				Logger.W(TAG, "Unknown command type received from " + source + ": " + type);
@@ -1166,18 +1179,36 @@ public class RhodesService extends Service {
 		
 		String data = builder.toString();
 		Logger.D(TAG, "Received PUSH message: " + data);
-		if (callPushCallback(data))
-			return;
+		if (callPushCallback(data)) {
+		    Logger.T(TAG, "Push message completely handled in callback");
+		    return;
+		}
 		
-		String alert = extras.getString("alert");
+		final String alert = extras.getString("alert");
 		if (alert != null) {
 			Logger.D(TAG, "PUSH: Alert: " + alert);
-			Alert.showPopup(alert);
+			RhodesApplication.runWhen(
+			        RhodesApplication.UiState.MainActivityStarted,
+			        new RhodesApplication.StateHandler() {
+                        @Override
+                        public boolean run() {
+                            Alert.showPopup(alert);
+                            return true;
+                        }
+			        });
 		}
-		String sound = extras.getString("sound");
+		final String sound = extras.getString("sound");
 		if (sound != null) {
 			Logger.D(TAG, "PUSH: Sound file name: " + sound);
-			Alert.playFile("/public/alerts/" + sound, null);
+            RhodesApplication.runWhen(
+                    RhodesApplication.UiState.MainActivityStarted,
+                    new RhodesApplication.StateHandler() {
+                        @Override
+                        public boolean run() {
+                            Alert.playFile("/public/alerts/" + sound, null);
+                            return true;
+                        }
+                    });
 		}
 		String vibrate = extras.getString("vibrate");
 		if (vibrate != null) {
@@ -1189,8 +1220,17 @@ public class RhodesService extends Service {
 			catch (NumberFormatException e) {
 				duration = 5;
 			}
+			final int arg_duration = duration;
 			Logger.D(TAG, "Vibrate " + duration + " seconds");
-			Alert.vibrate(duration);
+            RhodesApplication.runWhen(
+                    RhodesApplication.UiState.MainActivityStarted,
+                    new RhodesApplication.StateHandler() {
+                        @Override
+                        public boolean run() {
+                            Alert.vibrate(arg_duration);
+                            return true;
+                        }
+                    });
 		}
 		
 		String syncSources = extras.getString("do_sync");
@@ -1199,15 +1239,34 @@ public class RhodesService extends Service {
 			boolean syncAll = false;
 			for (String source : syncSources.split(",")) {
 				Logger.D(TAG, "url = " + source);
-				if (source.equalsIgnoreCase("all"))
+				if (source.equalsIgnoreCase("all")) {
 					syncAll = true;
-				else {
-					doSyncSource(source.trim());
+				    break;
+				} else {
+				    final String arg_source = source.trim();
+		            RhodesApplication.runWhen(
+		                    RhodesApplication.AppState.AppActivated,
+		                    new RhodesApplication.StateHandler() {
+		                        @Override
+		                        public boolean run() {
+		                            doSyncSource(arg_source);
+		                            return true;
+		                        }
+		                    });
 				}
 			}
 			
-			if (syncAll)
-				doSyncAllSources(true);
+			if (syncAll) {
+                RhodesApplication.runWhen(
+                        RhodesApplication.AppState.AppActivated,
+                        new RhodesApplication.StateHandler() {
+                            @Override
+                            public boolean run() {
+                                doSyncAllSources(true); 
+                                return true;
+                            }
+                        });
+			}
 		}
 	}
 	
@@ -1262,11 +1321,13 @@ public class RhodesService extends Service {
 		restartGeoLocationIfNeeded();
 		restoreWakeLockIfNeeded();
 		callActivationCallback(true);
+        RhodesApplication.stateChanged(RhodesApplication.AppState.AppActivated);
 	}
 	
 	private void handleAppDeactivation() {
 		if (DEBUG)
 			Log.d(TAG, "handle app deactivation");
+        RhodesApplication.stateChanged(RhodesApplication.AppState.AppDeactivated);
 		stopWakeLock();
 		stopGeoLocation();
 		callActivationCallback(false);
@@ -1304,10 +1365,23 @@ public class RhodesService extends Service {
 	
 	@Override
 	public void startActivity(Intent intent) {
-		RhodesActivity ra = RhodesActivity.getInstance();
-		if (ra == null)
-			throw new IllegalStateException("Trying to start activity, but main activity is empty (we are in background, no UI active)");
-		ra.startActivity(intent);
+
+        RhodesActivity ra = RhodesActivity.getInstance();
+        if(intent.getComponent().compareTo(new ComponentName(this, RhodesActivity.class.getName())) == 0) {
+            Logger.T(TAG, "Start or bring main activity: " + RhodesActivity.class.getName() + ".");
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            if (ra == null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                super.startActivity(intent);
+                return;
+            }
+        }
+
+        if (ra != null) {
+            ra.startActivity(intent);
+        } else {
+            throw new IllegalStateException("Trying to start activity, but there is no main activity instance (we are in background, no UI active)");
+        }
 	}
 	
 	public static Context getContext() {
@@ -1320,5 +1394,26 @@ public class RhodesService extends Service {
 	public static boolean isJQTouch_mode() {
 		return RhoConf.getBool("jqtouch_mode");
 	}
-	
+
+    public static void bringToFront() {
+        if (isRhodesActivityStarted()) {
+            Logger.T(TAG, "Main activity is already at front, do nothing");
+            return;
+        }
+
+        RhodesService srv = RhodesService.getInstance();
+        if (srv == null)
+            throw new IllegalStateException("No rhodes service instance at this moment");
+
+        Logger.T(TAG, "Bring main activity to front");
+        if (RhodesActivity.getInstance() != null)
+            Logger.T(TAG, "There is main activity, should bring to front");
+        else
+            Logger.T(TAG, "There is no main activity, should start new one");
+        
+        Intent intent = new Intent(srv, RhodesActivity.class);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        srv.startActivity(intent);
+    }
+
 }

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

@@ -474,6 +474,11 @@ void rho_sys_run_app(const char* appname, VALUE params)
 		RAWLOG_INFO("rho_sys_run_app failed.");	
 }
 
+void rho_sys_bring_to_front()
+{
+    RAWLOG_INFO("rho_sys_bring_to_front has no implementation on iPhone.");	
+}
+
 
 extern VALUE rho_sys_has_network();
 

data/platform/shared/ruby/ext/system/system.i

@@ -36,6 +36,9 @@ extern int rho_sys_set_sleeping(int sleeping);
 #define run_app rho_sys_run_app
 extern void rho_sys_run_app(const char* appname, VALUE params);
 
+#define bring_to_front rho_sys_bring_to_front
+extern void rho_sys_bring_to_front();
+
 #define get_start_params rho_sys_get_start_params
 extern const char* rho_sys_get_start_params();
 
@@ -101,6 +104,7 @@ extern void exit();
 extern void unzip_file( const char *path );
 extern int set_sleeping( bool sleeping );
 extern void run_app(const char *appname, VALUE params);
+extern void bring_to_front();
 extern const char* get_start_params();
 extern void open_url(const char *url);
 %predicate app_installed(const char *appname);

data/platform/shared/ruby/ext/system/system_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.0
+ * Version 2.0.1
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -281,7 +281,7 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -998,7 +998,7 @@ static VALUE _mSWIG = Qnil;
 
 /* Define custom exceptions for errors that do not map to existing Ruby
    exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a funtion in C.  For C, fallback to rb_eRuntimeError.*/
+   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
@@ -1807,7 +1807,7 @@ static VALUE mSystem;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020000 
+#define SWIGVERSION 0x020001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1850,6 +1850,9 @@ extern int rho_sys_set_sleeping(int sleeping);
 #define run_app rho_sys_run_app
 extern void rho_sys_run_app(const char* appname, VALUE params);
 
+#define bring_to_front rho_sys_bring_to_front
+extern void rho_sys_bring_to_front();
+
 #define get_start_params rho_sys_get_start_params
 extern const char* rho_sys_get_start_params();
 
@@ -1950,7 +1953,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:D:\Install\swigwin\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2356,6 +2359,18 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_bring_to_front(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  bring_to_front();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_get_start_params(int argc, VALUE *argv, VALUE self) {
   char *result = 0 ;
@@ -2827,6 +2842,7 @@ SWIGEXPORT void Init_System(void) {
   rb_define_module_function(mSystem, "unzip_file", _wrap_unzip_file, -1);
   rb_define_module_function(mSystem, "set_sleeping", _wrap_set_sleeping, -1);
   rb_define_module_function(mSystem, "run_app", _wrap_run_app, -1);
+  rb_define_module_function(mSystem, "bring_to_front", _wrap_bring_to_front, -1);
   rb_define_module_function(mSystem, "get_start_params", _wrap_get_start_params, -1);
   rb_define_module_function(mSystem, "open_url", _wrap_open_url, -1);
   rb_define_module_function(mSystem, "app_installed?", _wrap_app_installedq___, -1);

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

@@ -635,6 +635,11 @@ void rho_sys_run_app(const char *appname, VALUE params)
 
 }
 
+void rho_sys_bring_to_front()
+{
+    LOG(INFO) + "rho_sys_bring_to_front() has no implementation on Win Mobile.";
+}
+
 int rho_sys_is_app_installed(const char *appname)
 {
     int nRet = 0;

data/rhodes.gemspec

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196425
+  hash: 62196431
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
   - beta
-  - 5
-  version: 3.0.0.beta.5
+  - 6
+  version: 3.0.0.beta.6
 platform: ruby
 authors: 
 - Rhomobile