rhodes 1.5.2 → 1.5.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.5.3
+* Fix issue #2980590 - iphone: call NetRequest from toolbar
+* Fix issue #3104338 - rake run:iphone doesn't install into iphone sdk 3.2
+
 == 1.5.2
 * Fix AsyncHttp 'cancel request'
 * Implement #2948610 - enable AysyncHttp synchronous call

data/Manifest.txt

@@ -292,7 +292,9 @@ 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/HttpLog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/MainView.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
@@ -307,13 +309,11 @@ 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/RhoLogConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SimpleMainView.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/SSLImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/TabbedMainView.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
@@ -3263,6 +3263,7 @@ rakefile.rb
 README.textile
 res/build-tools/build_inf.js
 res/build-tools/cygwin1.dll
+res/build-tools/cygz.dll
 res/build-tools/db/syncdb.schema
 res/build-tools/db/syncdb.triggers
 res/build-tools/insertRhoBundle2pkg.rb

data/bin/upgrade-rhodes-app

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'fileutils'
+require 'yaml'
 include FileUtils
 puts File.dirname(__FILE__)
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.2'
+    DBVERSION = '1.5.3'
   end
   
 end

data/lib/framework/rhom/rhom_object_factory.rb

@@ -62,6 +62,10 @@ module Rhom
                 end
               end
               
+              def to_s
+                @vars.to_s if @vars
+              end
+              
               def method_missing(name, *args)
                 unless name == Fixnum
                   varname = name.to_s.gsub(/\=/,"")
@@ -507,7 +511,7 @@ module Rhom
                           #new_obj.vars.merge!(rowhash)
                           
                           rowhash.each do |attrName, attrVal|
-                            new_obj.vars.merge!( { attrName.to_sym()=>attrVal } )
+                            new_obj.vars.merge!( { attrName.to_sym()=>attrVal } ) if attrVal
                           end
                             
                           ret_list << new_obj
@@ -529,10 +533,6 @@ module Rhom
                     }
                   end
                   
-                  if order_attr && limit
-                    ret_list = ret_list.slice(offset,limit)
-                  end
-                  
                   return list.length if args.first == :count
                   if args.first == :first || args.first.is_a?(String) 
                     return ret_list.length > 0 ? ret_list[0] : nil
@@ -733,8 +733,17 @@ module Rhom
                     ::Rhom::RhomDbAdapter.start_transaction
                     
                     result = ::Rhom::RhomDbAdapter.execute_sql("SELECT object FROM object_values WHERE object=? AND source_id=? LIMIT 1 OFFSET 0",obj,nSrcID)
-                    bUpdate = result && result.length > 0 
-    				update_type = bUpdate ? self.get_update_type_by_source('update') : self.get_update_type_by_source('create')
+                    if result && result.length > 0                     
+                        resUpdateType = ::Rhom::RhomDbAdapter.select_from_table('changed_values', 'update_type', {"object"=>obj, "source_id"=>nSrcID, 'sent'=>0}) 
+                        if resUpdateType && resUpdateType.length > 0 
+                            update_type = resUpdateType[0]['update_type'] 
+                        else
+        				    update_type = self.get_update_type_by_source('update')
+        				end    
+    				else
+    				    update_type = self.get_update_type_by_source('create')
+    				end
+    				
                     self.vars.each do |key_a,value|
                         key = key_a.to_s
                         next if ::Rhom::RhomObject.method_name_reserved?(key)

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.5.2'
+    DBVERSION = '1.5.3'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.2'
+    DBVERSION = '1.5.3'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="21"
-      android:versionName="1.5.2">
+      android:versionCode="22"
+      android:versionName="1.5.3">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

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

@@ -7,10 +7,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_rhomobile_rhodes_Rhodes_WINDOW_FLAGS
-#define com_rhomobile_rhodes_Rhodes_WINDOW_FLAGS 1024L
-#undef com_rhomobile_rhodes_Rhodes_WINDOW_MASK
-#define com_rhomobile_rhodes_Rhodes_WINDOW_MASK 1024L
+#undef com_rhomobile_rhodes_Rhodes_RHO_SPLASH_VIEW
+#define com_rhomobile_rhodes_Rhodes_RHO_SPLASH_VIEW 1L
+#undef com_rhomobile_rhodes_Rhodes_RHO_MAIN_VIEW
+#define com_rhomobile_rhodes_Rhodes_RHO_MAIN_VIEW 2L
+#undef com_rhomobile_rhodes_Rhodes_RHO_TOOLBAR_VIEW
+#define com_rhomobile_rhodes_Rhodes_RHO_TOOLBAR_VIEW 3L
 /*
  * Class:     com_rhomobile_rhodes_Rhodes
  * Method:    createRhodesApp
@@ -83,6 +85,14 @@ JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_getAppBackUrl
 JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_normalizeUrl
   (JNIEnv *, jobject, jstring);
 
+/*
+ * Class:     com_rhomobile_rhodes_Rhodes
+ * Method:    doRequest
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_doRequest
+  (JNIEnv *, jobject, jstring);
+
 /*
  * Class:     com_rhomobile_rhodes_Rhodes
  * Method:    makeLink

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

@@ -354,6 +354,13 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_getAppBackUrl
     return rho_cast<jstring>(s);
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_doRequest
+  (JNIEnv *env, jobject, jstring strUrl)
+{
+    std::string const &url = rho_cast<std::string>(strUrl);
+    rho_net_request(url.c_str());
+}
+
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_normalizeUrl
   (JNIEnv *, jobject, jstring strUrl)
 {

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

@@ -22,6 +22,10 @@ package com.rhomobile.rhodes;
 
 import java.util.Vector;
 
+import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SimpleMainView;
+import com.rhomobile.rhodes.mainview.TabbedMainView;
+
 public class NativeBar {
 	
 	private static final String TAG = "NativeBar";
@@ -46,10 +50,11 @@ public class NativeBar {
 			
 			switch (type) {
 			case NOBAR_TYPE:
-			case TOOLBAR_TYPE:
-				// There is no toolbar on android so TOOLBAR_TYPE means exactly NOBAR_TYPE
 				v = new SimpleMainView();
 				break;
+			case TOOLBAR_TYPE:
+				v = new SimpleMainView(params);
+				break;
 			case TABBAR_TYPE:
 				v = new TabbedMainView(params);
 				break;

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

@@ -27,6 +27,8 @@ import java.util.Locale;
 
 import com.rhomobile.rhodes.Utils.AssetsSource;
 import com.rhomobile.rhodes.Utils.FileSource;
+import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
 import com.rhomobile.rhodes.ui.LogViewDialog;
@@ -71,6 +73,7 @@ public class Rhodes extends Activity {
 	
 	public static final int RHO_SPLASH_VIEW = 1;
 	public static final int RHO_MAIN_VIEW = 2;
+	public static final int RHO_TOOLBAR_VIEW = 3;
 	
 	public static int WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_FULLSCREEN;
 	public static int WINDOW_MASK = WindowManager.LayoutParams.FLAG_FULLSCREEN;
@@ -111,6 +114,8 @@ public class Rhodes extends Activity {
 	
 	public native String normalizeUrl(String url);
 	
+	public native void doRequest(String url);
+	
 	public native static void makeLink(String src, String dst);
 	
 	private void initRootPath() {
@@ -539,12 +544,7 @@ public class Rhodes extends Activity {
 	}
 	
 	private void goBack() {
-		String backUrl = getAppBackUrl();
-		int activeTab = mainView.activeTab();
-		if (backUrl == null || backUrl.length() == 0)
-			mainView.back(activeTab);
-		else
-			mainView.navigate(backUrl, activeTab);
+		mainView.back(mainView.activeTab());
 	}
 	
 	private void goForward() {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/{MainView.java → mainview/MainView.java}

@@ -18,7 +18,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ============================================================================
  */
-package com.rhomobile.rhodes;
+package com.rhomobile.rhodes.mainview;
 
 import android.view.View;
 

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

@@ -0,0 +1,286 @@
+/*
+ ============================================================================
+ Author	    : Dmitry Moskalchuk
+ Version	: 1.5
+ Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ============================================================================
+ */
+package com.rhomobile.rhodes.mainview;
+
+import java.util.Map;
+import java.util.Vector;
+
+import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhodesInstance;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+public class SimpleMainView implements MainView {
+
+	private static final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
+	private static final int FILL_PARENT = ViewGroup.LayoutParams.FILL_PARENT;
+	
+	private class ActionBack implements View.OnClickListener {
+		public void onClick(View v) {
+			back(0);
+		}
+	};
+	
+	private class ActionForward implements View.OnClickListener {
+		public void onClick(View v) {
+			forward(0);
+		}
+	};
+	
+	private class ActionHome implements View.OnClickListener {
+		public void onClick(View v) {
+			navigate(RhodesInstance.getInstance().getStartUrl(), 0);
+		}
+	};
+	
+	private class ActionOptions implements View.OnClickListener {
+		public void onClick(View v) {
+			navigate(RhodesInstance.getInstance().getOptionsUrl(), 0);
+		}
+	};
+	
+	private class ActionRefresh implements View.OnClickListener {
+		public void onClick(View v) {
+			reload(0);
+		}
+	};
+	
+	private class ActionCustomRunnable implements Runnable {
+		private boolean callback;
+		private String url;
+		public ActionCustomRunnable(boolean c, String u) {
+			callback = c;
+			url = u;
+		}
+		
+		public void run() {
+			if (callback)
+				RhodesInstance.getInstance().doRequest(url);
+			else
+				navigate(url, 0);
+		}
+	};
+	
+	private class ActionCustom implements View.OnClickListener {
+		private static final String scheme = "callback:";
+		private String url;
+		private boolean callback;
+		
+		public ActionCustom(String u) {
+			callback = false;
+			url = u;
+			if (url.startsWith(scheme)) {
+				url = url.substring(scheme.length());
+				callback = true;
+			}
+			url = RhodesInstance.getInstance().normalizeUrl(url);
+		}
+		
+		public void onClick(View v) {
+			Rhodes.performOnUiThread(new ActionCustomRunnable(callback, url), false);
+		}
+	};
+	
+	private LinearLayout view;
+	private WebView webView;
+	
+	public View getView() {
+		return view;
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void init(Vector<Object> params) {
+		Rhodes r = RhodesInstance.getInstance();
+		
+		view = new LinearLayout(r);
+		view.setOrientation(LinearLayout.VERTICAL);
+		view.setGravity(Gravity.BOTTOM);
+		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
+		view.setId(Rhodes.RHO_MAIN_VIEW);
+		
+		webView = r.createWebView();
+		view.addView(webView, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+		
+		LinearLayout bottom = new LinearLayout(r);
+		bottom.setOrientation(LinearLayout.HORIZONTAL);
+		bottom.setBackgroundColor(Color.GRAY);
+		bottom.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0));
+		view.addView(bottom);
+		
+		if (params != null) {
+			LinearLayout left = new LinearLayout(r);
+			left.setGravity(Gravity.LEFT);
+			left.setOrientation(LinearLayout.HORIZONTAL);
+			left.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 1));
+			bottom.addView(left);
+			
+			LinearLayout right = new LinearLayout(r);
+			right.setGravity(Gravity.RIGHT);
+			right.setOrientation(LinearLayout.HORIZONTAL);
+			right.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 1));
+			bottom.addView(right);
+			
+			LinearLayout current = left;
+			
+			String rootPath = r.getRootPath() + "/apps/";
+			
+			for (int i = 0, lim = params.size(); i < lim; ++i) {
+				Object param = params.elementAt(i);
+				if (!(param instanceof Map<?,?>))
+					throw new IllegalArgumentException("Hash expected");
+				
+				Map<Object, Object> hash = (Map<Object, Object>)param;
+				
+				Object actionObj = hash.get("action");
+				if (actionObj == null || !(actionObj instanceof String))
+					throw new IllegalArgumentException("'action' should be String");
+				
+				String action = (String)actionObj;
+				if (action.length() == 0)
+					throw new IllegalArgumentException("'action' should not be empty");
+				
+				Drawable icon = null;
+				String label = null;
+				
+				View.OnClickListener onClick = null;
+				if (action.equalsIgnoreCase("back")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.back);
+					onClick = new ActionBack();
+				}
+				else if (action.equalsIgnoreCase("forward")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.next);
+					onClick = new ActionForward();
+				}
+				else if (action.equalsIgnoreCase("home")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.home);
+					onClick = new ActionHome();
+				}
+				else if (action.equalsIgnoreCase("options")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.options);
+					onClick = new ActionOptions();
+				}
+				else if (action.equalsIgnoreCase("refresh")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.refresh);
+					onClick = new ActionRefresh();
+				}
+				else if (action.equalsIgnoreCase("separator")) {
+					current = right;
+					continue;
+				}
+				
+				Object iconObj = hash.get("icon");
+				if (iconObj != null) {
+					if (!(iconObj instanceof String))
+						throw new IllegalArgumentException("'icon' should be String");
+					String iconPath = rootPath + (String)iconObj;
+					Bitmap bitmap = BitmapFactory.decodeFile(iconPath);
+					if (bitmap != null)
+						icon = new BitmapDrawable(bitmap);
+				}
+				
+				if (icon == null) {
+					Object labelObj = hash.get("label");
+					if (labelObj == null || !(labelObj instanceof String))
+						throw new IllegalArgumentException("'label' should be String");
+					label = (String)labelObj;
+				}
+				
+				if (icon == null && label == null)
+					throw new IllegalArgumentException("One of 'icon' or 'label' should be specified");
+				
+				View button = null;
+				if (icon != null) {
+					ImageButton btn = new ImageButton(r);
+					btn.setImageDrawable(icon);
+					button = btn;
+				}
+				else {
+					Button btn = new Button(r);
+					btn.setText(label);
+					button = btn;
+				}
+				
+				if (button == null)
+					continue;
+				
+				if (onClick == null)
+					onClick = new ActionCustom(action);
+				
+				button.setOnClickListener(onClick);
+				button.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+				current.addView(button);
+			}
+		}
+	}
+	
+	public SimpleMainView() {
+		init(null);
+	}
+	
+	public SimpleMainView(Vector<Object> params) {
+		init(params);
+	}
+	
+	public void back(int index) {
+		String backUrl = RhodesInstance.getInstance().getAppBackUrl();
+		if (backUrl == null || backUrl.length() == 0)
+			webView.goBack();
+		else
+			navigate(backUrl, index);
+	}
+
+	public void forward(int index) {
+		webView.goForward();
+	}
+
+	public void navigate(String url, int index) {
+		webView.loadUrl(url);
+	}
+	
+	public void reload(int index) {
+		webView.reload();
+	}
+	
+	public String currentLocation(int index) {
+		return webView.getUrl();
+	}
+
+	public void switchTab(int index) {
+		// Nothing
+	}
+	
+	public int activeTab() {
+		return 0;
+	}
+
+}