rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/android/Rhodes/jni/include/rhodes.h

@@ -0,0 +1,59 @@
+#ifndef _RHODES_H_D9BFC7B4FD394BECAF7EC535453253CC
+#define _RHODES_H_D9BFC7B4FD394BECAF7EC535453253CC
+
+#include <jni.h>
+#include <string>
+
+JNIEnv *jnienv();
+
+namespace details
+{
+
+template <typename T, typename U>
+struct rho_cast_helper;
+
+template <>
+struct rho_cast_helper<std::string, jstring>
+{
+    std::string operator()(JNIEnv *env, jstring );
+};
+
+template <>
+struct rho_cast_helper<jstring, char const *>
+{
+    jstring operator()(JNIEnv *env, char const *);
+};
+
+template <>
+struct rho_cast_helper<jstring, char *>
+{
+    jstring operator()(JNIEnv *env, char *s) {return rho_cast_helper<jstring, char const *>()(env, s);}
+};
+
+template <int N>
+struct rho_cast_helper<jstring, char [N]>
+{
+    jstring operator()(JNIEnv *env, char (&s)[N]) {return rho_cast_helper<jstring, char const *>()(env, &s[0]);}
+};
+
+template <>
+struct rho_cast_helper<jstring, std::string>
+{
+    jstring operator()(JNIEnv *env, std::string const &s) {return rho_cast_helper<jstring, char const *>()(env, s.c_str());}
+};
+
+} // namespace details
+
+template <typename T, typename U>
+T rho_cast(JNIEnv *env, U u)
+{
+    return details::rho_cast_helper<T, U>()(env, u);
+}
+
+template <typename T, typename U>
+T rho_cast(U u)
+{
+    return details::rho_cast_helper<T, U>()(jnienv(), u);
+}
+
+#endif // _RHODES_H_D9BFC7B4FD394BECAF7EC535453253CC

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

@@ -1,9 +1,9 @@
 #include <net/CURLNetRequest.h>
 #include <common/PosixThreadImpl.h>
 
-#include "RhoClassFactory.h"
-#include "SystemInfoImpl.h"
-#include "sslimpl.h"
+#include "rhodes/RhoClassFactory.h"
+#include "rhodes/SystemInfoImpl.h"
+#include "rhodes/sslimpl.h"
 
 namespace rho
 {

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_alert_Alert.h>
+#include "rhodes/jni/com_rhomobile_rhodes_alert_Alert.h"
 
 #include <common/rhoparams.h>
 #include <common/RhodesApp.h>

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

@@ -1,7 +1,8 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include "RhoClassFactory.h"
-#include "ruby/ext/rho/rhoruby.h"
+#include "rhodes/RhoClassFactory.h"
+
+#include <ruby/ext/rho/rhoruby.h>
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Callbacks"

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_camera_Camera.h>
+#include "rhodes/jni/com_rhomobile_rhodes_camera_Camera.h"
 
 #include <common/RhodesApp.h>
 

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_datetime_DateTimePicker.h>
+#include "rhodes/jni/com_rhomobile_rhodes_datetime_DateTimePicker.h"
 
 #include <common/RhodesApp.h>
 

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h>
+#include "rhodes/jni/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h"
 
 #include "rubyext/GeoLocation.h"
 

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_RhoLogConf.h>
+#include "rhodes/jni/com_rhomobile_rhodes_RhoLogConf.h"
 
 #include <common/RhodesApp.h>
 

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_Logger.h>
+#include "rhodes/jni/com_rhomobile_rhodes_Logger.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Logger"

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/rhoparams.h>
 

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_RhoMenu.h>
+#include "rhodes/jni/com_rhomobile_rhodes_RhoMenu.h"
 
 #include <common/RhodesApp.h>
 #include <common/AppMenu.h>

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/rhoparams.h>
 

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/rhoparams.h>
 
@@ -7,10 +7,24 @@
 
 RHO_GLOBAL void create_navbar(rho_param *p)
 {
-    RHO_NOT_IMPLEMENTED;
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_NAVBAR);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "create", "(Ljava/util/Vector;)V");
+    if (!mid) return;
+
+    jobject paramsObj = RhoValueConverter(env).createObject(p);
+    env->CallStaticVoidMethod(cls, mid, paramsObj);
+    env->DeleteLocalRef(paramsObj);
 }
 
 RHO_GLOBAL void remove_navbar()
 {
-    RHO_NOT_IMPLEMENTED;
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_NAVBAR);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "remove", "()V");
+    if (!mid) return;
+
+    env->CallStaticVoidMethod(cls, mid);
 }

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Phonebook"

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

@@ -1,6 +1,6 @@
-#include <jni/com_rhomobile_rhodes_RhoConf.h>
+#include "rhodes/jni/com_rhomobile_rhodes_RhoConf.h"
 
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/RhoConf.h>
 

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

@@ -1,6 +1,6 @@
 #include <android/log.h>
 
-#include <jni/com_rhomobile_rhodes_Rhodes.h>
+#include "rhodes/jni/com_rhomobile_rhodes_Rhodes.h"
 
 #include <common/RhoConf.h>
 #include <logging/RhoLogConf.h>
@@ -9,14 +9,14 @@
 
 #include <sys/stat.h>
 
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Rhodes"
 
 const char *rho_java_class[] = {
 #define RHODES_DEFINE_JAVA_CLASS(x, name) name,
-#include <details/rhojava.inc>
+#include <rhodes/details/rhojava.inc>
 #undef RHODES_DEFINE_JAVA_CLASS
 };
 

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Ringtone"

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

@@ -1,6 +1,6 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_socket_RhoSocketImpl.h>
+#include "rhodes/jni/com_rhomobile_rhodes_socket_RhoSocketImpl.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoSocketImpl"

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

@@ -1,6 +1,6 @@
-#include <jni/com_rhomobile_rhodes_SplashScreen.h>
+#include "rhodes/jni/com_rhomobile_rhodes_SplashScreen.h"
 
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/RhodesApp.h>
 

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

@@ -1,7 +1,7 @@
-#include "sslimpl.h"
-#include "JNIRhodes.h"
+#include "rhodes/sslimpl.h"
+#include "rhodes/JNIRhodes.h"
 
-#include <jni/com_rhomobile_rhodes_socket_SSLImpl.h>
+#include "rhodes/jni/com_rhomobile_rhodes_socket_SSLImpl.h"
 
 #include <arpa/inet.h>
 

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

@@ -1,7 +1,7 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <sync/SyncThread.h>
-#include "RhoClassFactory.h"
+#include "rhodes/RhoClassFactory.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoSync"

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

@@ -1,4 +1,4 @@
-#include "JNIRhodes.h"
+#include "rhodes/JNIRhodes.h"
 
 #include <common/RhodesApp.h>
 
@@ -41,17 +41,7 @@ RHO_GLOBAL void rho_webview_navigate_back()
 
 RHO_GLOBAL const char* rho_webview_current_location(int index)
 {
-    static std::string curLoc;
-
-    JNIEnv *env = jnienv();
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
-    if (!cls) return NULL;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "currentLocation", "(I)Ljava/lang/String;");
-    if (!mid) return NULL;
-
-    jstring str = (jstring)env->CallStaticObjectMethod(cls, mid, index);
-    curLoc = rho_cast<std::string>(str);
-    return curLoc.c_str();
+    return rho_rhodesapp_getcurrenturl(index);
 }
 
 RHO_GLOBAL void rho_webview_set_menu_items(VALUE valMenu)
@@ -91,3 +81,16 @@ RHO_GLOBAL void rho_webview_full_screen_mode(int enable)
 {
     //TODO: rho_webview_full_screen_mode
 }
+
+RHO_GLOBAL void rho_webview_set_cookie(const char *url, const char *cookie)
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_WEB_VIEW);
+    if (!cls) return;
+    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);
+}

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

@@ -0,0 +1,11 @@
+package com.rhomobile.rhodes;
+
+public class NativeLibraries {
+
+	public static void load() {
+		// Load native implementation of rhodes
+		System.loadLibrary("rhodes");
+		// Load native .so libraries
+	}
+	
+}

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

@@ -0,0 +1,52 @@
+package com.rhomobile.rhodes;
+
+import java.util.Vector;
+
+public class NavBar {
+
+	private static final String TAG = "NavBar";
+	
+	private static class CreateTask implements Runnable {
+		
+		private String title;
+		private Vector<Object> left;
+		private Vector<Object> right;
+		
+		public CreateTask(Vector<Object> p) {
+			// TODO: implement
+		}
+		
+		public void run() {
+			// TODO: implement
+		}
+	};
+	
+	private static class RemoveTask implements Runnable {
+		public void run() {
+			// TODO: implement
+		}
+	};
+	
+	private static void reportFail(String name, Exception e) {
+		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
+	}
+	
+	public static void create(Vector<Object> params) {
+		try {
+			Rhodes.performOnUiThread(new CreateTask(params), false);
+		}
+		catch (Exception e) {
+			reportFail("create", e);
+		}
+	}
+	
+	public static void remove() {
+		try {
+			Rhodes.performOnUiThread(new RemoveTask(), false);
+		}
+		catch (Exception e) {
+			reportFail("remove", e);
+		}
+	}
+	
+}

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

@@ -648,6 +648,11 @@ public class Rhodes extends Activity {
 		return locale;
 	}
 	
+	private static String getCurrentCountry() {
+		String cl = Locale.getDefault().getCountry();
+		return cl;
+	}
+	
 	public static int getScreenWidth() {
 		return screenWidth;
 	}
@@ -661,6 +666,8 @@ public class Rhodes extends Activity {
 			return "ANDROID";
 		else if (name.equalsIgnoreCase("locale"))
 			return getCurrentLocale();
+		else if (name.equalsIgnoreCase("country"))
+			return getCurrentCountry();
 		else if (name.equalsIgnoreCase("screen_width"))
 			return new Integer(getScreenWidth());
 		else if (name.equalsIgnoreCase("screen_height"))
@@ -699,7 +706,6 @@ public class Rhodes extends Activity {
 	}
 	
 	static {
-		// Load native implementation of rhodes
-		System.loadLibrary("rhodes");
+		NativeLibraries.load();
 	}
 }

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

@@ -20,6 +20,8 @@
  */
 package com.rhomobile.rhodes;
 
+import android.webkit.CookieManager;
+
 public class WebView {
 	
 	private static final String TAG = "WebView";
@@ -62,21 +64,6 @@ public class WebView {
 		}
 	};
 	
-	private static class LocationTask implements Runnable {
-		private int index;
-		private StringBuffer loc;
-		
-		public LocationTask(int i, StringBuffer l) {
-			index = i;
-			loc = l;
-		}
-		
-		public void run() {
-			loc.delete(0, -1);
-			loc.append(RhodesInstance.getInstance().getMainView().currentLocation(index));
-		} 
-	};
-	
 	private static class IntHolder {
 		public int value;
 	};
@@ -92,6 +79,21 @@ public class WebView {
 			ret.value = RhodesInstance.getInstance().getMainView().activeTab();
 		}
 	};
+	
+	private static class SetCookieTask implements Runnable {
+		private String url;
+		private String cookie;
+		
+		public SetCookieTask(String u, String c) {
+			url = u;
+			cookie = c;
+		}
+		
+		public void run() {
+			CookieManager mgr = CookieManager.getInstance();
+			mgr.setCookie(url, cookie);
+		}
+	};
 
 	public static void navigate(String url, int index) {
 		try {
@@ -120,19 +122,6 @@ public class WebView {
 		}
 	}
 	
-	public static String currentLocation(int index) {
-		try {
-			StringBuffer loc = new StringBuffer();
-			Rhodes.performOnUiThread(new LocationTask(index, loc), true);
-			return loc.toString();
-		}
-		catch (Exception e) {
-			reportFail("currentLocation", e);
-		}
-		
-		return "";
-	}
-	
 	public static int activeTab() {
 		try {
 			IntHolder v = new IntHolder();
@@ -156,4 +145,13 @@ public class WebView {
 		
 		return "";
 	}
+	
+	public static void setCookie(String url, String cookie) {
+		try {
+			Rhodes.performOnUiThread(new SetCookieTask(url, cookie), false);
+		}
+		catch (Exception e) {
+			reportFail("setCookie", e);
+		}
+	}
 }

data/platform/android/build/RhodesSRC_build.files

@@ -1,41 +1,40 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
@@ -44,3 +43,5 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java