rhodes 1.5.5 → 2.0.0.beta1

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

@@ -6,7 +6,7 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Callbacks"
 
-extern "C" void webview_navigate(char* url, int index);
+extern "C" void rho_webview_navigate(const char* url, int index);
 
 namespace rho
 {
@@ -25,7 +25,7 @@ RHO_GLOBAL void rho_map_location(char* query)
 {
     rho::String url = "http://maps.google.com/?";
     url += query;
-    webview_navigate((char*)url.c_str(), 0);
+    rho_webview_navigate(url.c_str(), 0);
 }
 
 RHO_GLOBAL void rho_appmanager_load( void* /*httpContext*/, const char* /*szQuery*/)
@@ -64,12 +64,7 @@ RHO_GLOBAL VALUE rho_sys_makephonecall(const char* callname, int nparams, char**
 
 RHO_GLOBAL void rho_net_impl_network_indicator(int enable)
 {
-    JNIEnv *env = jnienv();
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES);
-    if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "showNetworkIndicator", "(Z)V");
-    if (!mid) return;
-    env->CallStaticVoidMethod(cls, mid, enable);
+    // No GUI indicator on Android
 }
 
 RHO_GLOBAL void *rho_nativethread_start()
@@ -85,52 +80,87 @@ RHO_GLOBAL void rho_nativethread_end(void *)
     jvm()->DetachCurrentThread();
 }
 
-RHO_GLOBAL VALUE rho_sysimpl_get_property(char* szPropName)
+RHO_GLOBAL int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
-    VALUE nil = rho_ruby_get_NIL();
-
     JNIEnv *env = jnienv();
 
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES);
-    if (!cls) return nil;
+    if (!cls) return 0;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "getProperty", "(Ljava/lang/String;)Ljava/lang/Object;");
-    if (!mid) return nil;
+    if (!mid) return 0;
 
     jobject result = env->CallStaticObjectMethod(cls, mid, rho_cast<jstring>(szPropName));
-    if (!result) return nil;
+    if (!result) return 0;
 
     jclass clsBoolean = getJNIClass(RHODES_JAVA_CLASS_BOOLEAN);
     jclass clsInteger = getJNIClass(RHODES_JAVA_CLASS_INTEGER);
+    jclass clsFloat = getJNIClass(RHODES_JAVA_CLASS_FLOAT);
+    jclass clsDouble = getJNIClass(RHODES_JAVA_CLASS_DOUBLE);
     jclass clsString = getJNIClass(RHODES_JAVA_CLASS_STRING);
 
     if (env->IsInstanceOf(result, clsBoolean)) {
         jmethodID midValue = getJNIClassMethod(env, clsBoolean, "booleanValue", "()Z");
-        return rho_ruby_create_boolean((int)env->CallBooleanMethod(result, midValue));
+        *resValue = rho_ruby_create_boolean((int)env->CallBooleanMethod(result, midValue));
+        return 1;
     }
     else if (env->IsInstanceOf(result, clsInteger)) {
         jmethodID midValue = getJNIClassMethod(env, clsInteger, "intValue", "()I");
-        return rho_ruby_create_integer((int)env->CallIntMethod(result, midValue));
+        *resValue = rho_ruby_create_integer((int)env->CallIntMethod(result, midValue));
+        return 1;
+    }
+    else if (env->IsInstanceOf(result, clsFloat)) {
+        jmethodID midValue = getJNIClassMethod(env, clsFloat, "floatValue", "()F");
+        *resValue = rho_ruby_create_double((double)env->CallFloatMethod(result, midValue));
+        return 1;
+    }
+    else if (env->IsInstanceOf(result, clsDouble)) {
+        jmethodID midValue = getJNIClassMethod(env, clsDouble, "doubleValue", "()D");
+        *resValue = rho_ruby_create_double((double)env->CallDoubleMethod(result, midValue));
+        return 1;
     }
     else if (env->IsInstanceOf(result, clsString)) {
         jstring resStrObj = (jstring)result;
-        return rho_ruby_create_string(rho_cast<std::string>(resStrObj).c_str());
+        *resValue = rho_ruby_create_string(rho_cast<std::string>(resStrObj).c_str());
+        return 1;
     }
 
-    return nil;
+    return 0;
 }
 
 RHO_GLOBAL VALUE rho_sys_get_locale()
 {
-    return rho_sysimpl_get_property((char*)"locale");
+    VALUE res;
+    if ( rho_sysimpl_get_property((char*)"locale", &res) )
+        return res;
+
+    return rho_ruby_get_NIL();
 }
 
 RHO_GLOBAL int rho_sys_get_screen_width()
 {
-    return NUM2INT(rho_sysimpl_get_property((char*)"screen_width"));
+    VALUE res;
+    if ( rho_sysimpl_get_property((char*)"screen_width", &res) )
+        return NUM2INT(res);
+
+    return 0;
 }
 
 RHO_GLOBAL int rho_sys_get_screen_height()
 {
-    return NUM2INT(rho_sysimpl_get_property((char*)"screen_height"));
+    VALUE res;
+    if ( rho_sysimpl_get_property((char*)"screen_height", &res) )
+        return NUM2INT(res);
+
+    return 0;
+}
+
+RHO_GLOBAL void rho_sys_app_exit()
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "exit", "()V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid);
 }
 

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

@@ -1,17 +1,13 @@
 #include "JNIRhodes.h"
 
-#include "gapikey.h"
-
 #include <common/rhoparams.h>
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "MapView"
 
-extern "C" void alert_show_popup(char *);
-
 RHO_GLOBAL void mapview_create(rho_param *p)
 {
-#ifdef GOOGLE_API_KEY
+#ifdef RHO_GOOGLE_API_KEY
     JNIEnv *env = jnienv();
     jclass clsMapView = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
     if (!clsMapView) return;
@@ -24,10 +20,9 @@ RHO_GLOBAL void mapview_create(rho_param *p)
     }
 
     jobject paramsObj = RhoValueConverter(env).createObject(p);
-    env->CallStaticVoidMethod(clsMapView, midCreate, rho_cast<jstring>(GOOGLE_API_KEY), paramsObj);
+    env->CallStaticVoidMethod(clsMapView, midCreate, rho_cast<jstring>(RHO_GOOGLE_API_KEY), paramsObj);
 #else
-    const char *message = "MapView disabled";
-    alert_show_popup((char*)message);
+    RAWLOG_ERROR("MapView disabled at build time");
 #endif
 }
 

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

@@ -0,0 +1,70 @@
+#include "JNIRhodes.h"
+
+#include <jni/com_rhomobile_rhodes_RhoMenu.h>
+
+#include <common/RhodesApp.h>
+#include <common/AppMenu.h>
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "Menu"
+
+typedef rho::Vector<rho::common::CAppMenuItem> items_t;
+
+static items_t &menu_items(jlong menu)
+{
+    return *reinterpret_cast<items_t*>(menu);
+}
+
+RHO_GLOBAL jlong JNICALL Java_com_rhomobile_rhodes_RhoMenu_allocMenu
+  (JNIEnv *, jobject)
+{
+    std::auto_ptr<items_t> items(new items_t());
+    RHODESAPP().getAppMenu().copyMenuItems(*items);
+    return reinterpret_cast<jlong>(items.release());
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoMenu_deallocMenu
+  (JNIEnv *, jobject, jlong menu)
+{
+    delete &menu_items(menu);
+}
+
+RHO_GLOBAL jint JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuSize
+  (JNIEnv *, jobject, jlong menu)
+{
+    return menu_items(menu).size();
+}
+
+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());
+}
+
+RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhoMenu_getMenuItemType
+  (JNIEnv *env, jobject, jlong menu, jint idx)
+{
+    const char *s = "unknown";
+    namespace r = rho::common;
+    r::CAppMenuItem &item = menu_items(menu)[idx];
+    switch (item.m_eType)
+    {
+        case r::CAppMenuItem::emtUrl: s = "url"; break;
+        case r::CAppMenuItem::emtRefresh: s = "refresh"; break;
+        case r::CAppMenuItem::emtHome: s = "home"; break;
+        case r::CAppMenuItem::emtBack: s = "back"; break;
+        case r::CAppMenuItem::emtSync: s = "sync"; break;
+        case r::CAppMenuItem::emtOptions: s = "options"; break;
+        case r::CAppMenuItem::emtLog: s = "log"; break;
+        case r::CAppMenuItem::emtExit: s = "exit"; break;
+        case r::CAppMenuItem::emtClose: s = "close"; break;
+    }
+    return rho_cast<jstring>(env, s);
+}
+
+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());
+}
+

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

@@ -0,0 +1,16 @@
+#include "JNIRhodes.h"
+
+#include <common/rhoparams.h>
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NavBar"
+
+RHO_GLOBAL void create_navbar(rho_param *p)
+{
+    RHO_NOT_IMPLEMENTED;
+}
+
+RHO_GLOBAL void remove_navbar()
+{
+    RHO_NOT_IMPLEMENTED;
+}

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

@@ -284,9 +284,35 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_makeLink
         env->ThrowNew(env->FindClass("java/lang/RuntimeException"), "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;
+}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_createRhodesApp
   (JNIEnv *env, jobject, jstring path)
 {
+    if (!set_capabilities(env)) return;
+
     g_rootPath = rho_cast<std::string>(path);
 
     // Init SQLite temp directory
@@ -371,3 +397,14 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_normalizeUrl
     return newStr;
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_navigateBack
+  (JNIEnv *, jclass)
+{
+    rho_rhodesapp_navigate_back();
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_loadUrl
+  (JNIEnv *, jclass, jstring str)
+{
+    rho_rhodesapp_load_url(rho_cast<std::string>(str).c_str());
+}

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

@@ -70,7 +70,7 @@ SSLImpl::SSLImpl()
     if (!cls) return;
     midConstructor = getJNIClassMethod(env, cls, "<init>", "()V");
     if (!midConstructor) return;
-    midConnect = getJNIClassMethod(env, cls, "connect", "(I)Z");
+    midConnect = getJNIClassMethod(env, cls, "connect", "(IZ)Z");
     if (!midConnect) return;
     midShutdown = getJNIClassMethod(env, cls, "shutdown", "()V");
     if (!midShutdown) return;
@@ -95,12 +95,12 @@ void SSLImpl::freeStorage(void *ptr)
     jnienv()->DeleteGlobalRef(obj);
 }
 
-CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, void *storage)
+CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)
 {
     if (!storage) return CURLE_SSL_CONNECT_ERROR;
 
     jobject obj = (jobject)storage;
-    jboolean result = jnienv()->CallBooleanMethod(obj, midConnect, sockfd);
+    jboolean result = jnienv()->CallBooleanMethod(obj, midConnect, sockfd, (jboolean)ssl_verify_peer);
     if (!result)
         return CURLE_SSL_CONNECT_ERROR;
 

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

@@ -5,7 +5,7 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "WebView"
 
-RHO_GLOBAL void webview_navigate(char* url, int index)
+RHO_GLOBAL void rho_webview_navigate(const char* url, int index)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
@@ -19,7 +19,7 @@ RHO_GLOBAL void webview_navigate(char* url, int index)
     env->DeleteLocalRef(objNormUrl);
 }
 
-RHO_GLOBAL void webview_refresh(int index)
+RHO_GLOBAL void rho_webview_refresh(int index)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
@@ -29,7 +29,17 @@ RHO_GLOBAL void webview_refresh(int index)
     env->CallStaticVoidMethod(cls, mid, index);
 }
 
-RHO_GLOBAL char* webview_current_location(int index)
+RHO_GLOBAL void rho_webview_navigate_back()
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
+    if (!cls) return;
+    jmethodID mid =getJNIClassStaticMethod(env, cls, "navigateBack", "()V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid);
+}
+
+RHO_GLOBAL const char* rho_webview_current_location(int index)
 {
     static std::string curLoc;
 
@@ -41,15 +51,15 @@ RHO_GLOBAL char* webview_current_location(int index)
 
     jstring str = (jstring)env->CallStaticObjectMethod(cls, mid, index);
     curLoc = rho_cast<std::string>(str);
-    return (char*)curLoc.c_str();
+    return curLoc.c_str();
 }
 
-RHO_GLOBAL void webview_set_menu_items(VALUE valMenu)
+RHO_GLOBAL void rho_webview_set_menu_items(VALUE valMenu)
 {
     rho_rhodesapp_setViewMenu(valMenu);
 }
 
-RHO_GLOBAL int webview_active_tab()
+RHO_GLOBAL int rho_webview_active_tab()
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
@@ -60,7 +70,7 @@ RHO_GLOBAL int webview_active_tab()
     return env->CallStaticIntMethod(cls, mid);
 }
 
-RHO_GLOBAL char* webview_execute_js(char* js, int index)
+RHO_GLOBAL const char* rho_webview_execute_js(const char* js, int index)
 {
     static std::string result;
 
@@ -77,3 +87,7 @@ RHO_GLOBAL char* webview_execute_js(char* js, int index)
     return (char*)result.c_str();
 }
 
+RHO_GLOBAL void rho_webview_full_screen_mode(int enable)
+{
+    //TODO: rho_webview_full_screen_mode
+}

data/platform/android/Rhodes/res/layout/camera.xml

@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" 
 android:layout_width="fill_parent" 
 android:layout_height="fill_parent" 
 android:orientation="vertical">
 
 <SurfaceView 
-	android:id="@+id/surface" android:layout_width="fill_parent" android:layout_height="10dip" android:layout_weight="1">
+	android:id="@+id/surface"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
 </SurfaceView>
+<ImageButton
+    android:id="@+id/cameraButton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:src="@drawable/camera"
+    android:layout_gravity="top|right"
+    android:layout_marginTop="10px"
+    android:layout_marginRight="10px"
+    android:layout_marginLeft="10px"
+    android:layout_marginBottom="10px">
+</ImageButton>
 
-</LinearLayout>
+</FrameLayout>

data/platform/android/Rhodes/res/menu/options.xml

@@ -1,12 +1,2 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:title="@string/home" android:id="@+id/navigation_home"  android:icon="@drawable/home"/>
-     <item android:title="@string/forward" android:id="@+id/navigation_forward" android:icon="@drawable/next" />
-     <item android:title="@string/back" android:id="@+id/navigation_back" android:icon="@drawable/back"/>
-     <item android:title="@string/refresh" android:id="@+id/refresh"  android:icon="@drawable/refresh"/>
-     <item android:title="@string/sync" android:icon="@drawable/sync" android:id="@+id/sync" />
-     <item android:title="@string/options" android:icon="@drawable/options" android:id="@+id/options" />
-     <item android:title="@string/about" android:icon="@drawable/info" android:id="@+id/about" />
-     <item android:title="@string/exit" android:icon="@drawable/exit" android:id="@+id/exit" />
-     <item android:title="@string/logview" android:id="@+id/logview" />
-     <item android:title="@string/logoptions" android:id="@+id/logoptions" />
 </menu>