rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -38,7 +38,7 @@ RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuSize
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemLabel
   (JNIEnv *env, jobject, jlong menu, jint idx)
 {
-    return rho_cast<jstring>(env, menu_items(menu)[idx].m_strLabel.c_str());
+    return rho_cast<jhstring>(env, menu_items(menu)[idx].m_strLabel.c_str()).release();
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemType
@@ -59,12 +59,12 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemType
         case r::CAppMenuItem::emtExit: s = "exit"; break;
         case r::CAppMenuItem::emtClose: s = "close"; break;
     }
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemUrl
   (JNIEnv *env, jobject, jlong menu, jint idx)
 {
-    return rho_cast<jstring>(env, menu_items(menu)[idx].m_strLink.c_str());
+    return rho_cast<jhstring>(env, menu_items(menu)[idx].m_strLink.c_str()).release();
 }
 

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

@@ -5,7 +5,7 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "NativeBar"
 
-RHO_GLOBAL void create_nativebar(int bar_type, rho_param *p)
+RHO_GLOBAL void create_nativebar_inner(int bar_type, rho_param *p)
 {
     JNIEnv *env = jnienv();
     jclass clsNativeBar = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
@@ -27,7 +27,7 @@ RHO_GLOBAL void create_nativebar(int bar_type, rho_param *p)
     env->DeleteLocalRef(paramsObj);
 }
 
-RHO_GLOBAL void remove_nativebar()
+RHO_GLOBAL void remove_nativebar_inner()
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
@@ -38,7 +38,7 @@ RHO_GLOBAL void remove_nativebar()
     env->CallStaticVoidMethod(cls, mid);
 }
 
-RHO_GLOBAL void nativebar_switch_tab(int index)
+RHO_GLOBAL void nativebar_switch_tab_inner(int index)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
@@ -61,5 +61,56 @@ RHO_GLOBAL VALUE nativebar_started()
     return rho_ruby_create_boolean(env->CallStaticBooleanMethod(cls, mid));
 }
 
+
+
+
+
+RHO_GLOBAL void create_nativebar(int bar_type, rho_param *p)
+{
+	RAWLOG_INFO("NativeBar.create() is DEPRECATED API ! Please use Rho::NativeToolbar.create() or Rho::NativeTabbar.create().");
+	create_nativebar_inner(bar_type, p);
+}
+
+RHO_GLOBAL void remove_nativebar()
+{
+	RAWLOG_INFO("NativeBar.remove() is DEPRECATED API ! Please use Rho::NativeToolbar.remove() or Rho::NativeTabbar.remove().");
+	remove_nativebar_inner();
+}
+
+RHO_GLOBAL void nativebar_switch_tab(int index)
+{
+	RAWLOG_INFO("NativeBar.switch_tab() is DEPRECATED API ! Please use Rho::NativeTabbar.switch_tab().");
+	nativebar_switch_tab_inner(index);
+}
+
+
+
+
 RHO_GLOBAL void nativebar_set_tab_badge(int index,char *val) {
-}
+	RAWLOG_INFO("NativeBar.set_tab_badge() is DEPRECATED API ! Please use Rho::NativeTabbar.set_tab_badge().");
+}
+
+RHO_GLOBAL void create_native_toolbar(int bar_type, rho_param *p) {
+	create_nativebar_inner( bar_type, p);
+}
+
+RHO_GLOBAL void remove_native_toolbar() {
+	remove_nativebar_inner();
+}
+
+RHO_GLOBAL void create_native_tabbar(int bar_type, rho_param *p) {
+	create_nativebar_inner( bar_type, p);
+}
+
+RHO_GLOBAL void remove_native_tabbar() {
+	remove_nativebar_inner();
+}
+
+RHO_GLOBAL void native_tabbar_switch_tab(int index) {
+	nativebar_switch_tab_inner(index);
+}
+
+RHO_GLOBAL void native_tabbar_set_tab_badge(int index,char *val) {
+	RAWLOG_INFO("Rho::NativeTabbar.set_tab_badge() unsupported on Android !");
+}
+

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

@@ -115,6 +115,15 @@ void* RhoNativeViewManager::getWebViewObject(int tab_index) {
     return env->CallStaticObjectMethod(cls, mid, tab_index);
 }
 
+// destroy native view (opened with URL prefix or in separated full-screen window)
+// this function can executed from your native code (from NativeView code, for example)
+// instead of this function you can execute destroy() for Ruby NativeView object
+void RhoNativeViewManager::destroyNativeView(NativeView* nativeView) {
+   //TODO
+
+}
+
+
 
 RHO_GLOBAL jobject JNICALL Java_com_rhomobile_rhodes_nativeview_RhoNativeViewManager_getViewByHandle
 (JNIEnv *env, jclass, jlong handle) {
@@ -163,3 +172,27 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_nativeview_RhoNativeViewManage
 	holder->factory->destroyNativeView(nv);
 }
 
+extern "C" int rho_native_view_manager_create_native_view(const char* viewtype, int tab_index, VALUE params) {
+	return -1;
+}
+
+extern "C" void rho_native_view_manager_navigate_native_view(int native_view_id, const char* url) {
+}
+
+extern "C" void rho_native_view_manager_destroy_native_view(int native_view_id) {
+}
+
+int RhoNativeViewManager::openNativeView(const char* viewType, int tab_index, VALUE params) {
+	return rho_native_view_manager_create_native_view(viewType, tab_index, params);
+}
+
+
+void RhoNativeViewManager::closeNativeView(int v_id) {
+	rho_native_view_manager_destroy_native_view(v_id);
+}
+
+
+
+
+
+

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

@@ -156,15 +156,13 @@ RHO_GLOBAL void* openPhonebookRecord(void* pb, char* id)
     jmethodID mid = getJNIClassMethod(env, cls, "getRecord", "(Ljava/lang/String;)Lcom/rhomobile/rhodes/phonebook/Contact;");
     if (!mid) return NULL;
 
-    jstring objId = rho_cast<jstring>(id);
-    jobject recordObj = env->CallObjectMethod(obj, mid, objId);
-    env->DeleteLocalRef(objId);
+    jhstring objId = rho_cast<jhstring>(id);
+    jhobject recordObj = jhobject(env->CallObjectMethod(obj, mid, objId.get()));
     if (!recordObj) return NULL;
-    jobject retval = env->NewGlobalRef(recordObj);
-    env->DeleteLocalRef(recordObj);
+    jhobject retval = jhobject(env->NewGlobalRef(recordObj.get()));
     if (logging_enable) RAWLOG_INFO("openPhonebookRecord() FINISH");
     if (!retval) return NULL;
-    return retval;
+    return retval.release();
 }
 
 RHO_GLOBAL VALUE getPhonebookRecord(void* pb, char* id)
@@ -252,18 +250,15 @@ RHO_GLOBAL int setRecordValue(void* record, char* property, char* value)
     jmethodID mid = getJNIClassMethod(env, contactCls, "setField", "(ILjava/lang/String;)V");
     if (!mid) return 0;
 
-    //jstring objProperty = rho_cast<jstring>(property);
-    jstring objValue = rho_cast<jstring>(value);
+    jhstring objValue = rho_cast<jhstring>(value);
 
 	int index = get_value_index_by_name(property);
 	if (index >= 0) {
-		env->CallVoidMethod(contactObj, mid, index, objValue);
+		env->CallVoidMethod(contactObj, mid, index, objValue.get());
 	}
 	else {
 		RAWLOG_ERROR("Phonebook.cpp invalid property name for Contact Record");
 	}
-    //env->DeleteLocalRef(objProperty);
-    env->DeleteLocalRef(objValue);
     return 1;
 }
 

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

@@ -7,7 +7,7 @@
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoConf_getString
   (JNIEnv *, jclass, jstring name)
 {
-    return rho_cast<jstring>(RHOCONF().getString(rho_cast<std::string>(name).c_str()).c_str());
+    return rho_cast<jhstring>(RHOCONF().getString(rho_cast<std::string>(name).c_str()).c_str()).release();
 }
 
 RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_RhoConf_getInt
@@ -25,19 +25,19 @@ RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhoConf_getBool
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoConf_setString
   (JNIEnv *, jclass, jstring name, jstring value)
 {
-    RHOCONF().setString(rho_cast<std::string>(name).c_str(), rho_cast<std::string>(value));
+    RHOCONF().setString(rho_cast<std::string>(name).c_str(), rho_cast<std::string>(value), false);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoConf_setInt
   (JNIEnv *, jclass, jstring name, jint value)
 {
-    RHOCONF().setInt(rho_cast<std::string>(name).c_str(), value);
+    RHOCONF().setInt(rho_cast<std::string>(name).c_str(), value, false);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoConf_setBoolean
   (JNIEnv *, jclass, jstring name, jboolean value)
 {
-    RHOCONF().setBool(rho_cast<std::string>(name).c_str(), value);
+    RHOCONF().setBool(rho_cast<std::string>(name).c_str(), value, false);
 }
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhoConf_isExist

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

@@ -0,0 +1,87 @@
+#include "rhodes/rhocryptimpl.h"
+#include "rhodes/JNIRhodes.h"
+
+namespace rho
+{
+namespace common
+{
+IMPLEMENT_LOGCLASS(CRhoCryptImpl,"RhoCrypt");
+
+CRhoCryptImpl::CRhoCryptImpl() : m_obj(0), m_dataOut(0)
+{
+    JNIEnv *env = jnienv();
+    if (!env) {
+       return;
+    }
+    cls = getJNIClass(RHODES_JAVA_CLASS_RHOCRYPTIMPL);
+    if (!cls) return;
+    midConstructor = getJNIClassMethod(env, cls, "<init>", "()V");
+    if (!midConstructor) return;
+    midDBDecrypt = getJNIClassMethod(env, cls, "db_decrypt", "(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)Z");
+    if (!midDBDecrypt) return;
+    midDBEncrypt = getJNIClassMethod(env, cls, "db_encrypt", "(Ljava/lang/String;Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)Z");
+    if (!midDBEncrypt) return;
+    midSetDBCryptKey = getJNIClassMethod(env, cls, "set_db_CryptKey", "(Ljava/lang/String;Ljava/lang/String;Z)Z");
+    if (!midSetDBCryptKey) return;
+
+    m_obj = env->NewObject(cls, midConstructor);
+    env->NewGlobalRef(m_obj);
+
+    m_dataOut = (unsigned char*)malloc(1024); //sqlite page size
+}
+
+CRhoCryptImpl::~CRhoCryptImpl()
+{
+    if (m_obj)
+        jnienv()->DeleteGlobalRef(m_obj);
+
+    if (m_dataOut)
+        free(m_dataOut);
+}
+
+int CRhoCryptImpl::db_decrypt( const char* szPartition, int size, unsigned char* data )
+{
+    //LOG(INFO) + "C:db_decrypt";
+    JNIEnv *env = jnienv();
+    jhobject dataInObj = jhobject(env->NewDirectByteBuffer(data, size)); 
+    jhstring objPartition = rho_cast<jhstring>(szPartition);
+
+    jhobject dataOutObj = jhobject(env->NewDirectByteBuffer(m_dataOut, size));
+    jboolean result = env->CallBooleanMethod(m_obj, midDBDecrypt, objPartition.get(), dataInObj.get(), dataOutObj.get());
+
+    memcpy( data, m_dataOut, size );
+
+    //LOG(INFO) + "C:db_decrypt END";
+    return result ? 1 : 0;
+
+//    return 1;
+}
+
+int CRhoCryptImpl::db_encrypt( const char* szPartition, int size, unsigned char* data, unsigned char* dataOut )
+{
+    //LOG(INFO) + "C:db_encrypt";
+    JNIEnv *env = jnienv();
+    jhobject dataInObj = jhobject(env->NewDirectByteBuffer(data, size)); 
+    jhobject dataOutObj = jhobject(env->NewDirectByteBuffer(dataOut, size)); 
+    jhstring objPartition = rho_cast<jhstring>(szPartition);
+    jboolean result = env->CallBooleanMethod(m_obj, midDBEncrypt, objPartition.get(), dataInObj.get(), dataOutObj.get());
+
+    //LOG(INFO) + "C:db_encrypt END";
+    return result ? 1 : 0;
+    //memcpy(dataOut, data, size);
+    //return 1;
+}
+
+int CRhoCryptImpl::set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent )
+{
+    JNIEnv *env = jnienv();
+    jhstring objPartition = rho_cast<jhstring>(szPartition);
+    jhstring objKey = rho_cast<jhstring>(szKey);
+    jboolean result = env->CallBooleanMethod(m_obj, midSetDBCryptKey, objPartition.get(), objKey.get(), (jboolean)bPersistent);
+
+    return result ? 1 : 0;
+}
+
+} // namespace common
+} // namespace rho
+

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

@@ -1,6 +1,7 @@
 #include <android/log.h>
 
 #include "rhodes/jni/com_rhomobile_rhodes_RhodesService.h"
+#include "rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h"
 
 #include <common/RhoConf.h>
 #include <common/app_build_configs.h>
@@ -85,7 +86,7 @@ jobject RhoValueConverter::createObject(rho_param *p)
     if (!init || !p) return NULL;
     switch (p->type) {
     case RHO_PARAM_STRING:
-        return rho_cast<jstring>(p->v.string);
+        return rho_cast<jhstring>(p->v.string).release();
         break;
     case RHO_PARAM_ARRAY:
         {
@@ -93,9 +94,8 @@ jobject RhoValueConverter::createObject(rho_param *p)
             if (!v) return NULL;
 
             for (int i = 0, lim = p->v.array->size; i < lim; ++i) {
-                jobject value = createObject(p->v.array->value[i]);
-                env->CallVoidMethod(v, midAddElement, value);
-                env->DeleteLocalRef(value);
+                jhobject value = jhobject(createObject(p->v.array->value[i]));
+                env->CallVoidMethod(v, midAddElement, value.get());
             }
             return v;
         }
@@ -106,11 +106,9 @@ jobject RhoValueConverter::createObject(rho_param *p)
             if (!v) return NULL;
 
             for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
-                jstring key = rho_cast<jstring>(p->v.hash->name[i]);
-                jobject value = createObject(p->v.hash->value[i]);
-                env->CallObjectMethod(v, midPut, key, value);
-                env->DeleteLocalRef(key);
-                env->DeleteLocalRef(value);
+                jhstring key = rho_cast<jhstring>(p->v.hash->name[i]);
+                jhobject value = jhobject(createObject(p->v.hash->value[i]));
+                env->CallObjectMethod(v, midPut, key.get(), value.get());
             }
             return v;
         }
@@ -235,9 +233,9 @@ std::string rho_cast_helper<std::string, jstring>::operator()(JNIEnv *env, jstri
     return ret;
 }
 
-jstring rho_cast_helper<jstring, char const *>::operator()(JNIEnv *env, char const *s)
+jhstring rho_cast_helper<jhstring, char const *>::operator()(JNIEnv *env, char const *s)
 {
-    return env->NewStringUTF(s);
+    return jhstring(env->NewStringUTF(s));
 }
 
 static rho::common::CMutex rho_cast_java_ruby_mtx;
@@ -460,8 +458,7 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_createRhodesApp
     rho_logconf_Init(szRootPath);
 
     // Disable log to stdout as on android all stdout redirects to /dev/null
-    RHOCONF().setBool("LogToOutput", false);
-    RHOCONF().saveToFile();
+    RHOCONF().setBool("LogToOutput", false, true);
     LOGCONF().setLogToOutput(false);
     // Add android system log sink
     LOGCONF().setLogView(rho::common::g_androidLogSink);
@@ -495,39 +492,39 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
     rho_sync_doSyncSourceByName(source.c_str());
 }
 
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getOptionsUrl
-  (JNIEnv *env, jobject)
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getOptionsUrl
+  (JNIEnv *env, jclass)
 {
     const char *s = RHODESAPP().getOptionsUrl().c_str();
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getStartUrl
-  (JNIEnv *env, jobject)
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getStartUrl
+  (JNIEnv *env, jclass)
 {
     const char *s = RHODESAPP().getStartUrl().c_str();
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getCurrentUrl
-  (JNIEnv *env, jobject)
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getCurrentUrl
+  (JNIEnv *env, jclass)
 {
     const char *s = RHODESAPP().getCurrentUrl(0).c_str();
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getAppBackUrl
-  (JNIEnv *env, jobject)
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getAppBackUrl
+  (JNIEnv *env, jclass)
 {
     const char *s = RHODESAPP().getAppBackUrl().c_str();
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBlobPath
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getBlobPath
   (JNIEnv *env, jclass)
 {
     const char *s = RHODESAPP().getBlobsDirPath().c_str();
-    return rho_cast<jstring>(env, s);
+    return rho_cast<jhstring>(env, s).release();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
@@ -542,17 +539,33 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
 {
     std::string const &s = rho_cast<std::string>(strUrl);
     std::string const &cs = RHODESAPP().canonicalizeRhoUrl(s);
-    return rho_cast<jstring>(env, cs);
+    return rho_cast<jhstring>(env, cs).release();
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBuildConfig
-  (JNIEnv *env, jobject, jstring key)
+  (JNIEnv *env, jclass, jstring key)
 {
     std::string const &s = rho_cast<std::string>(key);
     const char* cs = get_app_build_config_item(s.c_str());
-    return rho_cast<jstring>(env, cs);
+    return rho_cast<jhstring>(env, cs).release();
+}
+
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPage
+  (JNIEnv *env, jclass)
+{
+    bool res = RHODESAPP().isOnStartPage();
+    return (jboolean)res;
 }
 
+JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
+  (JNIEnv *, jclass, jstring cmdLine, jstring sep)
+{
+    std::string const &strCmdLine = rho_cast<std::string>(cmdLine);
+    std::string const &strSep = rho_cast<std::string>(sep);
+
+    int nRes = rho_rhodesapp_canstartapp(strCmdLine.c_str(), strSep.c_str());
+    return (jboolean)(nRes ? true : false);
+}
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_navigateBack
   (JNIEnv *, jclass)
@@ -573,6 +586,18 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_onScreenOrientat
 	//RAWLOG_ERROR3("$$$$$$$$$$$$$$$$ SCREEN : [%d]x[%d] angle[%d]", width, height, angle);	
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiCreatedCallback
+  (JNIEnv *, jobject)
+{
+    rho_rhodesapp_callUiCreatedCallback();
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiDestroyedCallback
+  (JNIEnv *, jobject)
+{
+    rho_rhodesapp_callUiDestroyedCallback();
+}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callActivationCallback
   (JNIEnv *, jobject, jboolean active)
 {
@@ -609,7 +634,3 @@ RHO_GLOBAL char *rho_timezone()
     }
     return tz;
 }
-
-RHO_GLOBAL const char* rho_sys_get_start_params() {
-    return "";
-}

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

@@ -33,8 +33,7 @@ RHO_GLOBAL void rho_ringtone_manager_play(char* file_name)
     if (!cls) return;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "play", "(Ljava/lang/String;)V");
     if (!mid) return;
-    jstring objFileName = rho_cast<jstring>(file_name);
-    env->CallStaticVoidMethod(cls, mid, objFileName);
-    env->DeleteLocalRef(objFileName);
+    jhstring objFileName = rho_cast<jhstring>(file_name);
+    env->CallStaticVoidMethod(cls, mid, objFileName.get());
 }
 

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

@@ -23,11 +23,9 @@ RHO_GLOBAL void rho_signature_take_signature(char* callback_url, char* image_for
     if (!cls) return;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "takeSignature", "(Ljava/lang/String;Ljava/lang/String;)V");
     if (!mid) return;
-    jstring objCallback = rho_cast<jstring>(callback_url);
-    jstring objFormat = rho_cast<jstring>(image_format);
-    env->CallStaticVoidMethod(cls, mid, objCallback, objFormat);
-    env->DeleteLocalRef(objCallback);
-    env->DeleteLocalRef(objFormat);
+    jhstring objCallback = rho_cast<jhstring>(callback_url);
+    jhstring objFormat = rho_cast<jhstring>(image_format);
+    env->CallStaticVoidMethod(cls, mid, objCallback.get(), objFormat.get());
 //*/
 }
 

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

@@ -19,3 +19,10 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_SplashScreen_nativeHide
     rc::CSplashScreen &splashScreen = RHODESAPP().getSplashScreen();
     splashScreen.hide();
 }
+
+RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_SplashScreen_howLongWaitMs
+  (JNIEnv *, jobject)
+{
+    rc::CSplashScreen &splashScreen = RHODESAPP().getSplashScreen();
+    return (jint)splashScreen.howLongWaitMs();
+}

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

@@ -24,9 +24,9 @@ RHO_GLOBAL jobject JNICALL Java_com_rhomobile_rhodes_socket_SSLImpl_getRemoteSoc
     jfieldID fidPort = getJNIClassField(env, clsSockAddr, "port", "I");
     if (!fidPort) return NULL;
 
-    jbyteArray array = env->NewByteArray(4);
+    jholder<jbyteArray> array = jholder<jbyteArray>(env->NewByteArray(4));
     if (!array) return NULL;
-    jbyte *arr = env->GetByteArrayElements(array, NULL);
+    jbyte *arr = env->GetByteArrayElements(array.get(), NULL);
     if (!arr) return NULL;
 
     sockaddr_in sa;
@@ -44,22 +44,19 @@ RHO_GLOBAL jobject JNICALL Java_com_rhomobile_rhodes_socket_SSLImpl_getRemoteSoc
     arr[1] = (jbyte)(addr & 0xFF);
     addr >>= 8;
     arr[0] = (jbyte)(addr & 0xFF);
-    env->ReleaseByteArrayElements(array, arr, 0);
+    env->ReleaseByteArrayElements(array.get(), arr, 0);
 
-    jstring ipaddrObj = rho_cast<jstring>(::inet_ntoa(sa.sin_addr));
-    jobject inetaddrObj = env->NewObject(clsInetAddr, midInetAddr, array, ipaddrObj);
-    env->DeleteLocalRef(ipaddrObj);
+    jhstring ipaddrObj = rho_cast<jhstring>(::inet_ntoa(sa.sin_addr));
+    jhobject inetaddrObj = jhobject(env->NewObject(clsInetAddr, midInetAddr, array.get(), ipaddrObj.get()));
     if (!inetaddrObj) return NULL;
 
-    jobject sockaddrObj = env->NewObject(clsSockAddr, midSockAddr);
+    jhobject sockaddrObj = jhobject(env->NewObject(clsSockAddr, midSockAddr));
     if (!sockaddrObj) return NULL;
 
-    env->SetObjectField(sockaddrObj, fidInetAddr, inetaddrObj);
-    env->SetIntField(sockaddrObj, fidPort, ntohs(sa.sin_port));
+    env->SetObjectField(sockaddrObj.get(), fidInetAddr, inetaddrObj.get());
+    env->SetIntField(sockaddrObj.get(), fidPort, ntohs(sa.sin_port));
 
-    env->DeleteLocalRef(inetaddrObj);
-
-    return sockaddrObj;
+    return sockaddrObj.release();
 }
 
 namespace rho
@@ -127,15 +124,15 @@ ssize_t SSLImpl::send(const void *mem, size_t len, void *storage)
     if (!storage) return -1;
 
     JNIEnv *env = jnienv();
-    jbyteArray array = env->NewByteArray(len);
+    jholder<jbyteArray> array = jholder<jbyteArray>(env->NewByteArray(len));
     if (!array) return -1;
-    jbyte *arr = env->GetByteArrayElements(array, NULL);
+    jbyte *arr = env->GetByteArrayElements(array.get(), NULL);
     if (!arr) return -1;
     std::memmove(arr, mem, len);
-    env->ReleaseByteArrayElements(array, arr, 0);
+    env->ReleaseByteArrayElements(array.get(), arr, 0);
 
     jobject obj = (jobject)storage;
-    jboolean result = env->CallBooleanMethod(obj, midSend, array);
+    jboolean result = env->CallBooleanMethod(obj, midSend, array.get());
     if (!result) return -1;
     return len;
 }
@@ -166,14 +163,14 @@ ssize_t SSLImpl::recv(char *buf, size_t size, int *wouldblock, void *storage)
         return -1;
     }
 
-    jbyteArray array = env->NewByteArray(size);
-    jint result = env->CallIntMethod(obj, midRecv, array);
+    jholder<jbyteArray> array = jholder<jbyteArray>(env->NewByteArray(size));
+    jint result = env->CallIntMethod(obj, midRecv, array.get());
 
     if (result > 0) {
-        jbyte *arr = env->GetByteArrayElements(array, NULL);
+        jbyte *arr = env->GetByteArrayElements(array.get(), NULL);
         if (!arr) return -1;
         std::memmove(buf, arr, result);
-        env->ReleaseByteArrayElements(array, arr, JNI_ABORT);
+        env->ReleaseByteArrayElements(array.get(), arr, JNI_ABORT);
     }
     return result;
 }

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

@@ -20,9 +20,8 @@ RHO_GLOBAL void rho_webview_navigate(const char* url, int index)
     }
 
     char *normUrl = rho_http_normalizeurl(url);
-    jstring objNormUrl = rho_cast<jstring>(normUrl);
-    env->CallStaticVoidMethod(cls, mid, objNormUrl, index);
-    env->DeleteLocalRef(objNormUrl);
+    jhstring objNormUrl = rho_cast<jhstring>(normUrl);
+    env->CallStaticVoidMethod(cls, mid, objNormUrl.get(), index);
 }
 
 RHO_GLOBAL void rho_webview_refresh(int index)
@@ -74,15 +73,19 @@ RHO_GLOBAL const char* rho_webview_execute_js(const char* js, int index)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "executeJs", "(Ljava/lang/String;I)V");
     if (!mid) return NULL;
 
-    jstring objJs = rho_cast<jstring>(env, js);
-    env->CallStaticVoidMethod(cls, mid, objJs, index);
-    env->DeleteLocalRef(objJs);
+    jhstring objJs = rho_cast<jhstring>(env, js);
+    env->CallStaticVoidMethod(cls, mid, objJs.get(), index);
     return "";
 }
 
 RHO_GLOBAL void rho_webview_full_screen_mode(int enable)
 {
-    //TODO: rho_webview_full_screen_mode
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_ACTIVITY);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "setFullscreen", "(I)V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid, enable);
 }
 
 RHO_GLOBAL void rho_webview_set_cookie(const char *url, const char *cookie)
@@ -93,9 +96,7 @@ RHO_GLOBAL void rho_webview_set_cookie(const char *url, const char *cookie)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "setCookie", "(Ljava/lang/String;Ljava/lang/String;)V");
     if (!mid) return;
 
-    jstring urlObj = rho_cast<jstring>(url);
-    jstring cookieObj = rho_cast<jstring>(cookie);
-    env->CallStaticVoidMethod(cls, mid, urlObj, cookieObj);
-    env->DeleteLocalRef(urlObj);
-    env->DeleteLocalRef(cookieObj);
+    jhstring urlObj = rho_cast<jhstring>(url);
+    jhstring cookieObj = rho_cast<jhstring>(cookie);
+    env->CallStaticVoidMethod(cls, mid, urlObj.get(), cookieObj.get());
 }