RubyGems - rhodes - Versions diffs - 3.1.0.beta.2 → 3.1.0.beta.3 - Mend

rhodes 3.1.0.beta.2 → 3.1.0.beta.3

Files changed (82) hide show

data/doc/ui.txt CHANGED Viewed

@@ -4,61 +4,76 @@
 Rhodes supports a layout mechanism based on ERB templates. The default layout template is called "layout.erb" and is located in the application root folder.  Unless overridden, this layout is rendered on all non-Ajax requests.
-You may use layout.erb to load CSS and favorite [JavaScript frameworks](#javascript-frameworks) and libraries. Generated layout.erb loads rhomobile [CSS framework](#css-framework) and modified JQTouch library.
+You may use layout.erb to load CSS and favorite [JavaScript frameworks](#javascript-frameworks) and libraries. Generated layout.erb loads rhomobile [CSS framework](#css-framework) and jQuery Mobile library modified on the fly.
 	:::html
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-	    <title>Test</title>
-	    <meta name="viewport" content="width=device-width;
-			height=device-height; initial-scale=1.0;
-			maximum-scale=1.0; user-scalable=0;"/>
-	    <% is_bb6 = System::get_property('platform') == 'Blackberry' &&
-			(System::get_property('os_version') =~ /^6\.0/) %>
-	    <% if System::get_property('platform') == 'APPLE' ||
-			System::get_property('platform') == 'ANDROID' || is_bb6 %>
-	        <script src="/public/jqtouch/jquery.1.3.2.min.js"
-				type="text/javascript"></script>
-	        <script src="/public/jqtouch/jqtouch.js"
-				type="text/javascript"></script>
-	        <link href="/public/jqtouch/jqtouch.css"
-				type="text/css" rel="stylesheet"/>
-	        <% if System::get_property('platform') == 'APPLE' %>
-	            <link href="/public/jqtouch/jqtouch-iphone.css"
-					type="text/css" rel="stylesheet"/>
-	        <% end %>
-	        <script>$.jQTouch();</script>
-	    <% end %>
-	    <% if System::get_property('platform') == 'APPLE' %>
-	        <link href="/public/css/iphone.css"
-				type="text/css" rel="stylesheet"/>
-	    <% elsif System::get_property('platform') == 'ANDROID' %>
-	        <link href="/public/css/android.css"
-				type="text/css" rel="stylesheet"/>
-	    <% elsif is_bb6 %>
-	        <link href="/public/css/android.css"
-				type="text/css" rel="stylesheet"/>
-	    <% elsif System::get_property('platform') == 'Blackberry' %>
-	        <link href="/public/css/blackberry.css"
-				type="text/css" rel="stylesheet"/>
-	    <% else %>
-	        <link href="/public/css/windows_mobile.css"
-				type="text/css" rel="stylesheet"/>
-	    <% end %>
-	</head>
-	<body>
-	    <%= @content %>
-	</body>
-	</html>
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Test</title>
+        <% is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version').split('.')[0].to_i >= 6) %>
+        <% if is_bb6 %>
+            <meta name="viewport" content="width=device-width; height=device-height; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+        <% else %>
+            <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+        <% end %>
+        <% if System::get_property('platform') == 'WP7' %>
+            <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <% end %>
+        <% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 || ( System::get_property('platform') == 'UNKNOWN' && System::get_property('webview_framework') =~ /^WEBKIT/) %>
+            <script src="/public/jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
+            <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0b1.min.css">
+            <% if System::get_property('platform') == 'APPLE' %>
+                <link href="/public/jqmobile/jquery.mobile.iphone.css" type="text/css" rel="stylesheet"/>
+            <% end %>
+            <script type="text/javascript">
+                $(document).bind("mobileinit", function(){
+                    // jQuery-Mobile init options initialization goes here. For example, you may
+                    // enable automatically generated 'Back' buttons on headers this way:
+                    //$.mobile.page.prototype.options.addBackBtn = true;
+                    // Look for other init options here:
+                    // http://jquerymobile.com/demos/1.0b1/#/demos/1.0b1/docs/api/globalconfig.html
+                });
+            </script>
+            <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0b1.min.js"></script>
+            <script type="text/javascript" charset="utf-8" src="/public/js/jqmobile-patch.js"></script>
+        <% end %>
+        <% if System::get_property('platform') == 'APPLE' %>
+            <link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
+        <% elsif System::get_property('platform') == 'ANDROID' %>
+            <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
+        <% elsif is_bb6 %>
+            <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
+        <% elsif System::get_property('platform') == 'Blackberry' %>
+            <link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>
+        <% elsif System::get_property('platform') == 'WP7' %>
+            <link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
+        <% elsif System::get_property('platform') == 'WINDOWS' %>
+            <link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
+        <% elsif System::get_property('webview_framework') =~ /^WEBKIT/ %>
+            <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
+        <% end %>
+    </head>
+    <body
+    <% if System::get_property('platform') == 'WP7' || is_bb6 %>
+        data-do-fix-forms="true"
+    <% end %>
+        >
+        <%= @content %>
+    </body>
+    </html>
 ### Customizing Layouts
@@ -82,30 +97,25 @@ Rhodes 2.0+ includes an improved [CSS Framework](css-framework) which takes adva
 ## JavaScript frameworks
-To implement advanced UI for your Rhodes View you may consider using such JavaScript UI frameworks as [Sencha](http://www.sencha.com/), [Jquery Mobile](http://jquerymobile.com/), or [JQtouch](http://www.jqtouch.com/). Place one of these libraries in public/js folder of your application, load it in your [layout.erb](#layout), and you are ready to go.
+To implement advanced UI for your Rhodes View you may consider using such JavaScript UI frameworks as [Sencha](http://www.sencha.com/). Place one of these libraries in public/js folder of your application, load it in your [layout.erb](#layout), and you are ready to go.
+[Jquery Mobile](http://jquerymobile.com/) is supported out of the box.
-### jQTouch modifications
+### jQuery Mobile modifications
-By default, Rhodes framework uses a modified version of jQTouch version 1, beta 2. The following is a list of modifications to the jQTouch library:
+By default, Rhodes framework uses a original version of jQuery Mobile version 1, beta 2. But it is modified on the fly upon a page load event. The following is a list of modifications to the jQuery Mobile library:
 * $.support.WebKitAnimationEvent is set to true if the device is Android 2.x. The default implementation sets this to false.
 * A default timeout has been set for Ajax requests to 30 seconds.
-* The default backSelector has been changed from ".back, .cancel, .goback" to ".backButton a".
-* The default slideSelector has been changed from "body > * > ul li a" to "a". This makes every link animate with a slide transition by default.
-* Every "a" invokes liveTap; every "[type=submit]" invokes submitParentForm.
-* On document load, the Rhodes implementation of jQTouch wraps the children of the body with a DIV.
-* Fixed slide animation for Android 2.x devices. Slide transitions are handled differently than other animated transitions.
 * This implementation creates a global Rho object that contains two properties:
-	* Rho.insertAsyncPage(screenSnippet) - a function that inserts a page to the application. Screen snippet should be a string containing a DIV representing a page that in theory contains pageTitle, toolbar and content DIVs.
-	* Rho.jqt - a reference to the public jQTouch methods normally returned by instantiating jQTouch. For example, to programmatically go back a screen, you can invoke Rho.jqt.goBack().
-* Ajax requests set a 'Transition-Enabled: true' request header. This informs the controller that the request was made by a jQTouch enabled application.
-* Conversely, Ajax requests inspect for a 'Wait-Page' response header. This informs jQTouch that the page it received was returned after an asynchronous HTTP request was spawned by the controller. Wait pages are not added to the jQtouch history. The animation is then deferred until the expected page is returned to the user interface via the Rho.insertAsyncPage() call. This method is typically invoked after an async HTTP callback function has been triggered in the controller.
-* You can override the slide animated transition for forms by setting an animation class on the form like '\<form class="pop"\>...\</form\>'.
+	* Rho.insertAsyncPage(screenSnippet) - a function that inserts a page to the application. Screen snippet should be a string containing a DIV representing a page that in theory contains header, footer and content DIVs.
+	* Rho.jqm - a reference to the public jQuery Mobile, the same as jQuery.mobile or $.mobile . For example, to programmatically change a page, you can invoke Rho.jqm.changePage(). For the full jQuery Mobile API reference, see the [jQuery Mobile site](http://jquerymobile.com).
+* Ajax requests set a 'Transition-Enabled: true' request header. This informs the controller that the request was made by a jQuery Mobile enabled application.
+* Conversely, Ajax requests inspect for a 'Wait-Page' response header. This informs jQuery Mobile that the page it received was returned after an asynchronous HTTP request was spawned by the controller. Wait pages are not added to the jQuery Mobile history. The animation is then deferred until the expected page is returned to the user interface via the Rho.insertAsyncPage() call. This method is typically invoked after an async HTTP callback function has been triggered in the controller.
 ### Submit form
-If you need to submit form programmatically, please use the expression **jQT.submitForm('.current form.yourFormClass');**. Here **jQT** is defined as it shown above.  To specify the exact form on the page it is recommended to use **class** instead of **id**.
+Be careful, using expressions like **$('#form_id').submit();** with jQuery Mobile it lead to an incorrect result!
-Be careful, using expressions like **$('#form_id').submit();** with jQTouch it lead to an incorrect result!
+If you need to submit form programmatically, please use the expression like **$('.current form.yourFormClass').submit();**. To specify the exact form on the page it is recommended to use **class** instead of **id**. It is important to use *.current* class name to ddress elements on current active page.
 ## Loading screen
@@ -687,18 +697,28 @@ See controller.rb and index.erb view in the /app/DateTimeAJ folder of the [Syste
 ## Animated transitions for Webkit platforms
-Animated transitions are supported on the iPhone and Android. Rhodes uses a customized version of jQTouch to deliver transitions between screens. To enable animated transitions in your application, you must include this in your layout's head element:
+Animated transitions are supported on the iPhone, Android and Blackberry OS6 and above. Rhodes uses a customized version of jQuery Mobile to deliver transitions between screens. To enable animated transitions in your application, you must include this in your layout's head element, as it shown in [View Layouts](#view-layouts) section.
     :::html
-    <% if System::get_property('platform') == 'APPLE' ||
-		System::get_property('platform') == 'ANDROID' %>
-        <script src="/public/jqtouch/jquery.1.3.2.min.js"
-			type="text/javascript"></script>
-        <script src="/public/jqtouch/jqtouch.js"
-			type="text/javascript"></script>
-        <link href="/public/jqtouch/jqtouch.css"
-			type="text/css" rel="stylesheet"/>
-        <script>jQT = $.jQTouch();</script>
+    <% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 || ( System::get_property('platform') == 'UNKNOWN' && System::get_property('webview_framework') =~ /^WEBKIT/) %>
+        <script src="/public/jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
+        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0b1.min.css">
+        <% if System::get_property('platform') == 'APPLE' %>
+            <link href="/public/jqmobile/jquery.mobile.iphone.css" type="text/css" rel="stylesheet"/>
+        <% end %>
+        <script type="text/javascript">
+            $(document).bind("mobileinit", function(){
+                // jQuery-Mobile init options initialization goes here. For example, you may
+                // enable automatically generated 'Back' buttons on headers this way:
+                //$.mobile.page.prototype.options.addBackBtn = true;
+                // Look for other init options here:
+                // http://jquerymobile.com/demos/1.0b1/#/demos/1.0b1/docs/api/globalconfig.html
+            });
+        </script>
+        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0b1.min.js"></script>
+        <script type="text/javascript" charset="utf-8" src="/public/js/jqmobile-patch.js"></script>
     <% end %>
 Also make sure to add jqtouch_mode=1 to your application's [rhoconfig.txt](configuration#run-time-configuration). Setting this property enables animation for the back button in the bottom toolbar and hides the forward button.
@@ -713,7 +733,7 @@ If you have an older application that you'd like to add animated transitions to,
 * Go through each view template and change all the id attributes to classes. For example:
 **  &lt;div ''id="toolbar"''> should be &lt;div ''class="toolbar"''>
 **  &lt;div ''id="leftItem"'' class="regularButton"> should be &lt;div ''class="leftItem regularButton"''>
-* Copy the ''public/jqtouch'' directory from Rhodes latest to your application's ''public'' directory.
+* Copy the ''public/js/jquery'' and ''public/js/jqmobile'' directories from Rhodes latest to your application's ''public'' directory.
 * Copy the ''public/css/*.css'' files from Rhodes latest to your application's ''public/css'' directory.
 ** Alternatively, you can change all the id selectors to class selectors. You may want to go down this route if you have custom changes in your CSS file. For instance, a ''#toolbar'' selector should now be ''.toolbar''.

data/lib/extensions/barcode/Android.mk ADDED Viewed

@@ -0,0 +1,17 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE    := barcode
+LOCAL_SRC_FILES :=  ext/barcode/platform/android/jni/src/barcode.cpp \
+                    ext/barcode/shared/ruby/barcode_wrap.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+					$(PROJECT_PATH)/include \
+                    $(SHARED_PATH_INC) \
+                    $(SHARED_PATH_INC)/ruby/include \
+                    $(SHARED_PATH_INC)/ruby/linux \
+                    $(SHARED_PATH_INC)/ruby/generated
+include $(BUILD_STATIC_LIBRARY)

data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp CHANGED Viewed

@@ -1,12 +1,12 @@
 //#include "rhodes/JNIRhodes.h"
 #include <rhodes.h>
-#include <android/log.h>
+//#include <android/log.h>
 #include <common/RhodesApp.h>
-#include <logging/RhoLogConf.h>
+#include <logging/RhoLog.h>
 #include <stdlib.h>
-#define logging_enable false
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "BarcodeJNI"
 static char barcode_result[16000];
@@ -22,12 +22,20 @@ extern "C" const char* rho_barcode_barcode_recognize(const char* filename) {
     env->DeleteLocalRef(objFilename);
     if (res == NULL) {
-         return NULL;
+        RAWLOG_ERROR("Failed to recognize.");
+        return NULL;
     }
-    const char* code = env->GetStringUTFChars(res,0);
-    strcpy(barcode_result, code);
-    env->ReleaseStringUTFChars(res, code);
+    if(env->GetStringUTFLength(res) < (sizeof(barcode_result)/sizeof(barcode_result[0])))
+    {
+        const char* code = env->GetStringUTFChars(res,0);
+        strcpy(barcode_result, code);
+        env->ReleaseStringUTFChars(res, code);
+    } else
+    {
+        RAWLOG_ERROR("Recognized data is too large.");
+        return NULL;
+    }
     return barcode_result;
 }
@@ -40,11 +48,19 @@ extern "C" void rho_barcode_take_barcode(const char* callback) {
     if (!mid) return;
     jstring objCallback = env->NewStringUTF(callback);
-    env->CallStaticObjectMethod(cls, mid, objCallback);
-    env->DeleteLocalRef(objCallback);
+    if(objCallback != NULL)
+    {
+        env->CallStaticObjectMethod(cls, mid, objCallback);
+        env->DeleteLocalRef(objCallback);
+    } else
+    {
+        RAWLOG_ERROR1("Cannot take barcode, no memory: %d", strlen(callback));
+    }
 }
 RHO_GLOBAL void JNICALL Java_com_rhomobile_barcode_Barcode_callback
   (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());
+    char* url = rho_http_normalizeurl(rho_cast<std::string>(env, callback_url).c_str());
+    rho_net_request_with_data(url, rho_cast<std::string>(env, body).c_str());
+    rho_http_free(url);
 }

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivity.java CHANGED Viewed

@@ -22,6 +22,7 @@ import com.google.zxing.ResultMetadataType;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.camera.CameraManager;
+import com.rhomobile.rhodes.BaseActivity;
 import com.rhomobile.rhodes.R;
 import android.app.Activity;
@@ -80,7 +81,7 @@ import java.util.Vector;
  * @author dswitkin@google.com (Daniel Switkin)
  * @author Sean Owen
  */
-public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
+public final class CaptureActivity extends BaseActivity implements SurfaceHolder.Callback {
   private static final String TAG = CaptureActivity.class.getSimpleName();

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java CHANGED Viewed

@@ -68,14 +68,13 @@ public class Barcode {
      public static void take(String callback) {
     	 ourCallback = callback;
-    	 PerformOnUiThread.exec( new Runnable() {
-    		 public void run() {
-				RhodesActivity ra = RhodesActivity.getInstance();
+//    	 PerformOnUiThread.exec( new Runnable() {
+//    		 public void run() {
+				RhodesActivity ra = RhodesActivity.safeGetInstance();
 				Intent intent = new Intent(ra, com.google.zxing.client.android.CaptureActivity.class);
 				ra.startActivity(intent);
-    		 }
-    	 });
+//    		 }
+//    	 });
      }
    	 public static native void callback(String callbackUrl, String body);

data/lib/extensions/nfc/Android.mk ADDED Viewed

@@ -0,0 +1,18 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE    := nfc
+LOCAL_SRC_FILES :=  ext/nfc/platform/android/jni/src/nfc.cpp \
+                    ext/nfc/shared/ruby/nfc_wrap.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+					$(PROJECT_PATH)/include \
+                    $(SHARED_PATH_INC) \
+                    $(SHARED_PATH_INC)/common \
+                    $(SHARED_PATH_INC)/ruby/include \
+                    $(SHARED_PATH_INC)/ruby/linux \
+                    $(SHARED_PATH_INC)/ruby/generated
+include $(BUILD_STATIC_LIBRARY)

data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp CHANGED Viewed

@@ -1318,13 +1318,10 @@ extern "C" VALUE rho_nfc_tech_NfcV_transceive(VALUE data) {
 extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_callTechCallback
 (JNIEnv *env, jclass, jstring js_callback_url, jstring js_event)
 {
-	char url[2048];
-	char body[2048];
+    char body[2048];
-	const char* jurl = env->GetStringUTFChars(js_callback_url,0);
-	const char* jevent = env->GetStringUTFChars(js_event,0);
-	strcpy(url, jurl);
-	env->ReleaseStringUTFChars(js_callback_url, jurl);
+    std::string url = rho_cast<std::string>(env, js_callback_url);
+    const char* jevent = env->GetStringUTFChars(js_event,0);
 	strcpy(body, "&rho_callback=1");
 	strcat(body, "&");
@@ -1332,7 +1329,7 @@ extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_callTechCallback
 	strcat(body, jevent);
 	env->ReleaseStringUTFChars(js_event, jevent);
-	rho_net_request_with_data(rho_http_normalizeurl(url), body);
+    rho_net_request_with_data(RHODESAPP().canonicalizeRhoUrl(url).c_str(), body);
 }
 //  private native void callTechCallback(String callback_url, String event);
@@ -1356,24 +1353,20 @@ extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_logNative
 extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_callCallback
 (JNIEnv *env, jclass, jstring js_callback_url, jobject jo_msgpack)
 {
-	logi("native callback START");
+    logi("native callback START");
     initJavaIds(env);
-	CNFCMessagePack* messagePack = new CNFCMessagePack(env, jo_msgpack);
-	char url[2048];
-	char body[2048];
+    CNFCMessagePack* messagePack = new CNFCMessagePack(env, jo_msgpack);
-	const char* jurl = env->GetStringUTFChars(js_callback_url,0);
-	strcpy(url, jurl);
-	env->ReleaseStringUTFChars(js_callback_url, jurl);
+    std::string url = rho_cast<std::string>(env, js_callback_url);
+    char body[2048];
 	strcpy(body, "&rho_callback=1");
 	strcat(body, "&");
 	strcat(body, (RHODESAPP().addCallbackObject( new RhoCallbackNFCContainer(messagePack), "messages")).c_str());
-	rho_net_request_with_data(rho_http_normalizeurl(url), body);
+    rho_net_request_with_data(RHODESAPP().canonicalizeRhoUrl(url).c_str(), body);
 }

data/platform/android/Rhodes/jni/Android.mk CHANGED Viewed

@@ -1,321 +1,10 @@
 LOCAL_PATH := $(call my-dir)
+PROJECT_PATH := $(LOCAL_PATH)
 SHARED_PATH_INC := $(LOCAL_PATH)/../../../shared
 SHARED_PATH := ../../../shared
 include $(CLEAR_VARS)
-LOCAL_MODULE    := sqlite
-LOCAL_SRC_FILES := $(SHARED_PATH)/sqlite/sqlite3.c
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)/sqlite $(SHARED_PATH_INC)
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := curl
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/curl/lib/amigaos.c \
-    $(SHARED_PATH)/curl/lib/base64.c \
-    $(SHARED_PATH)/curl/lib/connect.c \
-    $(SHARED_PATH)/curl/lib/content_encoding.c \
-    $(SHARED_PATH)/curl/lib/cookie.c \
-    $(SHARED_PATH)/curl/lib/curl_addrinfo.c \
-    $(SHARED_PATH)/curl/lib/curl_memrchr.c \
-    $(SHARED_PATH)/curl/lib/curl_rand.c \
-    $(SHARED_PATH)/curl/lib/curl_sspi.c \
-    $(SHARED_PATH)/curl/lib/dict.c \
-    $(SHARED_PATH)/curl/lib/easy.c \
-    $(SHARED_PATH)/curl/lib/escape.c \
-    $(SHARED_PATH)/curl/lib/file.c \
-    $(SHARED_PATH)/curl/lib/formdata.c \
-    $(SHARED_PATH)/curl/lib/ftp.c \
-    $(SHARED_PATH)/curl/lib/getenv.c \
-    $(SHARED_PATH)/curl/lib/getinfo.c \
-    $(SHARED_PATH)/curl/lib/gtls.c \
-    $(SHARED_PATH)/curl/lib/hash.c \
-    $(SHARED_PATH)/curl/lib/hostares.c \
-    $(SHARED_PATH)/curl/lib/hostasyn.c \
-    $(SHARED_PATH)/curl/lib/hostip.c \
-    $(SHARED_PATH)/curl/lib/hostip4.c \
-    $(SHARED_PATH)/curl/lib/hostip6.c \
-    $(SHARED_PATH)/curl/lib/hostsyn.c \
-    $(SHARED_PATH)/curl/lib/hostthre.c \
-    $(SHARED_PATH)/curl/lib/http.c \
-    $(SHARED_PATH)/curl/lib/http_chunks.c \
-    $(SHARED_PATH)/curl/lib/http_digest.c \
-    $(SHARED_PATH)/curl/lib/http_negotiate.c \
-    $(SHARED_PATH)/curl/lib/if2ip.c \
-    $(SHARED_PATH)/curl/lib/inet_ntop.c \
-    $(SHARED_PATH)/curl/lib/inet_pton.c \
-    $(SHARED_PATH)/curl/lib/krb4.c \
-    $(SHARED_PATH)/curl/lib/krb5.c \
-    $(SHARED_PATH)/curl/lib/ldap.c \
-    $(SHARED_PATH)/curl/lib/llist.c \
-    $(SHARED_PATH)/curl/lib/md5.c \
-    $(SHARED_PATH)/curl/lib/memdebug.c \
-    $(SHARED_PATH)/curl/lib/mprintf.c \
-    $(SHARED_PATH)/curl/lib/multi.c \
-    $(SHARED_PATH)/curl/lib/netrc.c \
-    $(SHARED_PATH)/curl/lib/nonblock.c \
-    $(SHARED_PATH)/curl/lib/nss.c \
-    $(SHARED_PATH)/curl/lib/nwlib.c \
-    $(SHARED_PATH)/curl/lib/nwos.c \
-    $(SHARED_PATH)/curl/lib/parsedate.c \
-    $(SHARED_PATH)/curl/lib/progress.c \
-    $(SHARED_PATH)/curl/lib/rawstr.c \
-    $(SHARED_PATH)/curl/lib/rhossl.c \
-    $(SHARED_PATH)/curl/lib/security.c \
-    $(SHARED_PATH)/curl/lib/select.c \
-    $(SHARED_PATH)/curl/lib/sendf.c \
-    $(SHARED_PATH)/curl/lib/share.c \
-    $(SHARED_PATH)/curl/lib/slist.c \
-    $(SHARED_PATH)/curl/lib/socks.c \
-    $(SHARED_PATH)/curl/lib/socks_gssapi.c \
-    $(SHARED_PATH)/curl/lib/socks_sspi.c \
-    $(SHARED_PATH)/curl/lib/speedcheck.c \
-    $(SHARED_PATH)/curl/lib/splay.c \
-    $(SHARED_PATH)/curl/lib/ssh.c \
-    $(SHARED_PATH)/curl/lib/sslgen.c \
-    $(SHARED_PATH)/curl/lib/strdup.c \
-    $(SHARED_PATH)/curl/lib/strequal.c \
-    $(SHARED_PATH)/curl/lib/strerror.c \
-    $(SHARED_PATH)/curl/lib/strtok.c \
-    $(SHARED_PATH)/curl/lib/strtoofft.c \
-    $(SHARED_PATH)/curl/lib/telnet.c \
-    $(SHARED_PATH)/curl/lib/tftp.c \
-    $(SHARED_PATH)/curl/lib/timeval.c \
-    $(SHARED_PATH)/curl/lib/transfer.c \
-    $(SHARED_PATH)/curl/lib/url.c \
-    $(SHARED_PATH)/curl/lib/version.c
-LOCAL_C_INCLUDES := \
-    $(SHARED_PATH_INC)/curl/include \
-    $(SHARED_PATH_INC)/curl/lib \
-    $(SHARED_PATH_INC)
-LOCAL_CFLAGS := -DHAVE_CONFIG_H
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := ruby
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/ruby/array.c \
-    $(SHARED_PATH)/ruby/bignum.c \
-    $(SHARED_PATH)/ruby/blockinlining.c \
-    $(SHARED_PATH)/ruby/class.c \
-    $(SHARED_PATH)/ruby/compar.c \
-    $(SHARED_PATH)/ruby/compile.c \
-    $(SHARED_PATH)/ruby/complex.c \
-    $(SHARED_PATH)/ruby/cont.c \
-    $(SHARED_PATH)/ruby/debug.c \
-    $(SHARED_PATH)/ruby/dir.c \
-    $(SHARED_PATH)/ruby/dln.c \
-    $(SHARED_PATH)/ruby/dmyencoding.c \
-    $(SHARED_PATH)/ruby/dmyext.c \
-    $(SHARED_PATH)/ruby/enc/ascii.c \
-    $(SHARED_PATH)/ruby/enc/unicode.c \
-    $(SHARED_PATH)/ruby/enc/us_ascii.c \
-    $(SHARED_PATH)/ruby/enc/utf_8.c \
-    $(SHARED_PATH)/ruby/enum.c \
-    $(SHARED_PATH)/ruby/enumerator.c \
-    $(SHARED_PATH)/ruby/error.c \
-    $(SHARED_PATH)/ruby/eval.c \
-    $(SHARED_PATH)/ruby/ext/alert/alert_wrap.c \
-    $(SHARED_PATH)/ruby/ext/asynchttp/asynchttp_wrap.c \
-    $(SHARED_PATH)/ruby/ext/bluetooth/bluetooth_wrap.c \
-    $(SHARED_PATH)/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c \
-    $(SHARED_PATH)/ruby/ext/calendar/calendar_wrap.c \
-    $(SHARED_PATH)/ruby/ext/calendar/event_wrap.c \
-    $(SHARED_PATH)/ruby/ext/camera/camera_wrap.c \
-    $(SHARED_PATH)/ruby/ext/datetimepicker/datetimepicker_wrap.c \
-    $(SHARED_PATH)/ruby/ext/geolocation/geolocation_wrap.c \
-    $(SHARED_PATH)/ruby/ext/mapview/mapview_wrap.c \
-    $(SHARED_PATH)/ruby/ext/nativebar/nativebar_wrap.c \
-    $(SHARED_PATH)/ruby/ext/navbar/navbar_wrap.c \
-    $(SHARED_PATH)/ruby/ext/phonebook/phonebook_wrap.c \
-    $(SHARED_PATH)/ruby/ext/rho/extensions.c \
-    $(SHARED_PATH)/ruby/ext/rho/rhoruby.c \
-    $(SHARED_PATH)/ruby/ext/rho/rhosupport.c \
-    $(SHARED_PATH)/ruby/ext/rhoconf/rhoconf_wrap.c \
-    $(SHARED_PATH)/ruby/ext/ringtones/ringtones_wrap.c \
-    $(SHARED_PATH)/ruby/ext/signature/signature_wrap.c \
-    $(SHARED_PATH)/ruby/ext/socket/socket.c \
-    $(SHARED_PATH)/ruby/ext/sqlite3_api/sqlite3_api_wrap.c \
-    $(SHARED_PATH)/ruby/ext/stringio/stringio.c \
-    $(SHARED_PATH)/ruby/ext/strscan/strscan.c \
-    $(SHARED_PATH)/ruby/ext/syncengine/syncengine_wrap.c \
-    $(SHARED_PATH)/ruby/ext/system/system_wrap.c \
-    $(SHARED_PATH)/ruby/ext/webview/webview_wrap.c \
-    $(SHARED_PATH)/ruby/file.c \
-    $(SHARED_PATH)/ruby/gc.c \
-    $(SHARED_PATH)/ruby/generated/parse.c \
-    $(SHARED_PATH)/ruby/hash.c \
-    $(SHARED_PATH)/ruby/inits.c \
-    $(SHARED_PATH)/ruby/io.c \
-    $(SHARED_PATH)/ruby/iseq.c \
-    $(SHARED_PATH)/ruby/load.c \
-    $(SHARED_PATH)/ruby/marshal.c \
-    $(SHARED_PATH)/ruby/math.c \
-    $(SHARED_PATH)/ruby/miniprelude.c \
-    $(SHARED_PATH)/ruby/missing/acosh.c \
-    $(SHARED_PATH)/ruby/missing/cbrt.c \
-    $(SHARED_PATH)/ruby/missing/crypt.c \
-    $(SHARED_PATH)/ruby/missing/dup2.c \
-    $(SHARED_PATH)/ruby/missing/erf.c \
-    $(SHARED_PATH)/ruby/missing/hypot.c \
-    $(SHARED_PATH)/ruby/missing/lgamma_r.c \
-    $(SHARED_PATH)/ruby/missing/stdlib.c \
-    $(SHARED_PATH)/ruby/missing/strlcat.c \
-    $(SHARED_PATH)/ruby/missing/strlcpy.c \
-    $(SHARED_PATH)/ruby/missing/tgamma.c \
-    $(SHARED_PATH)/ruby/newline.c \
-    $(SHARED_PATH)/ruby/numeric.c \
-    $(SHARED_PATH)/ruby/object.c \
-    $(SHARED_PATH)/ruby/pack.c \
-    $(SHARED_PATH)/ruby/proc.c \
-    $(SHARED_PATH)/ruby/process.c \
-    $(SHARED_PATH)/ruby/random.c \
-    $(SHARED_PATH)/ruby/range.c \
-    $(SHARED_PATH)/ruby/rational.c \
-    $(SHARED_PATH)/ruby/re.c \
-    $(SHARED_PATH)/ruby/regcomp.c \
-    $(SHARED_PATH)/ruby/regenc.c \
-    $(SHARED_PATH)/ruby/regerror.c \
-    $(SHARED_PATH)/ruby/regexec.c \
-    $(SHARED_PATH)/ruby/regparse.c \
-    $(SHARED_PATH)/ruby/regsyntax.c \
-    $(SHARED_PATH)/ruby/ruby.c \
-    $(SHARED_PATH)/ruby/safe.c \
-    $(SHARED_PATH)/ruby/signal.c \
-    $(SHARED_PATH)/ruby/sprintf.c \
-    $(SHARED_PATH)/ruby/st.c \
-    $(SHARED_PATH)/ruby/strftime.c \
-    $(SHARED_PATH)/ruby/string.c \
-    $(SHARED_PATH)/ruby/struct.c \
-    $(SHARED_PATH)/ruby/thread.c \
-    $(SHARED_PATH)/ruby/time.c \
-    $(SHARED_PATH)/ruby/transcode.c \
-    $(SHARED_PATH)/ruby/util.c \
-    $(SHARED_PATH)/ruby/variable.c \
-    $(SHARED_PATH)/ruby/version.c \
-    $(SHARED_PATH)/ruby/vm.c \
-    $(SHARED_PATH)/ruby/vm_dump.c
-LOCAL_C_INCLUDES := \
-    $(SHARED_PATH_INC)/ruby/include \
-    $(SHARED_PATH_INC)/ruby/linux \
-    $(SHARED_PATH_INC)/ruby/generated \
-    $(SHARED_PATH_INC)/ruby/ \
-    $(SHARED_PATH_INC) \
-    $(SHARED_PATH_INC)/sqlite
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := json
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/json/JSONIterator.cpp \
-    $(SHARED_PATH)/json/RJSONTokener.c \
-    $(SHARED_PATH)/json/arraylist.c \
-    $(SHARED_PATH)/json/json_debug.c \
-    $(SHARED_PATH)/json/json_object.c \
-    $(SHARED_PATH)/json/json_tokener.c \
-    $(SHARED_PATH)/json/json_util.c \
-    $(SHARED_PATH)/json/linkhash.c \
-    $(SHARED_PATH)/json/printbuf.c
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)/json $(SHARED_PATH_INC)
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := rholog
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/logging/RhoLogConf.cpp \
-    $(SHARED_PATH)/logging/RhoLog.cpp \
-    $(SHARED_PATH)/logging/RhoLogSink.cpp \
-    $(SHARED_PATH)/logging/RhoPlainLog.cpp
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := rhomain
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/common/RhodesApp.cpp \
-    $(SHARED_PATH)/common/RhodesAppBase.cpp
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := rhocommon
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/common/app_build_configs.c \
-    $(SHARED_PATH)/common/AppMenu.cpp \
-    $(SHARED_PATH)/common/map/ESRIMapEngine.cpp \
-    $(SHARED_PATH)/common/map/GoogleMapEngine.cpp \
-    $(SHARED_PATH)/common/map/MapEngine.cpp \
-    $(SHARED_PATH)/common/PosixThreadImpl.cpp \
-    $(SHARED_PATH)/common/RhoConf.cpp \
-    $(SHARED_PATH)/common/RhoFile.cpp \
-    $(SHARED_PATH)/common/RhoMath.cpp \
-    $(SHARED_PATH)/common/rhoparams.cpp \
-    $(SHARED_PATH)/common/RhoThread.cpp \
-    $(SHARED_PATH)/common/SplashScreen.cpp \
-    $(SHARED_PATH)/common/ThreadQueue.cpp \
-    $(SHARED_PATH)/common/Tokenizer.cpp \
-    $(SHARED_PATH)/common/RhoTime.cpp \
-    $(SHARED_PATH)/net/AsyncHttp.cpp \
-    $(SHARED_PATH)/net/CURLNetRequest.cpp \
-    $(SHARED_PATH)/net/HttpServer.cpp \
-    $(SHARED_PATH)/net/ssl.cpp \
-    $(SHARED_PATH)/net/URI.cpp \
-    $(SHARED_PATH)/net/INetRequest.cpp \
-    $(SHARED_PATH)/rubyext/GeoLocation.cpp \
-    $(SHARED_PATH)/rubyext/RhoAppAdapter.cpp \
-    $(SHARED_PATH)/rubyext/System.cpp \
-    $(SHARED_PATH)/statistic/RhoProfiler.cpp \
-    $(SHARED_PATH)/unzip/unzip.cpp
-LOCAL_C_INCLUDES := \
-    $(SHARED_PATH_INC) \
-    $(SHARED_PATH_INC)/curl/include \
-    $(SHARED_PATH_INC)/ruby/include \
-    $(SHARED_PATH_INC)/ruby/linux
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := rhodb
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/db/DBAdapter.cpp \
-    $(SHARED_PATH)/db/DBAttrManager.cpp \
-    $(SHARED_PATH)/db/DBResult.cpp
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)/db $(SHARED_PATH_INC) $(SHARED_PATH_INC)/sqlite
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := rhosync
-LOCAL_SRC_FILES := \
-    $(SHARED_PATH)/sync/ClientRegister.cpp \
-    $(SHARED_PATH)/sync/SyncEngine.cpp \
-    $(SHARED_PATH)/sync/SyncNotify.cpp \
-    $(SHARED_PATH)/sync/SyncSource.cpp \
-    $(SHARED_PATH)/sync/SyncThread.cpp
-LOCAL_C_INCLUDES := $(SHARED_PATH_INC)/sync $(SHARED_PATH_INC) $(SHARED_PATH_INC)/sqlite
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
 LOCAL_MODULE    := rhodes
 LOCAL_SRC_FILES := \
     src/RhoClassFactory.cpp \
@@ -346,7 +35,8 @@ LOCAL_SRC_FILES := \
     src/splashscreen.cpp \
     src/sslimpl.cpp \
     src/webview.cpp \
-    src/rhocryptimpl.cpp
+    src/rhocryptimpl.cpp \
+    rainbow_stab.cpp
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
@@ -358,8 +48,29 @@ LOCAL_C_INCLUDES := \
     $(SHARED_PATH_INC)/curl/include \
     $(SHARED_PATH_INC)/sqlite
-LOCAL_STATIC_LIBRARIES := ruby json rhomain rhocommon rhodb rhosync curl sqlite rholog rhocommon
+LOCAL_STATIC_LIBRARIES := \
+	ruby rhorubyext json rhomain rhocommon rhodb rhoconnect rhonet curl sqlite rholog \
+	rhocommon rhonet rhostat rhorubyext \
+	unzip barcode nfc
 LOCAL_LDLIBS := -llog -ldl -lz
 include $(BUILD_SHARED_LIBRARY)
+#include $(LOCAL_PATH)/../../../../lib/extensions/barcode/ext/barcode/platform/android/jni/Android.mk
+NDK_MODULE_PATH := $(SHARED_PATH_INC)
+$(call import-module,sqlite)
+$(call import-module,curl)
+$(call import-module,ruby)
+$(call import-module,rubyext)
+$(call import-module,json)
+$(call import-module,logging)
+$(call import-module,common)
+$(call import-module,net)
+$(call import-module,statistic)
+$(call import-module,unzip)
+$(call import-module,db)
+$(call import-module,sync)
+$(call import-module,barcode)
+$(call import-module,nfc)