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

data/platform/android/Rhodes/jni/rainbow_stab.cpp

@@ -0,0 +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
+*------------------------------------------------------------------------*/
+
+extern "C" void Init_Rainbow() {
+	//Just stab for eclipse project
+};
+
+

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

@@ -42,21 +42,17 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Bluetooth"
 
-
 #include "rhodes/jni/com_rhomobile_rhodes_bluetooth_RhoBluetoothManager.h"
 
 #include <common/RhodesApp.h>
 #include "ruby/ext/rho/rhoruby.h"
 
-
-
-
-
-
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_bluetooth_RhoBluetoothManager_onCallback
-  (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());
+  (JNIEnv *env, jclass, jstring callback_url, jstring body)
+{
+    rho_net_request_with_data(
+            RHODESAPP().canonicalizeRhoUrl(rho_cast<std::string>(env, callback_url)).c_str(),
+            rho_cast<std::string>(env, body).c_str());
 }
 
 

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

@@ -34,21 +34,14 @@
 #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_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());
+  (JNIEnv *env, jclass, jstring callback_url, jstring body)
+{
+    rho_net_request_with_data(
+            RHODESAPP().canonicalizeRhoUrl(rho_cast<std::string>(env, callback_url)).c_str(),
+            rho_cast<std::string>(env, body).c_str());
 }
 
-
-
-
 RHO_GLOBAL void take_picture(char* callback_url, rho_param *options_hash )
 {
     JNIEnv *env = jnienv();

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

@@ -1387,15 +1387,16 @@ RHO_GLOBAL DIR *opendir(const char *dirpath)
     DIR *dirp = NULL;
     if (emulate)
     {
-        struct stat st;
-        if (::stat(fpath.c_str(), &st) == -1)
-            return NULL;
-        if (!S_ISDIR(st.st_mode))
         {
-            errno = ENOTDIR;
-            return NULL;
+            struct stat st;
+            if (::stat(fpath.c_str(), &st) == -1)
+                return NULL;
+            if (!S_ISDIR(st.st_mode))
+            {
+                errno = ENOTDIR;
+                return NULL;
+            }
         }
-
         std::vector<std::string> children;
         children.push_back(".");
         children.push_back("..");

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

@@ -187,6 +187,7 @@ void AndroidImage::init(JNIEnv *env)
 
     m_width = env->CallIntMethod(*m_bitmap, midWidth);
     m_height = env->CallIntMethod(*m_bitmap, midHeight);
+    
 }
 
 AndroidImage::~AndroidImage()
@@ -231,6 +232,9 @@ void AndroidDrawingContext::drawImage(int x, int y, IDrawingImage *image)
 
     env->CallVoidMethod(m_device, mid, m_canvas, x, y, bitmap);
 
+    /////
+    env->DeleteLocalRef(cls);
+    
     RHO_MAP_TRACE("drawImage done");
 }
 
@@ -247,6 +251,10 @@ void AndroidDrawingContext::drawText(int x, int y, int width, int height, String
     env->CallVoidMethod(m_device, mid, m_canvas, x, y, width, height,
         rho_cast<jhstring>(text).get(), color);
 
+    /////
+    env->DeleteLocalRef(cls);
+    
+    
     RHO_MAP_TRACE("drawText done");
 }
 
@@ -260,6 +268,7 @@ AndroidMapDevice::AndroidMapDevice(rho_param *p)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "create", "(J)V");
     if (!mid) return;
     env->CallStaticVoidMethod(cls, mid, (jlong)this);
+    
     RHO_MAP_TRACE("AndroidMapDevice: ctor finish");
 }
 
@@ -268,8 +277,16 @@ AndroidMapDevice::~AndroidMapDevice()
     RHO_MAP_TRACE("AndroidMapDevice: dtor start");
     rho_param_free(m_params);
     JNIEnv *env = jnienv();
-    if (m_jdevice)
+    if (m_jdevice) {
+        JNIEnv *env = jnienv();
+        jclass cls = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
+        if (!cls) return;
+        jmethodID mid = getJNIClassMethod(env, cls, "destroyDevice", "()V");
+        if (!mid) return;
+        env->CallVoidMethod(m_jdevice, mid);
+
         env->DeleteGlobalRef(m_jdevice);
+    }
     RHO_MAP_TRACE("AndroidMapDevice: dtor finish");
 }
 
@@ -296,7 +313,7 @@ void AndroidMapDevice::setMapView(IMapView *mv)
 
         m_mapview->setPinImage(m_pin_image.get(), pin_info);
 
-		PIN_INFO pin_info1 = {0};
+		PIN_INFO pin_info1 = PIN_INFO();
 		pin_info1.x_offset = 5;
 
         mv->setPinCalloutImage(m_pin_calloutimage.get(), pin_info1);
@@ -332,10 +349,9 @@ void AndroidMapDevice::setPinCalloutImage(JNIEnv *env, jobject bitmap)
     RHO_MAP_TRACE("AndroidMapDevice: setPinCalloutImage: start");
     m_pin_calloutimage.reset(new AndroidImage(bitmap));
     IMapView *mv = mapView();
-    if (mv) {
-
-		PIN_INFO pin_info = {0};
-		pin_info.x_offset = 5;
+    if (mv){
+        PIN_INFO pin_info = PIN_INFO();
+        pin_info.x_offset = 5;
 
         mv->setPinCalloutImage(m_pin_calloutimage.get(), pin_info);
     }
@@ -348,9 +364,8 @@ void AndroidMapDevice::setPinCalloutLinkImage(JNIEnv *env, jobject bitmap)
     m_pin_calloutlinkimage.reset(new AndroidImage(bitmap));
     IMapView *mv = mapView();
     if (mv) {
-
-		PIN_INFO pin_info = {0};
-		pin_info.x_offset = 5;
+        PIN_INFO pin_info = PIN_INFO();
+        pin_info.x_offset = 5;
 
         mv->setPinCalloutLinkImage(m_pin_calloutlinkimage.get(), pin_info);
     }
@@ -381,7 +396,7 @@ IDrawingImage *AndroidMapDevice::createImage(String const &path, bool useAlpha)
 
     jobject bitmap = env->CallStaticObjectMethod(cls, mid, rho_cast<jhstring>(path).get());
     IDrawingImage *image = new AndroidImage(bitmap);
-
+    
     RHO_MAP_TRACE1("createImage: return image=%p", image);
     return image;
 }
@@ -402,7 +417,7 @@ IDrawingImage *AndroidMapDevice::createImage(void const *p, size_t size, bool us
 
     jobject bitmap = env->CallStaticObjectMethod(cls, mid, data.get());
     IDrawingImage *image = new AndroidImage(bitmap);
-
+    
     RHO_MAP_TRACE1("createImage: return image=%p", image);
     return image;
 }
@@ -434,6 +449,7 @@ void AndroidMapDevice::requestRedraw()
         jmethodID mid = getJNIClassMethod(env, cls, "redraw", "()V");
         if (!mid) return;
         env->CallVoidMethod(m_jdevice, mid);
+
     }
 
     RHO_MAP_TRACE("requestRedraw done");
@@ -727,7 +743,7 @@ RHO_GLOBAL double google_mapview_state_center_lon()
 
 
 
-static bool ourIsOldGoogleEngineUsed = false;
+static bool ourIsOldGoogleEngineUsed = true;
 
 
 
@@ -762,7 +778,7 @@ RHO_GLOBAL void mapview_create(rho_param *p)
     ourIsOldGoogleEngineUsed = false;
 
     // detect engine
-    char* engine = "Google";
+    const char* engine = "Google";
     if (p && p->type == RHO_PARAM_HASH) {
 	rho_param *eng_p = NULL;
         for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {

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

@@ -148,6 +148,7 @@ RHO_GLOBAL int native_tabbar_get_current_tab() {
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_mainview_TabbedMainView_onTabBarChangeTabCallback
   (JNIEnv *env, jclass, jstring callback, jstring body)
 {
-        rho_net_request_with_data(rho_http_normalizeurl(rho_cast<std::string>(callback).c_str()), rho_cast<std::string>(body).c_str());
-
+    rho_net_request_with_data(
+            RHODESAPP().canonicalizeRhoUrl(rho_cast<std::string>(env, callback)).c_str(),
+            rho_cast<std::string>(env, body).c_str());
 }

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

@@ -46,8 +46,8 @@ RHO_GLOBAL void rho_webview_navigate(const char* url, int index)
         return;
     }
 
-    char *normUrl = rho_http_normalizeurl(url);
-    jhstring objNormUrl = rho_cast<jhstring>(normUrl);
+    std::string normUrl = RHODESAPP().canonicalizeRhoUrl(url);
+    jhstring objNormUrl = rho_cast<jhstring>(env, normUrl);
     env->CallStaticVoidMethod(cls, mid, objNormUrl.get(), index);
 }
 

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

@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Vector;
 
 import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
@@ -580,6 +581,7 @@ public class SimpleMainView implements MainView {
 
 	public void navigate(String url, int index) {
 		String cleared_url = processForNativeView(url);
+		Logger.I(TAG, "Cleared URL: " + url);
 		if (cleared_url.length() > 0) {
 			// check for handle because if we call loadUrl - WebView do not check this url for handle
 			if (!RhodesService.getInstance().handleUrlLoading(cleared_url)) {

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

@@ -163,7 +163,9 @@ public class MapView extends BaseActivity implements MapTouch {
 			@Override
 			protected void dispatchDraw(Canvas canvas) {
 				//super.dispatchDraw(canvas);
-				paint(mNativeDevice, canvas);
+				if (mNativeDevice != 0) {
+					paint(mNativeDevice, canvas);
+				}
 			}
 			
 			@Override
@@ -208,8 +210,8 @@ public class MapView extends BaseActivity implements MapTouch {
 	
 	@Override
 	protected void onStop() {
-		destroy(mNativeDevice);
 		mNativeDevice = 0;
+		destroy(mNativeDevice);
 		mc = null;
 		finish();
 		super.onStop();
@@ -316,6 +318,10 @@ public class MapView extends BaseActivity implements MapTouch {
 		bm.recycle();
 	}
 
+	public void destroyDevice() {
+		mNativeDevice = 0;
+	}
+	
 	@Override
 	public void touchClick(Touch touch) {
 		click(mNativeDevice, (int)touch.x, (int)touch.y);

data/platform/android/build/android.rake

@@ -442,7 +442,7 @@ namespace "config" do
 
     android_api_levels.sort!
 
-    $emuversion = get_market_version($found_api_level) if $emuversion.nil?
+    $emuversion = get_market_version($min_sdk_level) if $emuversion.nil?
     requested_api_level = get_api_level($emuversion)
 
     if USE_TRACES

data/platform/android/build/androidcommon.rb

@@ -155,7 +155,12 @@ def cc_def_args
     args << $ndksysroot
     #args << "-fvisibility=hidden"
     args << "-fPIC"
+    args << "-fstrict-aliasing"
+    args << "-Wall"
+    args << "-Wextra"
     args << "-Wno-psabi" if $ndkgccver != "4.2.1"
+    args << "-Wstrict-aliasing"
+    args << "-Wno-sign-compare"
     args << "-mandroid"
     args << "-DANDROID"
     args << "-DOS_ANDROID"
@@ -166,8 +171,14 @@ def cc_def_args
       args << "-O2"
       args << "-DNDEBUG"
     else
-      args << "-O0"
+      args << "-O1"
+      args << "-fstack-protector-all"
       args << "-D_DEBUG"
+      args << "-Winit-self"
+      args << "-Wshadow"
+      args << "-Wcast-align"
+      args << "-Wvla"
+      args << "-Wstack-protector"
     end
     $cc_def_args_val = args
   end

data/platform/iphone/Classes/Bluetooth/Bluetooth.m

@@ -257,7 +257,9 @@ static RhoBluetoothManager *instance = NULL;
 	strBody = [strBody stringByAppendingString:status];
 	strBody = [strBody stringByAppendingString:@"&connected_device_name="];
 	strBody = [strBody stringByAppendingString:connected_device_name];
-	rho_net_request_with_data(rho_http_normalizeurl([connectionCallbackURL UTF8String]), [strBody UTF8String]);
+    char* norm_url = rho_http_normalizeurl([connectionCallbackURL UTF8String]);
+	rho_net_request_with_data(norm_url, [strBody UTF8String]);
+    rho_http_free(norm_url);
 }
 
 - (void)fireSessionCallback:(NSString*)connected_device_name event_type:(NSString*)event_type {
@@ -269,7 +271,9 @@ static RhoBluetoothManager *instance = NULL;
 	strBody = [strBody stringByAppendingString:connected_device_name];
 	strBody = [strBody stringByAppendingString:@"&event_type="];
 	strBody = [strBody stringByAppendingString:event_type];
-	rho_net_request_with_data(rho_http_normalizeurl([sessionCallbackURL UTF8String]), [strBody UTF8String]);
+    char* norm_url = rho_http_normalizeurl([sessionCallbackURL UTF8String]);
+	rho_net_request_with_data(norm_url, [strBody UTF8String]);
+    rho_http_free(norm_url);
 }
 
 

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -313,9 +313,9 @@
     
 	const char* cb = [postUrl UTF8String];
 	const char* b = [strBody UTF8String];
-	rho_net_request_with_data(rho_http_normalizeurl(cb), b);
-    
-    
+    char* norm_url = rho_http_normalizeurl(cb);
+    rho_net_request_with_data(norm_url, b);
+    rho_http_free(norm_url);
     
     //rho_rhodesapp_callCameraCallback([postUrl UTF8String], [filename UTF8String],
     //        isError ? "Can't write image to the storage." : "", 0 );

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -106,7 +106,9 @@ static NSString* ourChangeValueCallback = nil;
 
 	const char* cb = [ourChangeValueCallback UTF8String];
 	const char* b = [strBody UTF8String];
-	rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+    char* norm_url = rho_http_normalizeurl(cb);
+    rho_net_request_with_data(norm_url, b);
+    rho_http_free(norm_url);
 }
 
 

data/platform/iphone/Classes/MapView/MapAnnotation.m

@@ -58,9 +58,10 @@
 
 - (void)setUrl:(NSString*)u {
     const char *surl = [u UTF8String];
-    const char *norm_url = rho_http_normalizeurl(surl);
+    char *norm_url = rho_http_normalizeurl(surl);
     [url release];
     url = [[NSString stringWithUTF8String:norm_url] copy];
+    rho_http_free(norm_url);
 }
 
 @end

data/platform/iphone/Classes/SplitView/RightViewController.m

@@ -180,7 +180,9 @@
         strBody = [strBody stringByAppendingString:[NSString stringWithFormat:@"%d",new_index]];
         const char* cb = [self.on_change_tab_callback UTF8String];
         const char* b = [strBody UTF8String];
-        rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+        char* norm_url = rho_http_normalizeurl(cb);
+        rho_net_request_with_data(norm_url, b);
+        rho_http_free(norm_url);
     }
 }
 

data/platform/iphone/Classes/TabbedMainView.m

@@ -601,7 +601,9 @@
         strBody = [strBody stringByAppendingString:[NSString stringWithFormat:@"%d",new_index]];
         const char* cb = [self.on_change_tab_callback UTF8String];
         const char* b = [strBody UTF8String];
-        rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+        char* norm_url = rho_http_normalizeurl(cb);
+        rho_net_request_with_data(norm_url, b);
+        rho_http_free(norm_url);
     }
 }
 

data/platform/iphone/rbuild/iphone.rake

@@ -499,10 +499,12 @@ namespace "build" do
       vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
       bundle_identifier = "com.#{vendor}.#{appname}"
       bundle_identifier = $app_config["iphone"]["BundleIdentifier"] unless $app_config["iphone"]["BundleIdentifier"].nil?
-      saved_identifier = set_app_bundle_identifier(bundle_identifier)
+      set_app_bundle_identifier(bundle_identifier)
+
+      set_app_name(appname)
       
-      saved_url_scheme = set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
-      saved_url_name = set_app_url_name(bundle_identifier)
+      set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
+      set_app_url_name(bundle_identifier)
 
       set_app_icon(false)
       set_default_images(false)