rhodes 3.0.2 → 3.1.0.beta.1

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
 
 #include "rhodes/jni/com_rhomobile_rhodes_Logger.h"

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

@@ -1,8 +1,38 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
 
+#include "rhodes/JNIRhoRuby.h"
+
 #include <common/rhoparams.h>
 #include <common/map/MapEngine.h>
 
+#include <genconfig.h>
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "AndroidMapEngine"
 

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
 
 #include "rhodes/jni/com_rhomobile_rhodes_RhoMenu.h"

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

@@ -1,4 +1,31 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
+#include "rhodes/JNIRhoRuby.h"
 
 #include <common/rhoparams.h>
 #include "common/RhodesApp.h"
@@ -62,10 +89,6 @@ 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().");
@@ -87,10 +110,6 @@ RHO_GLOBAL void nativebar_switch_tab(int 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);
 }

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include <rhodes.h>
 #include <android/log.h>
 #include <common/RhodesApp.h>

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

@@ -1,4 +1,31 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
+#include "rhodes/JNIRhoRuby.h"
 
 #include <common/rhoparams.h>
 

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

@@ -1,4 +1,31 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/JNIRhodes.h"
+#include "rhodes/JNIRhoRuby.h"
 
 #include <android/log.h>
 #include <logging/RhoLogConf.h>

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/jni/com_rhomobile_rhodes_RhoConf.h"
 
 #include "rhodes/JNIRhodes.h"

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "rhodes/rhocryptimpl.h"
 #include "rhodes/JNIRhodes.h"
 

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

@@ -1,12 +1,36 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #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>
 #include <logging/RhoLogConf.h>
-#include <common/RhodesApp.h>
 #include <sync/SyncThread.h>
 #include <sync/ClientRegister.h>
 
@@ -22,14 +46,10 @@
 
 const char *rho_java_class[] = {
 #define RHODES_DEFINE_JAVA_CLASS(x, name) name,
-#include <rhodes/details/rhojava.inc>
+#include "rhojava.inc"
 #undef RHODES_DEFINE_JAVA_CLASS
 };
 
-static std::string g_root_path;
-static std::string g_sqlite_journals_path;
-static std::string g_apk_path;
-
 static pthread_key_t g_thrkey;
 
 static JavaVM *g_jvm = NULL;
@@ -43,82 +63,14 @@ namespace rho
 namespace common
 {
 
-class AndroidLogSink : public ILogSink
+void AndroidLogSink::writeLogMessage(String &strMsg)
 {
-public:
-    void writeLogMessage(String &strMsg)
-    {
-        __android_log_write(ANDROID_LOG_INFO, "APP", strMsg.c_str());
-    }
-
-    int getCurPos()
-    {
-        return 0;
-    }
-
-    void clear() {}
-};
-
-static CAutoPtr<AndroidLogSink> g_androidLogSink(new AndroidLogSink());
+    __android_log_write(ANDROID_LOG_INFO, "APP", strMsg.c_str());
+}
 
 } // namespace common
 } // namespace rho
 
-RhoValueConverter::RhoValueConverter(JNIEnv *e)
-    :env(e), init(false)
-{
-    clsHashMap = getJNIClass(RHODES_JAVA_CLASS_HASHMAP);
-    if (!clsHashMap) return;
-    clsVector = getJNIClass(RHODES_JAVA_CLASS_VECTOR);
-    if (!clsVector) return;
-    midHashMapConstructor = getJNIClassMethod(env, clsHashMap, "<init>", "()V");
-    if (!midHashMapConstructor) return;
-    midVectorConstructor = getJNIClassMethod(env, clsVector, "<init>", "()V");
-    if (!midVectorConstructor) return;
-    midPut = getJNIClassMethod(env, clsHashMap, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    if (!midPut) return;
-    midAddElement = getJNIClassMethod(env, clsVector, "addElement", "(Ljava/lang/Object;)V");
-    if (!midAddElement) return;
-    init = true;
-}
-
-jobject RhoValueConverter::createObject(rho_param *p)
-{
-    if (!init || !p) return NULL;
-    switch (p->type) {
-    case RHO_PARAM_STRING:
-        return rho_cast<jhstring>(p->v.string).release();
-        break;
-    case RHO_PARAM_ARRAY:
-        {
-            jobject v = env->NewObject(clsVector, midVectorConstructor);
-            if (!v) return NULL;
-
-            for (int i = 0, lim = p->v.array->size; i < lim; ++i) {
-                jhobject value = jhobject(createObject(p->v.array->value[i]));
-                env->CallVoidMethod(v, midAddElement, value.get());
-            }
-            return v;
-        }
-        break;
-    case RHO_PARAM_HASH:
-        {
-            jobject v = env->NewObject(clsHashMap, midHashMapConstructor);
-            if (!v) return NULL;
-
-            for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
-                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;
-        }
-        break;
-    default:
-        return NULL;
-    }
-}
-
 void store_thr_jnienv(JNIEnv *env)
 {
     pthread_setspecific(g_thrkey, env);
@@ -184,29 +136,6 @@ jmethodID getJNIClassStaticMethod(JNIEnv *env, jclass cls, const char *name, con
     return mid;
 }
 
-std::string const &rho_root_path()
-{
-    return g_root_path;
-}
-
-const char* rho_native_rhopath()
-{
-    return rho_root_path().c_str();
-}
-
-std::string const &rho_apk_path()
-{
-    return g_apk_path;
-}
-
-std::string rho_cur_path()
-{
-    char buf[PATH_MAX];
-    if (::getcwd(buf, sizeof(buf)) == NULL)
-        return "";
-    return buf;
-}
-
 jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
 {
     g_jvm = vm;
@@ -236,504 +165,22 @@ namespace details
 
 std::string rho_cast_helper<std::string, jstring>::operator()(JNIEnv *env, jstring s)
 {
-    const char *ts = env->GetStringUTFChars(s, JNI_FALSE);
-    std::string ret(ts);
-    env->ReleaseStringUTFChars(s, ts);
-    return ret;
-}
-
-jhstring rho_cast_helper<jhstring, char const *>::operator()(JNIEnv *env, char const *s)
-{
-    return jhstring(env->NewStringUTF(s));
-}
-
-static rho::common::CMutex rho_cast_java_ruby_mtx;
-
-static jclass clsString;
-static jclass clsMap;
-static jclass clsSet;
-static jclass clsIterator;
-
-static jmethodID midMapGet;
-static jmethodID midMapKeySet;
-static jmethodID midSetIterator;
-static jmethodID midIteratorHasNext;
-static jmethodID midIteratorNext;
-
-static bool rho_cast_java_ruby_init(JNIEnv *env)
-{
-    static rho::common::CMutex rho_fd_mtx;
-    static bool initialized = false;
-    if (initialized)
-        return true;
-
-    rho::common::CMutexLock guard(rho_cast_java_ruby_mtx);
-    if (initialized)
-        return true;
-
-    clsString = getJNIClass(RHODES_JAVA_CLASS_STRING);
-    if (!clsString) return false;
-    clsMap = getJNIClass(RHODES_JAVA_CLASS_MAP);
-    if (!clsMap) return false;
-    clsSet = getJNIClass(RHODES_JAVA_CLASS_SET);
-    if (!clsSet) return false;
-    clsIterator = getJNIClass(RHODES_JAVA_CLASS_ITERATOR);
-    if (!clsIterator) return false;
-
-    midMapGet = getJNIClassMethod(env, clsMap, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
-    if (!midMapGet) return false;
-    midMapKeySet = getJNIClassMethod(env, clsMap, "keySet", "()Ljava/util/Set;");
-    if (!midMapKeySet) return false;
-    midSetIterator = getJNIClassMethod(env, clsSet, "iterator", "()Ljava/util/Iterator;");
-    if (!midSetIterator) return false;
-    midIteratorHasNext = getJNIClassMethod(env, clsIterator, "hasNext", "()Z");
-    if (!midIteratorHasNext) return false;
-    midIteratorNext = getJNIClassMethod(env, clsIterator, "next", "()Ljava/lang/Object;");
-    if (!midIteratorNext) return false;
-
-    initialized = true;
-    return true;
-}
-
-static VALUE convertJavaMapToRubyHash(JNIEnv *env, jobject objMap)
-{
-    jobject objSet = env->CallObjectMethod(objMap, midMapKeySet);
-    if (!objSet) return Qnil;
-    jobject objIterator = env->CallObjectMethod(objSet, midSetIterator);
-    if (!objIterator) return Qnil;
-                                  
-    CHoldRubyValue retval(rho_ruby_createHash());
-    while(env->CallBooleanMethod(objIterator, midIteratorHasNext))
+    if(env->IsSameObject(s, NULL) == JNI_TRUE)
     {
-        jstring objKey = (jstring)env->CallObjectMethod(objIterator, midIteratorNext);
-        if (!objKey) return Qnil;
-        jstring objValue = (jstring)env->CallObjectMethod(objMap, midMapGet, objKey);
-        if (!objValue) return Qnil;
-
-        std::string const &strKey = rho_cast<std::string>(objKey);
-        std::string const &strValue = rho_cast<std::string>(objValue);
-        addStrToHash(retval, strKey.c_str(), strValue.c_str());
-
-        env->DeleteLocalRef(objKey);
-        env->DeleteLocalRef(objValue);
-    }
-    return retval;
-}
-
-jobject rho_cast_helper<jobject, VALUE>::operator()(JNIEnv *env, VALUE value)
-{
-    if (!rho_cast_java_ruby_init(env))
+        //Avoid crash in case of null java reference
+        return std::string();
+    } else
     {
-        env->ThrowNew(getJNIClass(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION), "Java <=> Ruby conversion initialization failed");
-        return NULL;
+        const char *ts = env->GetStringUTFChars(s, JNI_FALSE);
+        std::string ret(ts);
+        env->ReleaseStringUTFChars(s, ts);
+        return ret;
     }
-
-    if (NIL_P(value))
-        return NULL;
-
-    if (TYPE(value) == T_STRING)
-        return env->NewStringUTF(RSTRING_PTR(value));
-
-    RAWLOG_ERROR("rho_cast<jobject, VALUE>: unknown type of value");
-    return NULL;
 }
 
-VALUE rho_cast_helper<VALUE, jobject>::operator()(JNIEnv *env, jobject obj)
+jhstring rho_cast_helper<jhstring, char const *>::operator()(JNIEnv *env, char const *s)
 {
-    if (!rho_cast_java_ruby_init(env))
-    {
-        env->ThrowNew(getJNIClass(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION), "Java <=> Ruby conversion initialization failed");
-        return Qnil;
-    }
-
-    if (!obj)
-        return Qnil;
-
-    if (env->IsInstanceOf(obj, clsString))
-        return rho_ruby_create_string(rho_cast<std::string>(env, (jstring)obj).c_str());
-
-    if (env->IsInstanceOf(obj, clsMap))
-        return convertJavaMapToRubyHash(env, obj);
-
-    RAWLOG_ERROR("rho_cast<VALUE, jobject>: unknown type of value");
-    return Qnil;
+    return jhstring(env->NewStringUTF(s));
 }
 
 } // namespace details
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_makeLink
-  (JNIEnv *env, jclass, jstring src, jstring dst)
-{
-    // We should not use rho_cast functions here because this function
-    // called very early when jnienv() is not yet initialized
-    const char *strSrc = env->GetStringUTFChars(src, JNI_FALSE);
-    const char *strDst = env->GetStringUTFChars(dst, JNI_FALSE);
-    ::unlink(strDst);
-    int err = ::symlink(strSrc, strDst);
-    env->ReleaseStringUTFChars(src, strSrc);
-    env->ReleaseStringUTFChars(dst, strDst);
-    if (err != 0)
-        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]]);
-    }
-    return true;
-}
-
-static bool set_posix_environment(JNIEnv *env, jclass clsRE)
-{
-    // Set USER variable
-    struct passwd *pwd = ::getpwuid(::getuid());
-    if (!pwd)
-    {
-        env->ThrowNew(clsRE, "Can't find user name for current user");
-        return false;
-    }
-
-    size_t len = ::strlen(pwd->pw_name) + 16;
-    char *buf = (char *)::malloc(len + 1);
-    buf[len] = '\0';
-    ::snprintf(buf, len, "USER=%s", pwd->pw_name);
-    int e = ::putenv(buf);
-    ::free(buf);
-    if (e != 0)
-    {
-        env->ThrowNew(clsRE, "Can't set USER environment variable");
-        return false;
-    }
-
-    // Set HOME variable
-    std::string root_path = rho_root_path();
-    if (!root_path.empty() && root_path[root_path.size() - 1] == '/')
-        root_path.erase(root_path.size() - 1);
-    len = root_path.size() + 16;
-    buf = (char *)::malloc(len + 1);
-    buf[len] = '\0';
-    ::snprintf(buf, len, "HOME=%s", root_path.c_str());
-    e = ::putenv(buf);
-    ::free(buf);
-    if (e != 0)
-    {
-        env->ThrowNew(clsRE, "Can't set HOME environment variable");
-        return false;
-    }
-
-    // Set TMP variable
-    len = root_path.size() + 32;
-    buf = (char *)::malloc(len + 1);
-    buf[len] = '\0';
-    ::snprintf(buf, len, "TMP=%s/tmp", root_path.c_str());
-    e = ::putenv(buf);
-    ::free(buf);
-    if (e != 0)
-    {
-        env->ThrowNew(clsRE, "Can't set TMP environment variable");
-        return false;
-    }
-
-    return true;
-}
-
-static jobject g_classLoader = NULL;
-static jmethodID g_loadClass = NULL;
-
-jclass rho_find_class(JNIEnv *env, const char *c)
-{
-    jstring className = env->NewStringUTF(c);
-    jclass cls = (jclass)env->CallObjectMethod(g_classLoader, g_loadClass, className);
-    env->DeleteLocalRef(className);
-    return cls;
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_initClassLoader
-  (JNIEnv *env, jobject, jobject cl)
-{
-    g_classLoader = env->NewGlobalRef(cl);
-    jclass javaLangClassLoader = env->FindClass("java/lang/ClassLoader");
-    g_loadClass = env->GetMethodID(javaLangClassLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_nativeInitPath
-  (JNIEnv *env, jobject, jstring root_path, jstring sqlite_journals_path, jstring apk_path)
-{
-    g_root_path = rho_cast<std::string>(env, root_path);
-    g_sqlite_journals_path = rho_cast<std::string>(env, sqlite_journals_path);
-    g_apk_path = rho_cast<std::string>(env, apk_path);
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodesApp
-  (JNIEnv *env, jclass)
-{
-    jclass clsRE = getJNIClass(RHODES_JAVA_CLASS_RUNTIME_EXCEPTION);
-    if (!clsRE)
-        return;
-
-    struct rlimit rlim;
-    if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
-    {
-        env->ThrowNew(clsRE, "Can not get maximum number of open files");
-        return;
-    }
-    if (rlim.rlim_max < (unsigned long)RHO_FD_BASE)
-    {
-        env->ThrowNew(clsRE, "Current limit of open files is less then RHO_FD_BASE");
-        return;
-    }
-    if (rlim.rlim_cur > (unsigned long)RHO_FD_BASE)
-    {
-        rlim.rlim_cur = RHO_FD_BASE;
-        rlim.rlim_max = RHO_FD_BASE;
-        if (setrlimit(RLIMIT_NOFILE, &rlim) == -1)
-        {
-            env->ThrowNew(clsRE, "Can not set maximum number of open files");
-            return;
-        }
-    }
-
-    if (!set_posix_environment(env, clsRE)) return;
-
-    if (::chdir(rho_root_path().c_str()) == -1)
-    {
-        env->ThrowNew(clsRE, "Can not chdir to HOME directory");
-        return;
-    }
-
-    if (!set_capabilities(env)) return;
-
-    // Init SQLite temp directory
-    sqlite3_temp_directory = (char*)g_sqlite_journals_path.c_str();
-
-    const char* szRootPath = rho_native_rhopath();
-
-    // Init logconf
-    rho_logconf_Init(szRootPath);
-
-    // Disable log to stdout as on android all stdout redirects to /dev/null
-    RHOCONF().setBool("LogToOutput", false, true);
-    LOGCONF().setLogToOutput(false);
-    // Add android system log sink
-    LOGCONF().setLogView(rho::common::g_androidLogSink);
-
-    // Start Rhodes application
-    rho_rhodesapp_create(szRootPath);
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_startRhodesApp
-  (JNIEnv *, jclass)
-{
-    rho_rhodesapp_start();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_stopRhodesApp
-  (JNIEnv *, jclass)
-{
-    rho_rhodesapp_destroy();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncAllSources
-  (JNIEnv *, jobject, jboolean show_status_popup)
-{
-    rho_sync_doSyncAllSources(show_status_popup);
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
-  (JNIEnv *env, jobject, jstring sourceObj)
-{
-    std::string source = rho_cast<std::string>(env, sourceObj);
-    rho_sync_doSyncSourceByName(source.c_str());
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_setStartParameters
-  (JNIEnv *env, jclass, jstring strUrl)
-{
-    std::string url = rho_cast<std::string>(env, strUrl);
-    RHODESAPP().setStartParameters(url.c_str());
-}
-
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getOptionsUrl
-  (JNIEnv *env, jclass)
-{
-    const char *s = RHODESAPP().getOptionsUrl().c_str();
-    return rho_cast<jhstring>(env, s).release();
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getStartUrl
-  (JNIEnv *env, jclass)
-{
-    const char *s = RHODESAPP().getStartUrl().c_str();
-    return rho_cast<jhstring>(env, s).release();
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getCurrentUrl
-  (JNIEnv *env, jclass)
-{
-    const char *s = RHODESAPP().getCurrentUrl(0).c_str();
-    return rho_cast<jhstring>(env, s).release();
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getAppBackUrl
-  (JNIEnv *env, jclass)
-{
-    const char *s = RHODESAPP().getAppBackUrl().c_str();
-    return rho_cast<jhstring>(env, s).release();
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getBlobPath
-  (JNIEnv *env, jclass)
-{
-    const char *s = RHODESAPP().getBlobsDirPath().c_str();
-    return rho_cast<jhstring>(env, s).release();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
-  (JNIEnv *env, jobject, jstring strUrl)
-{
-    std::string const &url = rho_cast<std::string>(strUrl);
-    rho_net_request(url.c_str());
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
-  (JNIEnv *env, jobject, jstring strUrl)
-{
-    std::string const &s = rho_cast<std::string>(strUrl);
-    std::string const &cs = RHODESAPP().canonicalizeRhoUrl(s);
-    return rho_cast<jhstring>(env, cs).release();
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBuildConfig
-  (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<jhstring>(env, cs).release();
-}
-
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPage
-  (JNIEnv *env, jclass)
-{
-    bool res = RHODESAPP().isOnStartPage();
-    return (jboolean)res;
-}
-
-
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isTitleEnabled
-  (JNIEnv *, jclass)
-{
-    bool value = true;
-    const char* svalue = get_app_build_config_item("android_title");
-    if (svalue != NULL) {
-        value = svalue[0] != '0';
-    } 
-    return (jboolean)value;
-}
-
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesApplication_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)
-{
-    rho_rhodesapp_navigate_back();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_loadUrl
-  (JNIEnv *env, jclass, jstring str)
-{
-    rho_rhodesapp_load_url(rho_cast<std::string>(env, str).c_str());
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_onScreenOrientationChanged
-  (JNIEnv *env, jclass, jint width, jint height, jint angle)
-{
-	rho_rhodesapp_callScreenRotationCallback(width, height, angle);
-	//RAWLOG_ERROR3("$$$$$$$$$$$$$$$$ SCREEN : [%d]x[%d] angle[%d]", width, height, angle);	
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiCreatedCallback
-  (JNIEnv *, jclass)
-{
-    rho_rhodesapp_callUiCreatedCallback();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callUiDestroyedCallback
-  (JNIEnv *, jclass)
-{
-    rho_rhodesapp_callUiDestroyedCallback();
-}
-
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_callActivationCallback
-  (JNIEnv *, jclass, jboolean active)
-{
-    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* pClientRegister = rho::sync::CClientRegister::getInstance();
-    if(pClientRegister && (pClientRegister->getDevicePin().compare(id) != 0))
-    {
-        rho::sync::CClientRegister::Destroy();
-    }
-    rho::sync::CClientRegister::Create(id.c_str());
-    RHOCONF().setString("push_pin", id.c_str(), true);
-}
-
-RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getPushRegistrationId
-  (JNIEnv * env, jobject)
-{
-    return rho_cast<jhstring>(RHOCONF().getString("push_pin").c_str()).release();
-}
-
-RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback
-  (JNIEnv *env, jobject, jstring jData)
-{
-    std::string data = rho_cast<std::string>(env, jData);
-    return (jboolean)rho_rhodesapp_callPushCallback(data.c_str());
-}
-
-RHO_GLOBAL char *rho_timezone()
-{
-    static char *tz = NULL;
-    if (!tz)
-    {
-        JNIEnv *env = jnienv();
-        jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
-        if (!cls) return NULL;
-        jmethodID mid = getJNIClassStaticMethod(env, cls, "getTimezoneStr", "()Ljava/lang/String;");
-        if (!mid) return NULL;
-        jstring s = (jstring)env->CallStaticObjectMethod(cls, mid);
-        std::string tzs = rho_cast<std::string>(env, s);
-        tz = strdup(tzs.c_str());
-    }
-    return tz;
-}