rhodes 2.2.3 → 2.2.4.beta.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+## 2.2.4
+* Launch external browser
+* Open any url (http, file etc), and run external application associated with it
+* Keep RhoSync session while rhodes schema changed
+* Keep local changes while make bulk sync with RhoSync server
+* Remove blank screen before loading.png and before showing index page and support loading.png for different screen sizes
+* Fix issues with mailto:, tel: and sms: url while using jqtouch
+* Support rotation of map on iPhone
+* Support color icons for iPhone toolbar
+* Implement tabbar for iPad at left side
+* Support Windows Mobile 5.0
+* Remove 3 sec delay at application start on Blackberry 
+
 ## 2.2.3
 * #5817512 - Fix issue with migration Schema model in case if old model does not have schema_version
 * #5866549 - Fix NativeBar.switch on iPhone when 'callback:' uri used

data/Rakefile

@@ -673,7 +673,7 @@ task :set_version, [:version] do |t,args|
   
     File.open(versionfile,"r") { |f| origfile = f.read }
     File.open(versionfile,"w") do |f|
-      origfile.gsub!(/^(\s*VERSION) = '(\d+\.\d+\.*\d*)'/, '\1 = \''+ verstring + "'")
+      origfile.gsub!(/^(\s*VERSION) = '(\d+\.\d+\.*\d*)'/, '\1 = \''+ verstring + "'")     
       f.write origfile
     end
   end

data/bin/c2dm.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'net/http'
+require 'net/https'
+require 'uri'
+
+module Google
+  def self.client_login(login, password, source)
+    url = URI.parse('https://www.google.com/accounts/ClientLogin')
+
+    data = {}
+    data['accountType'] = 'HOSTED_OR_GOOGLE'
+    data['Email'] = login
+    data['Passwd'] = password
+    data['service'] = 'ac2dm'
+    data['source'] = source
+
+    req = Net::HTTP::Post.new(url.path)
+    req.set_form_data data
+    http = Net::HTTP.new(url.host, url.port)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    res = http.request(req)
+    res.error! unless res.is_a? Net::HTTPSuccess
+
+    res.body.split("\n").each do |line|
+      line.chomp!
+      next unless line =~ /^Auth=/
+      return line.gsub(/^Auth=/, '')
+    end
+
+    return nil
+  end
+
+  def self.send_c2d_message(regid, authtoken, params)
+    url = URI.parse('https://android.apis.google.com/c2dm/send')
+
+    data = {}
+    data['registration_id'] = regid
+    data['collapse_key'] = `uuidgen`.strip.gsub('-', '')
+
+    params.each do |k,v|
+      v = v.join(',') if v.is_a? Array
+      data["data.#{k.to_s}"] = v
+    end
+
+    req = Net::HTTP::Post.new url.path, 'Authorization' => "GoogleLogin auth=#{authtoken}"
+    req.set_form_data data
+
+    http = Net::HTTP.new(url.host, url.port)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE;
+    http.request(req)
+  end
+end
+
+# Example:
+#authtoken = Google.client_login('push-app@gmail.com', 'PASSWORD', 'push-app-1')
+#puts authtoken

data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile

@@ -43,6 +43,10 @@ namespace "build" do
 
     simulator = $sdk =~ /iphonesimulator/
 
+    if $configuration == 'Distribution'
+       $configuration = 'Release'
+    end
+
     chdir iphone_path
     args = ['build', '-target', 'Barcode', '-configuration', $configuration, '-sdk', $sdk]
 

data/lib/framework/rho/rho.rb

@@ -197,6 +197,8 @@ module Rho
                 arSrcs = db.select_from_table('sources','source_id, name, sync_priority, partition, sync_type, schema, schema_version, associations, blob_attribs',
                     {'partition'=>str_partition} )
                 arSrcs.each do |src|
+                    src['schema'] = '<empty_schema>' if src && !src['schema'] && db.table_exist?(src['name'])
+                    
                     Rho::RhoConfig::sources()[ src['name'] ] = src
                 end
                 

data/lib/framework/rho/rhoapplication.rb

@@ -10,6 +10,7 @@ module Rho
   	TOOLBAR_TYPE = 0
   	TABBAR_TYPE = 1
   	NOBAR_TYPE = 2
+  	VTABBAR_TYPE = 3
   	
   	@@toolbar = [{:action => :back}, {:action => :forward}, {:action => :separator},
       {:action => :home}, {:action => :refresh}, {:action => :options} ]

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
       android:versionCode="25"
-      android:versionName="2.2.3">
+      android:versionName="2.2.4">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

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

@@ -182,3 +182,24 @@ RHO_GLOBAL void rho_sys_app_exit()
     env->CallStaticVoidMethod(cls, mid);
 }
 
+RHO_GLOBAL void rho_sys_run_app(const char *appname, VALUE params)
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "runApplication", "(Ljava/lang/String;Ljava/util/Map;)V");
+    if (!mid) return;
+    // TODO: convert ruby hash (params) to java map (jParams)
+    jobject jParams = NULL;
+    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(appname), jParams);
+}
+
+RHO_GLOBAL void rho_sys_open_url(const char *url)
+{
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "openExternalUrl", "(Ljava/lang/String;)V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(url));
+}

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

@@ -17,6 +17,10 @@ RHO_GLOBAL void create_nativebar(int bar_type, rho_param *p)
         RAWLOG_ERROR("Unexpected parameter type, should be Array or Hash");
         return;
     }
+    // check for iPad SplitTabBar type -> redirect to TabBar
+    if (bar_type == 3) {
+        bar_type = 1;
+    }
 
     jobject paramsObj = RhoValueConverter(env).createObject(p);
     env->CallStaticVoidMethod(clsNativeBar, midCreate, bar_type, paramsObj);

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

@@ -7,7 +7,9 @@ public class RhoActivity extends Activity {
 	@Override
 	protected void onStart() {
 		super.onStart();
-		RhodesService.getInstance().activityStarted();
+		if (RhodesService.getInstance() != null) {
+			RhodesService.getInstance().activityStarted();
+		}
 	}
 	
 	@Override

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

@@ -20,7 +20,11 @@
  */
 package com.rhomobile.rhodes;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -31,6 +35,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
@@ -47,11 +52,19 @@ public class Rhodes extends RhoActivity {
 	}
 	
 	private RhoMenu appMenu = null;
+	
+	private ViewGroup mOuterFrame = null;
+	private Bundle mSavedBundle = null;
+	private SplashScreen mSplashScreen = null;
+	private Handler mHandler = null;
 		
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		RhodesService.platformLog("Rhodes", "onStart()");
+		
 		super.onCreate(savedInstanceState);
+		mHandler = new Handler();
 
 		// Here Log should be used, not Logger. It is because Logger is not initialized yet.
 		Log.v(TAG, "+++ onCreate");
@@ -59,30 +72,78 @@ public class Rhodes extends RhoActivity {
 		instance = this;
 		
 		FrameLayout v = new FrameLayout(this);
+		mOuterFrame = v;
+		
+		mSplashScreen = RhodesService.showSplashScreen(this, mOuterFrame);
+		mSavedBundle = savedInstanceState;
+
+		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
+
+		
+		this.requestWindowFeature(Window.FEATURE_PROGRESS);
+
+		getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 10000);
+		
+		setContentView(mOuterFrame, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+
+
+	}
+	
+	public void onStart() {
+		super.onStart();
+		RhodesService.platformLog("Rhodes", "onStart()");
+	}
+	
+	public void onCreatePosponed() {
+		RhodesService.platformLog("Rhodes", "onCreatePosponed()");
 		
 		RhodesService service = RhodesService.getInstance();
 		if (service == null) {
 			Log.v(TAG, "Starting rhodes service...");
-			service = new RhodesService(this, v);
+			service = new RhodesService(this, mOuterFrame, mSplashScreen);
 		}
 		else
 			Log.v(TAG, "Rhodes service already started...");
 		
 		Thread ct = Thread.currentThread();
 		ct.setPriority(Thread.MAX_PRIORITY);
-		service.setInfo(this, ct.getId(), new Handler());
+		service.setInfo(this, ct.getId(), mHandler);
 
-		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
 
 		boolean disableScreenRotation = RhoConf.getBool("disable_screen_rotation");
 		this.setRequestedOrientation(disableScreenRotation ? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT :
 			ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
 		
-		if (RhodesService.ENABLE_LOADING_INDICATION)
-			this.requestWindowFeature(Window.FEATURE_PROGRESS);
+		//if (RhodesService.ENABLE_LOADING_INDICATION)
+		//	this.requestWindowFeature(Window.FEATURE_PROGRESS);
 
-		service.setRootWindow(v);
-		setContentView(v, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+		service.setRootWindow(mOuterFrame);
+	
+		RhodesService.getInstance().activityStarted();
+		
+		if (mTimerPostponeCreate != null) {
+			mTimerPostponeCreate.cancel();
+			mTimerPostponeCreate = null;
+		}
+	}
+	
+	private Timer mTimerPostponeCreate = null;
+	
+	public void onResume() {
+		RhodesService.platformLog("Rhodes", "onResume()");
+		
+		super.onResume();
+
+	}
+	
+	public static void runPosponedSetup() {
+		final Rhodes r = Rhodes.getInstance();
+		r.mHandler.post( new Runnable() {
+				public void run() {
+					RhodesService.platformLog("Rhodes", "postponed Create UIThread.run()");
+					r.onCreatePosponed();
+				}
+			});
 	}
 	
 	@Override

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

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.Vector;
@@ -17,6 +18,7 @@ import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
 import com.rhomobile.rhodes.ui.LogViewDialog;
+import com.rhomobile.rhodes.uri.ExternalHttpHandler;
 import com.rhomobile.rhodes.uri.MailUriHandler;
 import com.rhomobile.rhodes.uri.SmsUriHandler;
 import com.rhomobile.rhodes.uri.TelUriHandler;
@@ -29,11 +31,15 @@ import com.rhomobile.rhodes.webview.RhoWebSettings;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -78,6 +84,15 @@ public class RhodesService {
 		return ctx;
 	}
 	
+	public static void platformLog(String _tag, String _message) {
+		StringBuilder s = new StringBuilder();
+		s.append("ms[");
+		s.append(System.currentTimeMillis());
+		s.append("] ");
+		s.append(_message);
+		android.util.Log.v(_tag, s.toString());
+	}
+	
 	private RhoLogConf m_rhoLogConf = new RhoLogConf();
 	public RhoLogConf getLogConf() {
 		return m_rhoLogConf;
@@ -104,7 +119,7 @@ public class RhodesService {
 		ctx = c;
 		uiThreadId = id;
 		uiHandler = handler;
-		RhoBluetoothManager.sharedInstance();
+		//RhoBluetoothManager.sharedInstance();
 	}
 	
 	private Handler uiHandler;
@@ -259,9 +274,10 @@ public class RhodesService {
 		return false;
 	}
 	
-	private void showSplashScreen() {
-		splashScreen = new SplashScreen(ctx);
-		splashScreen.start(outerFrame);
+	public static SplashScreen showSplashScreen(Context ctx, ViewGroup myOuterFrame) {
+		SplashScreen splashScreen = new SplashScreen(ctx);
+		splashScreen.start(myOuterFrame);
+		return splashScreen;
 	}
 	
 	public void hideSplashScreen() {
@@ -278,6 +294,50 @@ public class RhodesService {
 				}, false);
 	}
 	
+	public static WebView createLoadingWebView(Context ctx) {
+		WebView w = new WebView(ctx);
+		
+		//webSettings.setWebSettings(w);
+		
+		w.clearCache(true);
+
+		w.setWebViewClient(new WebViewClient() {
+			
+			private boolean splashHidden = false;
+			private boolean setupExecuted = false;
+			
+			@Override
+			public void onPageStarted(WebView view, String url, Bitmap favicon) {
+				super.onPageStarted(view, url, favicon);
+			}
+			
+			@Override
+			public void onPageFinished(WebView view, String url) {
+				RhodesService rs = RhodesService.getInstance();
+				if (rs != null) {
+					if (!splashHidden && url.startsWith("http://")) {
+						rs.hideSplashScreen();
+						splashHidden = true;
+					}
+				}
+				//if (ENABLE_LOADING_INDICATION)
+				Rhodes.getInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
+				super.onPageFinished(view, url);
+				if (!setupExecuted) {
+					Rhodes.runPosponedSetup();
+					setupExecuted = true;
+				}
+				
+			}
+
+		});
+		
+		//w.setWebChromeClient(chromeClient);
+		
+		return w;
+	
+	}
+	
 	public WebView createWebView() {
 		WebView w = new WebView(ctx);
 		
@@ -313,7 +373,7 @@ public class RhodesService {
 					hideSplashScreen();
 					splashHidden = true;
 				}
-				if (ENABLE_LOADING_INDICATION)
+				//if (ENABLE_LOADING_INDICATION)
 					r.getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
 				super.onPageFinished(view, url);
 			}
@@ -384,9 +444,14 @@ public class RhodesService {
 		return instance != null;
 	}
 	
-	public RhodesService(Activity c, ViewGroup rootWindow) {
+	public RhodesService(Activity c, ViewGroup rootWindow, SplashScreen splash_s) {
+	
 		ctx = c;
 		instance = this;
+		outerFrame = rootWindow;
+
+		//showSplashScreen();
+		splashScreen = splash_s;
 		
 		initClassLoader(ctx.getClassLoader());
 
@@ -426,11 +491,10 @@ public class RhodesService {
 		ENABLE_LOADING_INDICATION = !RhoConf.getBool("disable_loading_indication");
 		
 		initWebStuff();
-		
-		outerFrame = rootWindow;
-		
+
 		Logger.I("Rhodes", "Loading...");
-		showSplashScreen();
+		//showSplashScreen();
+		splashScreen.rho_start();
 		
 		// Increase WebView rendering priority
 		WebView w = new WebView(ctx);
@@ -453,6 +517,7 @@ public class RhodesService {
 		isCameraAvailable = true;
 		
 		// Register custom uri handlers here
+		uriHandlers.addElement(new ExternalHttpHandler(ctx));
 		uriHandlers.addElement(new MailUriHandler(ctx));
 		uriHandlers.addElement(new TelUriHandler(ctx));
 		uriHandlers.addElement(new SmsUriHandler(ctx));
@@ -709,6 +774,44 @@ public class RhodesService {
 		TimeZone tz = cal.getTimeZone();
 		return tz.getDisplayName();
 	}
+	
+	public static void runApplication(String appName, Map<Object, Object> params) {
+		try {
+			Context ctx = RhodesService.getInstance().getContext();
+			PackageManager mgr = ctx.getPackageManager();
+			PackageInfo info = mgr.getPackageInfo(appName, PackageManager.GET_ACTIVITIES);
+			if (info.activities.length == 0) {
+				Logger.E(TAG, "No activities found for application " + appName);
+				return;
+			}
+			ActivityInfo ainfo = info.activities[0];
+			String className = ainfo.name;
+			if (className.startsWith("."))
+				className = ainfo.packageName + className;
+
+			Intent intent = new Intent();
+			intent.setClassName(appName, className);
+			ctx.startActivity(intent);
+		}
+		catch (Exception e) {
+			Logger.E(TAG, "Can't run application " + appName + ": " + e.getMessage());
+		}
+	}
+
+	public static void openExternalUrl(String url) {
+		try {
+			Context ctx = RhodesService.getInstance().getContext();
+            Uri uri = Uri.parse(url);			
+            
+		    Intent intent = new Intent(Intent.ACTION_VIEW);
+		    intent.setData(uri);
+    		
+		    ctx.startActivity(Intent.createChooser(intent, "Open in..."));
+		}
+		catch (Exception e) {
+			Logger.E(TAG, "Can't open url :" + url + ": " + e.getMessage());
+		}
+	}
 
 	public native void setPushRegistrationId(String id);