rhodes 3.2.3 → 3.3.0.beta.1

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

@@ -225,6 +225,7 @@ bool RhoMapConvertor::initConvertor(JNIEnv *env)
 
     return initialized = true;
 }
+//----------------------------------------------------------------------------------------------------------------------
 
 std::auto_ptr<rho::Hashtable<std::string, std::string> >
 rho_cast_helper<std::auto_ptr<rho::Hashtable<std::string, std::string> >, jobject>::operator()(JNIEnv *env, jobject jObj)
@@ -249,6 +250,7 @@ rho_cast_helper<std::auto_ptr<rho::Hashtable<std::string, std::string> >, jobjec
         }
         return result;
 }
+//----------------------------------------------------------------------------------------------------------------------
 
 std::auto_ptr<rho::Hashtable<std::string,std::string> >
 rho_cast_helper<std::auto_ptr<rho::Hashtable<std::string,std::string> >, jobjectArray>::operator()(JNIEnv *env,
@@ -270,5 +272,24 @@ rho_cast_helper<std::auto_ptr<rho::Hashtable<std::string,std::string> >, jobject
     }
     return result;
 }
+//----------------------------------------------------------------------------------------------------------------------
+
+std::auto_ptr<rho::Vector<std::string> >
+rho_cast_helper<std::auto_ptr<rho::Vector<std::string> >, jobjectArray>::operator ()(JNIEnv *env, jobjectArray jArr)
+{
+    value_type result(new element_type);
+
+    unsigned n = env->GetArrayLength(jArr);
+    result->reserve(n);
+
+    for(unsigned i = 0; i < n; ++i)
+    {
+        jhstring jval = static_cast<jstring>(env->GetObjectArrayElement(jArr, i));
+        std::string val = rho_cast<std::string>(env, jval);
+        result->push_back(val);
+    }
+    return result;
+}
+//----------------------------------------------------------------------------------------------------------------------
 
 } // namespace details

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

@@ -42,7 +42,7 @@
 #include "rhodes/RhoClassFactory.h"
 
 #undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "RhodesApp"
+#define DEFAULT_LOGCATEGORY "RhodesAppJNI"
 
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_makeLink
@@ -60,28 +60,21 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_makeLink
         env->ThrowNew(getJNIClass(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION), "Can not create symlink");
 }
 
-static bool set_capabilities(JNIEnv *env)
-{
-    char const *caps[] = {
-#define RHO_DEFINE_CAP(x) #x,
-#include <rhocaps.inc>
-#undef RHO_DEFINE_CAP
-    };
-    std::map<std::string, bool> actual_caps;
-#define RHO_DEFINE_CAP(x) actual_caps[#x] = RHO_CAP_ ## x ## _ENABLED;
-#include <rhocaps.inc>
-#undef RHO_DEFINE_CAP
-
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_CAPABILITIES);
-    if (!cls) return false;
-    for (size_t i = 0, lim = sizeof(caps)/sizeof(caps[0]); i < lim; ++i)
-    {
-        std::string field_name = std::string(caps[i]) + "_ENABLED";
-        jfieldID fid = getJNIClassStaticField(env, cls, field_name.c_str(), "Z");
-        if (!fid) return false;
-        env->SetStaticBooleanField(cls, fid, actual_caps[caps[i]]);
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getInvalidSecurityTokenMessage(JNIEnv* env, jclass) {
+    
+    const char* message = "Invalid security token !";
+    
+    //rho_conf_Init(rho_native_rhopath());
+    
+    if (rho_conf_is_property_exists("invalid_security_token_message")) {
+        const char* conf_message = rho_conf_getString("invalid_security_token_message");
+        message = conf_message;
     }
-    return true;
+    
+    jstring objStr = env->NewStringUTF(message);
+    return objStr;
+    
+    
 }
 
 static jobject g_classLoader = NULL;
@@ -108,8 +101,6 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodes
 {
     android_setup(env);
 
-    if (!set_capabilities(env)) return;
-
     // Start Rhodes application
     rho_rhodesapp_create(rho_native_rhopath());
 }
@@ -324,3 +315,4 @@ RHO_GLOBAL void rho_conf_show_log()
 
     env->CallStaticVoidMethod(cls, mid);
 }
+

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

@@ -29,6 +29,7 @@
 #include "rhodes/jni/com_rhomobile_rhodes_signature_Signature.h"
 
 #include <common/RhodesApp.h>
+#include "ruby/ext/rho/rhoruby.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Signature"
@@ -41,7 +42,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_signature_Signature_callback
 }
 
 
-RHO_GLOBAL void rho_signature_take_signature(char* callback_url, char* image_format)
+RHO_GLOBAL void rho_signature_take(char* callback_url, rho_param* p)
 {
 ///*
     JNIEnv *env = jnienv();
@@ -50,8 +51,33 @@ RHO_GLOBAL void rho_signature_take_signature(char* callback_url, char* image_for
     jmethodID mid = getJNIClassStaticMethod(env, cls, "takeSignature", "(Ljava/lang/String;Ljava/lang/String;)V");
     if (!mid) return;
     jhstring objCallback = rho_cast<jhstring>(callback_url);
+
+    char* image_format = 0;
+    if (p)
+    {
+        rho_param* pFF = rho_param_hash_get(p, "imageFormat");
+        if ( pFF )
+            image_format = pFF->v.string;
+    }
+    if (!image_format)
+        image_format = "";
+
     jhstring objFormat = rho_cast<jhstring>(image_format);
     env->CallStaticVoidMethod(cls, mid, objCallback.get(), objFormat.get());
 //*/
 }
 
+RHO_GLOBAL void rho_signature_visible(bool b, rho_param* p)
+{
+    //TODO: rho_signature_visible
+}
+
+RHO_GLOBAL void rho_signature_capture(const char* callback_url) 
+{
+    //TODO: rho_signature_capture
+}
+
+RHO_GLOBAL void rho_signature_clear() 
+{
+    //TODO: rho_signature_clear
+}

data/platform/android/Rhodes/{default.properties → project.properties}

@@ -4,8 +4,8 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:13
+target=Google Inc.:Google APIs:15

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

@@ -1,16 +1,18 @@
 package com.rhomobile.rhodes;
 
 public class Capabilities {
-	  public static boolean AUDIO_ENABLED = true;
-	  public static boolean BLUETOOTH_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 SDCARD_ENABLED = true;
-	  public static boolean VIBRATE_ENABLED = true;
+	  public static final boolean AUDIO_ENABLED = true;
+	  public static final boolean BLUETOOTH_ENABLED = true;
+	  public static final boolean CALENDAR_ENABLED = true;
+	  public static final boolean CAMERA_ENABLED = true;
+	  public static final boolean GPS_ENABLED = true;
+	  public static final boolean NETWORK_STATE_ENABLED = true;
+	  public static final boolean PHONE_ENABLED = true;
+	  public static final boolean PIM_ENABLED = true;
+	  public static final boolean PUSH_ENABLED = true;
+	  public static final boolean RECORD_AUDIO_ENABLED = true;
+	  public static final boolean SDCARD_ENABLED = true;
+	  public static final boolean VIBRATE_ENABLED = true;
+	  public static final boolean WEBKIT_BROWSER_ENABLED = false;
+	  
 }

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

@@ -30,6 +30,7 @@ import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.mainview.TabbedMainView;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
+import com.rhomobile.rhodes.webview.WebView;
 
 public class NativeBar {
 	
@@ -53,9 +54,7 @@ public class NativeBar {
 
 		public void run() {
 			try {
-				RhodesService r = RhodesService.getInstance();
-				
-				MainView mainView = r.getMainView();
+				MainView mainView = RhodesActivity.safeGetInstance().getMainView();
 				MainView v = null;
 				
 				SimpleMainView smv = null;
@@ -65,15 +64,18 @@ public class NativeBar {
 				
 				switch (type) {
 				case NOBAR_TYPE:
-					if (smv == null)
-						v = new SimpleMainView(mainView);
-					else
+                    if (smv == null) {
+                        WebView webView = mainView.detachWebView();
+                        v = new SimpleMainView(webView);
+                    } else
 						smv.removeToolbar();
 					started = false;
 					break;
 				case TOOLBAR_TYPE:
-					if (smv == null)
-						v = new SimpleMainView(mainView, params);
+                    if (smv == null) {
+                        WebView webView = mainView.detachWebView();
+                        v = new SimpleMainView(webView, params);
+                    }
 					else
 						smv.setToolbar(params);
 					started = true;
@@ -87,7 +89,7 @@ public class NativeBar {
 				}
 				
 				if (v != null) {
-					r.setMainView(v);
+				    RhodesActivity.safeGetInstance().setMainView(v);
 					if (v instanceof TabbedMainView) {
 						// loading of default opened tab should be after TabView insert to real Views tree
 						TabbedMainView tmv = (TabbedMainView)v;
@@ -121,7 +123,7 @@ public class NativeBar {
 
 	public static void create(int type, Object params) {
 		try {
-			PerformOnUiThread.exec(new CreateTask(type, params), false);
+			PerformOnUiThread.exec(new CreateTask(type, params));
 		}
 		catch (Exception e) {
 			reportFail("create", e);
@@ -130,7 +132,7 @@ public class NativeBar {
 	
 	public static void remove() {
 		try {
-			PerformOnUiThread.exec(new CreateTask(NOBAR_TYPE, null), false);
+			PerformOnUiThread.exec(new CreateTask(NOBAR_TYPE, null));
 		}
 		catch (Exception e) {
 			reportFail("remove", e);
@@ -139,7 +141,7 @@ public class NativeBar {
 	
 	public static void switchTab(int index) {
 		try {
-			PerformOnUiThread.exec(new SwitchTabTask(index), false);
+			PerformOnUiThread.exec(new SwitchTabTask(index));
 		}
 		catch (Exception e) {
 			reportFail("switchTab", e);

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

@@ -34,18 +34,15 @@ import java.util.Set;
 import com.rhomobile.rhodes.bluetooth.RhoBluetoothManager;
 import com.rhomobile.rhodes.camera.Camera;
 import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.mainview.SplashScreen;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
-import com.rhomobile.rhodes.webview.ChromeClientOld;
-import com.rhomobile.rhodes.webview.RhoWebSettings;
-import com.rhomobile.rhodes.webview.RhoWebViewClient;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -55,9 +52,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.WindowManager;
-import android.webkit.WebChromeClient;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 
 public class RhodesActivity extends BaseActivity {
 	
@@ -65,8 +60,6 @@ public class RhodesActivity extends BaseActivity {
 	
 	private static final boolean DEBUG = false;
 	
-	private static final boolean USE_DELAYED_MAINVIEW_DISPLAY = false;
-	
 	public static boolean ENABLE_LOADING_INDICATION = true;
 	
 	public static int MAX_PROGRESS = 10000;
@@ -80,12 +73,7 @@ public class RhodesActivity extends BaseActivity {
 	private MainView mMainView;
 	
 	private RhoMenu mAppMenu;
-	
-	private WebChromeClient mChromeClient;
-	private WebViewClient mWebViewClient;
-	private RhoWebSettings mWebSettings;
 
-	
 	private long uiThreadId = 0;
 	
 	public long getUiThreadId() {
@@ -170,8 +158,6 @@ public class RhodesActivity extends BaseActivity {
 
 		mHandler = new Handler();
 
-		initWebStuff();
-
         mSplashScreen = new SplashScreen(this);
         setMainView(mSplashScreen);
 
@@ -187,12 +173,18 @@ public class RhodesActivity extends BaseActivity {
 		
 		notifyUiCreated();
         RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityCreated);
-	}
+    }
+
+    public MainView switchToSimpleMainView(MainView currentView) {
+        MainView view = new SimpleMainView(currentView.detachWebView()); 
+        setMainView(view);
+        return view;
+    }
 	
 	private void notifyUiCreated() {
 		RhodesService r = RhodesService.getInstance();
 		if ( r != null ) {
-			r.callUiCreatedCallback();
+			RhodesService.callUiCreatedCallback();
 		}
 		else {
 			mHandler.post(new Runnable() {
@@ -205,7 +197,7 @@ public class RhodesActivity extends BaseActivity {
 						return;
 					}
 				
-					r.callUiCreatedCallback();
+					RhodesService.callUiCreatedCallback();
 				}
 			});
 		}
@@ -360,105 +352,17 @@ public class RhodesActivity extends BaseActivity {
 	public SplashScreen getSplashScreen() {
 		return mSplashScreen;
 	}
-	
-	public void setMainView(MainView v) {
-		setMainView(v, true);
-	}
-	
-	public void setMainView(final MainView v, boolean waitUntilNavigationDone) {
-		if (DEBUG)
-			Log.d(TAG, "setMainView: v=" + v + "; mMainView=" + mMainView);
-		
-		// If there's no previous mMainView, don't wait
-		if (mMainView == null)
-			waitUntilNavigationDone = false;
-		
-		// Set mMainView right now but not yet do it visible
-		mMainView = v;
 
-		// This is action need to be executed when mMainView should become visible 
-		final Runnable setMainViewVisible = new Runnable() {
-			public void run() {
-				if (DEBUG)
-					Log.d(TAG, "setMainViewAction: v=" + v);
-				setContentView(v.getView());
-			}
-		};
-		
-		if (!USE_DELAYED_MAINVIEW_DISPLAY /* || !waitUntilNavigationDone*/) {
-			// Make new MainView visible right now
-			setMainViewVisible.run();
-		}
-		else {
-			// If we're requested to wait until first navigation will be done,
-			// use the trick: keep current main view until first navigate will be
-			// finished in the new MainView.
-			// This will end up in good user experience - user will see
-			// new MainView only when it will have completely load its content
-			// (no blank screens for user).
-			WebView webView = v.getWebView(0);
-			webView.setWebViewClient(new WebViewClient() {
-				@Override
-				public void onPageFinished(WebView view, String url) {
-					mWebViewClient.onPageFinished(view, url);
-					// Restore standard WebViewClient to be sure this callback will not
-					// be called anymore (it should be called only once)
-					view.setWebViewClient(mWebViewClient);
-					
-					setMainViewVisible.run();
-				}
-			});
-		}
-	}
-	
+    public void setMainView(MainView v) {
+        if (v != null) {
+            mMainView = v;
+            setContentView(v.getView());
+        }
+    }
+
 	public MainView getMainView() {
 		return mMainView;
-	}
-	
-	public WebView createWebView() {
-		WebView view = new WebView(this);
-		mWebSettings.setWebSettings(view);
-		view.setWebChromeClient(mChromeClient);
-		view.setWebViewClient(mWebViewClient);
-		view.clearCache(true);
-		
-		return view;
-	}
-	
-	private void initWebStuff() {
-		String ccName;
-		String wsName;
-		int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
-		if (sdkVersion < Build.VERSION_CODES.ECLAIR_MR1) {
-			ccName = "ChromeClientOld";
-			wsName = "RhoWebSettingsOld";
-		}
-		else {
-			ccName = "ChromeClientNew";
-			wsName = "RhoWebSettingsNew";
-		}
-		
-		try {
-			String pkgname = ChromeClientOld.class.getPackage().getName();
-			String fullName = pkgname + "." + ccName;
-			Class<? extends WebChromeClient> ccClass =
-				Class.forName(fullName).asSubclass(WebChromeClient.class);
-			
-			Constructor<? extends WebChromeClient> ctor = ccClass.getConstructor(RhodesActivity.class);
-			mChromeClient = ctor.newInstance(this);
-			
-			pkgname = RhoWebSettings.class.getPackage().getName();
-			fullName = pkgname + "." + wsName;
-			Class<? extends RhoWebSettings> wsClass =
-				Class.forName(fullName).asSubclass(RhoWebSettings.class);
-			mWebSettings = wsClass.newInstance();
-			
-			mWebViewClient = new RhoWebViewClient();
-		}
-		catch (Exception e) {
-			throw new IllegalStateException(e);
-		}
-	}
+	}	
 
 	@Override
 	public void onServiceConnected(ComponentName name, IBinder service) {
@@ -518,7 +422,26 @@ public class RhodesActivity extends BaseActivity {
         if(!RhodesApplication.canStart(paramString))
         {
             Logger.E(TAG, "This is hidden app and can be started only with security key.");
-            //RhodesService.exit();
+            
+            //Toast.makeText(this,"Invalid security token !",Toast.LENGTH_SHORT).show();
+            /*
+            AlertDialog.Builder b = new AlertDialog.Builder(this);
+            b.setCancelable(true);
+            b.setOnCancelListener( new DialogInterface.OnCancelListener() {
+				public void onCancel(DialogInterface dialog) {
+					RhodesService.exit();
+				}
+			});
+            AlertDialog securityAlert = b.create();
+            securityAlert.setMessage(RhodesService.getInvalidSecurityTokenMessage());
+            securityAlert.setButton("OK", new DialogInterface.OnClickListener(){
+				public void onClick(DialogInterface arg0, int arg1) {
+					RhodesService.exit();
+				}
+            	
+            });
+            securityAlert.show();
+            */
             return;
         }