rhodes 3.0.2 → 3.1.0.beta.1

data/platform/android/Rhodes/jni/src/callbacks.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 "rhodes/RhoClassFactory.h"
 
@@ -9,12 +36,6 @@
 
 extern "C" void rho_webview_navigate(const char* url, int index);
 
-static rho::common::CRhoClassFactory g_oRhoClassFactory;
-rho::common::IRhoClassFactory* rho_get_RhoClassFactory()
-{
-    return &g_oRhoClassFactory;
-}
-
 RHO_GLOBAL void rho_map_location(char* query)
 {
     rho::String url = "http://maps.google.com/?";
@@ -70,17 +91,21 @@ RHO_GLOBAL int rho_net_ping_network(const char* szHost)
 	return (int)env->CallStaticBooleanMethod(cls, mid, rho_cast<jhstring>(szHost).get());
 }
 
-RHO_GLOBAL void *rho_nativethread_start()
+rho::String rho_sysimpl_get_phone_id()
 {
-    JNIEnv *env;
-    jvm()->AttachCurrentThread(&env, NULL);
-    store_thr_jnienv(env);
-    return NULL;
-}
+    JNIEnv *env = jnienv();
 
-RHO_GLOBAL void rho_nativethread_end(void *)
-{
-    jvm()->DetachCurrentThread();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
+    if (!cls) return 0;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "getProperty", "(Ljava/lang/String;)Ljava/lang/Object;");
+    if (!mid) return 0;
+
+    jhstring propNameObj = rho_cast<jhstring>("phone_id");
+    jhobject result = jhobject(env->CallStaticObjectMethod(cls, mid, propNameObj.get()));
+    if (!result) return 0;
+
+    jstring resStrObj = (jstring)result.get();
+    return rho_cast<std::string>(resStrObj);
 }
 
 RHO_GLOBAL int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)

data/platform/android/Rhodes/jni/src/camera.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 "rhodes/jni/com_rhomobile_rhodes_camera_Camera.h"
 
@@ -7,21 +34,45 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Camera"
 
+//RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_camera_Camera_callback
+//  (JNIEnv *env, jclass, jstring callback, jstring filePath, jstring error, jboolean cancelled)
+//{
+//    rho_rhodesapp_callCameraCallback(rho_cast<std::string>(callback).c_str(),
+//        rho_cast<std::string>(filePath).c_str(), rho_cast<std::string>(error).c_str(), cancelled);
+//}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_camera_Camera_callback
-  (JNIEnv *env, jclass, jstring callback, jstring filePath, jstring error, jboolean cancelled)
-{
-    rho_rhodesapp_callCameraCallback(rho_cast<std::string>(callback).c_str(),
-        rho_cast<std::string>(filePath).c_str(), rho_cast<std::string>(error).c_str(), cancelled);
+  (JNIEnv *env, jclass, jstring callback_url, jstring body) {
+    rho_net_request_with_data(rho_http_normalizeurl(rho_cast<std::string>(callback_url).c_str()), rho_cast<std::string>(body).c_str());
 }
 
-RHO_GLOBAL void take_picture(char* callback_url)
+
+
+
+RHO_GLOBAL void take_picture(char* callback_url, rho_param *options_hash )
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_CAMERA);
     if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "takePicture", "(Ljava/lang/String;)V");
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "takePicture", "(Ljava/lang/String;Ljava/lang/Object;)V");
     if (!mid) return;
-    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(callback_url).get());
+
+    if ((options_hash != NULL) && (options_hash->type != RHO_PARAM_HASH)) {
+        RAWLOG_ERROR("Unexpected parameter type, should be Hash");
+        return;
+    }
+
+    jobject paramsObj = NULL;
+    if (options_hash != NULL) { 
+         paramsObj = RhoValueConverter(env).createObject(options_hash);
+    }
+    
+    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(callback_url).get(), paramsObj);
+
+    if (options_hash != NULL) { 
+         env->DeleteLocalRef(paramsObj);
+    }
+
 }
 
 RHO_GLOBAL void choose_picture(char* callback_url)
@@ -34,3 +85,29 @@ RHO_GLOBAL void choose_picture(char* callback_url)
     env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(callback_url).get());
 }
 
+RHO_GLOBAL VALUE get_camera_info(const char* camera_type) {
+    
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_CAMERA);
+    if (!cls) return rho_ruby_get_NIL();
+    jmethodID mid_w = getJNIClassStaticMethod(env, cls, "getMaxCameraWidth", "(Ljava/lang/String;)I");
+    jmethodID mid_h = getJNIClassStaticMethod(env, cls, "getMaxCameraHeight", "(Ljava/lang/String;)I");
+    if ((!mid_w) || (!mid_h)) return rho_ruby_get_NIL();
+    int w = env->CallStaticIntMethod(cls, mid_w, rho_cast<jhstring>(camera_type).get());
+    int h = env->CallStaticIntMethod(cls, mid_h, rho_cast<jhstring>(camera_type).get());
+    
+    if ((w <= 0) || (h <= 0)) {
+        return rho_ruby_get_NIL();
+    }
+
+    VALUE hash = rho_ruby_createHash();
+    
+    VALUE hash_max_resolution = rho_ruby_createHash();
+    
+    rho_ruby_add_to_hash(hash_max_resolution, rho_ruby_create_string("width"), rho_ruby_create_integer(w));
+    rho_ruby_add_to_hash(hash_max_resolution, rho_ruby_create_string("height"), rho_ruby_create_integer(h));
+
+    rho_ruby_add_to_hash(hash, rho_ruby_create_string("max_resolution"), hash_max_resolution);
+    
+    return hash;
+}

data/platform/android/Rhodes/jni/src/datetimepicker.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_datetime_DateTimePicker.h"

data/platform/android/Rhodes/jni/src/event.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 <ruby.h>
 #include <ruby/ext/calendar/event.h>

data/platform/android/Rhodes/jni/src/fileapi.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
+*------------------------------------------------------------------------*/
+
 //#define RHO_ENABLE_LOG
 #include "rhodes/JNIRhodes.h"
 
@@ -18,6 +44,19 @@
   errno = EACCES; \
   return -1
 
+//#define RHO_ENABLE_LOG
+#if defined(OS_ANDROID) && defined(RHO_ENABLE_LOG)
+#include <android/log.h>
+#define RHO_LOG(fmt, ...) \
+  __android_log_print(ANDROID_LOG_INFO, "RHO_LOG", "%s:%d: thread %08lx: " fmt, __FILE__, __LINE__, \
+      (unsigned long)pthread_self(), ##__VA_ARGS__)
+
+#else // OS_ANDROID
+#define RHO_LOG(...)
+#endif // OS_ANDROID
+
+#define RHO_TRACE_POINT RHO_LOG("trace point")
+
 enum rho_fileapi_type_t
 {
     rho_type_file,
@@ -161,6 +200,13 @@ static func_scandir_t real_scandir;
 
 struct stat librhodes_st;
 
+static std::string g_apk_path;
+
+std::string const &rho_apk_path()
+{
+    return g_apk_path;
+}
+
 static bool has_pending_exception()
 {
     JNIEnv *env = jnienv();
@@ -203,6 +249,13 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_updateStatTabl
     }
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInitPath
+  (JNIEnv *env, jclass, jstring root_path, jstring sqlite_journals_path, jstring apk_path)
+{
+    android_set_path(rho_cast<std::string>(env, root_path), rho_cast<std::string>(env, sqlite_journals_path));
+    g_apk_path = (apk_path != NULL) ? rho_cast<std::string>(env, apk_path) : std::string();
+}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
   (JNIEnv *env, jclass)
 {
@@ -238,10 +291,17 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
     real_mkdir = (func_mkdir_t)dlsym(pc, "mkdir");
     real_fchdir = (func_fchdir_t)dlsym(pc, "fchdir");
     real_fcntl = (func_fcntl_t)dlsym(pc, "fcntl");
+    real_fsync = (func_fsync_t)dlsym(pc, "fsync");
     real_fdatasync = (func_fdatasync_t)dlsym(pc, "fdatasync");
+
+    if (real_fdatasync == NULL) {
+        //Android 2.1 have no fdatasync call. Use fsync instead
+        RHO_LOG("No fdatasync implementation, using fsync instead");
+        real_fdatasync = real_fsync;
+    }
+
     real_flock = (func_flock_t)dlsym(pc, "flock");
     real_fstat = (func_fstat_t)dlsym(pc, "fstat");
-    real_fsync = (func_fsync_t)dlsym(pc, "fsync");
     real_ftruncate = (func_ftruncate_t)dlsym(pc, "ftruncate");
     real_lseek = (func_lseek_t)dlsym(pc, "lseek");
     real_lseek64 = (func_lseek64_t)dlsym(pc, "lseek64");
@@ -266,11 +326,15 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
 
     // This is just to get typical stat of file
     std::string librhodes = rho_root_path() + "../lib/librhodes.so";
+    RHO_LOG("Native library: %s", librhodes.c_str());
+
     real_stat(librhodes.c_str(), &librhodes_st);
     librhodes_st.st_mode = S_IFREG|S_IRWXU;
     librhodes_st.st_nlink = 1;
     librhodes_st.st_uid = getuid();
     librhodes_st.st_gid = getgid();
+
+    RHO_LOG("Library stat (mode: %d, uid: %d, gid: %d)", librhodes_st.st_mode, librhodes_st.st_uid, librhodes_st.st_gid);
 }
 
 static std::string normalize_path(std::string path)
@@ -347,7 +411,7 @@ static std::string make_full_path(std::string const &path)
 static std::string make_rel_path(std::string const &fpath)
 {
     std::string const &root_path = rho_root_path();
-    return fpath.substr(root_path.size());
+    return (fpath.find(root_path) == 0) ? fpath.substr(root_path.size()) : fpath;
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_makeRelativePath

data/platform/android/Rhodes/jni/src/geolocation.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_geolocation_GeoLocationImpl.h"

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

@@ -1,89 +1,104 @@
+/*------------------------------------------------------------------------
+* (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_RhoLogConf.h"
 
-#include <common/RhodesApp.h>
+#include <logging/RhoLogConf.h>
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoLogConf_getEnabledCategories
-  (JNIEnv *env, jobject)
+  (JNIEnv *env, jclass)
 {
-    return rho_cast<jhstring>(LOGCONF().getEnabledCategories().c_str()).release();
+    return rho_cast<jhstring>(env, LOGCONF().getEnabledCategories().c_str()).release();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_setEnabledCategories
-  (JNIEnv *env, jobject, jstring value)
+  (JNIEnv *env, jclass, jstring value)
 {
     if (value == NULL)
         return;
-    LOGCONF().setEnabledCategories(rho_cast<std::string>(value).c_str());
+    LOGCONF().setEnabledCategories(rho_cast<std::string>(env, value).c_str());
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoLogConf_getDisabledCategories
-  (JNIEnv *env, jobject)
+  (JNIEnv *env, jclass)
 {
-    return rho_cast<jhstring>(LOGCONF().getDisabledCategories().c_str()).release();
+    return rho_cast<jhstring>(env, LOGCONF().getDisabledCategories().c_str()).release();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_setDisabledCategories
-  (JNIEnv *env, jobject, jstring value)
+  (JNIEnv *env, jclass, jstring value)
 {
     if (value == NULL)
         return;
-    LOGCONF().setDisabledCategories(rho_cast<std::string>(value).c_str());
+    LOGCONF().setDisabledCategories(rho_cast<std::string>(env, value).c_str());
 }
 
 RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_RhoLogConf_getMinSeverity
-  (JNIEnv *, jobject)
+  (JNIEnv *, jclass)
 {
     return LOGCONF().getMinSeverity();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_setMinSeverity
-  (JNIEnv *, jobject, jint severity)
+  (JNIEnv *, jclass, jint severity)
 {
     LOGCONF().setMinSeverity(severity);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_saveToFile
-  (JNIEnv *, jobject)
+  (JNIEnv *, jclass)
 {
     LOGCONF().saveToFile();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_clearLog
-  (JNIEnv *, jobject)
+  (JNIEnv *, jclass)
 {
     LOGCONF().clearLog();
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoLogConf_getLogText
-  (JNIEnv *env, jobject)
+  (JNIEnv *env, jclass)
 {
     rho::String logText;
     LOGCONF().getLogText(logText);
-    return rho_cast<jhstring>(logText.c_str()).release();
+    return rho_cast<jhstring>(env, logText.c_str()).release();
 }
 
 RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_RhoLogConf_getLogTextPos
-  (JNIEnv *, jobject)
+  (JNIEnv *, jclass)
 {
     return LOGCONF().getLogTextPos();
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_sendLog
-  (JNIEnv *, jobject)
+  (JNIEnv *, jclass)
 {
-    rho_conf_send_log();
-}
-
-RHO_GLOBAL void rho_conf_show_log()
-{
-    JNIEnv *env = jnienv();
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
-    if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "showLogView", "()V");
-    if (!mid) return;
-
-    env->CallStaticVoidMethod(cls, mid);
+    rho_conf_send_log("");
 }