rhodes 1.5.4 → 1.5.5

data/lib/framework/rhodes.rb

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

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -23,7 +23,6 @@ module Rhom
   class RhomDbAdapter
     
     @@database = nil
-    @@inside_transaction = false
     
     class << self
       
@@ -44,10 +43,13 @@ module Rhom
         end
         return true
       end   
-    
+
+      def is_ui_waitfordb
+        @@database.is_ui_waitfordb
+      end
+      
       def start_transaction
           begin
-            @@inside_transaction = true
             @@database.start_transaction
           rescue Exception => e
             puts "exception when start_transaction"
@@ -56,7 +58,6 @@ module Rhom
 
       def commit
           begin
-            @@inside_transaction = false
             @@database.commit
           rescue Exception => e
             puts "exception when commit transaction"
@@ -65,7 +66,6 @@ module Rhom
 
       def rollback
           begin
-            @@inside_transaction = false
             @@database.rollback
           rescue Exception => e
             puts "exception when rollback transaction"
@@ -82,19 +82,12 @@ module Rhom
           # Make sure we lock the sync engine's mutex
           # before we perform a database transaction.
           # This prevents concurrency issues.
-          begin
-            SyncEngine.lock_sync_mutex unless @@inside_transaction
-            result = @@database.execute( sql, args )
-            SyncEngine.unlock_sync_mutex unless @@inside_transaction
-          rescue Exception => e
-            #puts "exception when running query: #{e}"
-            # make sure we unlock even if there's an error!
-            if @@inside_transaction
-              raise
-            else
-              SyncEngine.unlock_sync_mutex
-            end    
-          end
+            begin
+                result = @@database.execute( sql, args )
+            rescue Exception => e
+                #puts "exception when running query: #{e}"
+                #raise
+            end
         end
         #puts "result is: #{result.inspect}"
         result
@@ -231,14 +224,7 @@ module Rhom
 
       # deletes all rows from a given table by recreating db-file and save all other tables
       def destroy_table(table)
-          begin
-            SyncEngine.lock_sync_mutex unless @@inside_transaction
-            @@database.destroy_table table
-            SyncEngine.unlock_sync_mutex unless @@inside_transaction
-          rescue Exception => e
-            SyncEngine.unlock_sync_mutex
-            raise
-          end
+          @@database.destroy_table table
       end
       
       # updates values (hash) in a given table which satisfy condition (hash)

data/lib/framework/rhom/rhom_object_factory.rb

@@ -116,7 +116,14 @@ module Rhom
                     
                     sql << "attrib=" + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(attrib_name)
                     sql << " AND source_id=" + srcid_value 
-                    sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' ' + val_op + ' ' + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(value) 
+                    sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+
+                    if val_op == 'IN' or val_op == 'in'
+                        svalue = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(value)
+                        sql << val_op + ' ( ' + svalue[1,svalue.length()-2] + ' )'
+                    else
+                        sql << val_op + ' ' + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(value) 
+                    end
                     
                     sql
                 end

data/lib/framework/version.rb

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

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.4'
+    VERSION = '1.5.5'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.4'
+    DBVERSION = '1.5.5'
   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="23"
-      android:versionName="1.5.4">
+      android:versionCode="24"
+      android:versionName="1.5.5">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

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

@@ -42,6 +42,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -59,6 +60,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.ViewGroup.LayoutParams;
+import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -78,6 +80,8 @@ public class Rhodes extends Activity {
 	public static int WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_FULLSCREEN;
 	public static int WINDOW_MASK = WindowManager.LayoutParams.FLAG_FULLSCREEN;
 	
+	private static int MAX_PROGRESS = 10000;
+	
 	private long uiThreadId;
 	public long getUiThreadId() {
 		return uiThreadId;
@@ -96,7 +100,8 @@ public class Rhodes extends Activity {
 	private SplashScreen splashScreen = null;
 	
 	private Hashtable<String, UriHandler> uriHandlers = new Hashtable<String, UriHandler>();
-
+	private Boolean contentChanged = null;
+	
 	private String sdCardError = "Application can not access the SD card while it's mounted. Please unmount the device and stop the adb server before launching the app.";
 		
 	private String rootPath = null;
@@ -183,38 +188,53 @@ public class Rhodes extends Activity {
 		*/
 	}
 	
-	private void copyFilesFromBundle() {
+	public boolean isNameChanged() {
 		try {
-			//String phRootPath = phoneMemoryRootPath();
-			String sdRootPath = sdcardRootPath();
-			
-			boolean nameChanged = false;
-			boolean contentChanged = true;
-			
 			FileSource as = new AssetsSource(getResources().getAssets());
 			FileSource fs = new FileSource();
-			
-			nameChanged = !Utils.isContentsEquals(as, "name", fs, new File(sdRootPath, "name").getPath());
-			if (nameChanged)
-				contentChanged = true;
-			else
-				contentChanged = !Utils.isContentsEquals(as, "hash", fs, new File(sdRootPath, "hash").getPath());
-			
-			if (contentChanged) {
-				Logger.D(TAG, "Copying required files from bundle to sdcard");
+			return !Utils.isContentsEquals(as, "name", fs, new File(getRootPath(), "name").getPath());
+		}
+		catch (IOException e) {
+			return true;
+		}
+	}
+	
+	public boolean isBundleChanged() {
+		if (contentChanged == null) {
+			try {
+				String rp = getRootPath();
+				
+				FileSource as = new AssetsSource(getResources().getAssets());
+				FileSource fs = new FileSource();
+				
+				if (isNameChanged())
+					contentChanged = new Boolean(true);
+				else
+					contentChanged = new Boolean(!Utils.isContentsEquals(as, "hash", fs, new File(rp, "hash").getPath()));
+			}
+			catch (IOException e) {
+				contentChanged = new Boolean(true);
+			}
+		}
+		return contentChanged.booleanValue();
+	}
+	
+	private void copyFilesFromBundle() {
+		try {
+			if (isBundleChanged()) {
+				Logger.D(TAG, "Copying required files from bundle");
+				
+				boolean nameChanged = isNameChanged();
 				
-				/*
-				File phrf = new File(phRootPath);
-				if (!phrf.exists())
-					phrf.mkdirs();
-				phrf = null;
-				*/
+				String rp = getRootPath();
+				
+				FileSource as = new AssetsSource(getResources().getAssets());
 
 				String items[] = {"apps", "lib", "db", "hash", "name"};
 				for (int i = 0; i != items.length; ++i) {
 					String item = items[i];
 					//File phf = new File(phRootPath, item);
-					File sdf = new File(sdRootPath, item);
+					File sdf = new File(rp, item);
 					Logger.D(TAG, "Copy '" + item + "' to '" + sdf + "'");
 					Utils.copyRecursively(as, item, sdf, nameChanged);
 					/*
@@ -230,6 +250,7 @@ public class Rhodes extends Activity {
 					dbfiles.mkdirs();
 				dbfiles = null;
 				
+				contentChanged = new Boolean(true);
 				Logger.D(TAG, "All files copied");
 			}
 			else
@@ -253,13 +274,6 @@ public class Rhodes extends Activity {
 	public WebView createWebView() {
 		WebView w = new WebView(this);
 		
-		try {
-			w.loadUrl("file:///android_asset/apps/app/loading.html");
-		}
-		catch (Exception e) {
-			// Ignore
-		}
-		
 		WebSettings webSettings = w.getSettings();
 		webSettings.setSavePassword(false);
 		webSettings.setSaveFormData(false);
@@ -274,19 +288,44 @@ public class Rhodes extends Activity {
 		w.setHorizontalScrollBarEnabled(true);
 
 		w.setWebViewClient(new WebViewClient() {
+			
+			private boolean splashHidden = false;
 
 			@Override
 			public boolean shouldOverrideUrlLoading(WebView view, String url) {
 				return handleUrlLoading(url);
 			}
 			
+			@Override
+			public void onPageStarted(WebView view, String url, Bitmap favicon) {
+				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
+				super.onPageStarted(view, url, favicon);
+			}
+			
 			@Override
 			public void onPageFinished(WebView view, String url) {
-				if (url.startsWith("http://"))
+				if (!splashHidden && url.startsWith("http://")) {
 					hideSplashScreen();
+					splashHidden = true;
+				}
+				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
+				super.onPageFinished(view, url);
 			}
 
 		});
+		
+		w.setWebChromeClient(new WebChromeClient() {
+			@Override
+			public void onProgressChanged(WebView view, int newProgress) {
+				newProgress *= 100;
+				if (newProgress < 0)
+					newProgress = 0;
+				if (newProgress > MAX_PROGRESS)
+					newProgress = MAX_PROGRESS;
+				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
+				super.onProgressChanged(view, newProgress);
+			}
+		});
 
 		return w;
 	}
@@ -355,8 +394,8 @@ public class Rhodes extends Activity {
 		}
 	}
 	
-	private void showSplashScreen(String file) throws IOException {
-		splashScreen = new SplashScreen(this, file);
+	private void showSplashScreen() {
+		splashScreen = new SplashScreen(this, "apps/app/loading.png");
 		splashScreen.start(outerFrame);
 	}
 	
@@ -380,7 +419,9 @@ public class Rhodes extends Activity {
 			return;
 		}
 		
-		uiThreadId = Thread.currentThread().getId();
+		Thread ct = Thread.currentThread();
+		ct.setPriority(Thread.MAX_PRIORITY);
+		uiThreadId = ct.getId();
 		RhodesInstance.setInstance(this);
 		
 		initRootPath();
@@ -412,19 +453,19 @@ public class Rhodes extends Activity {
 		this.setContentView(outerFrame, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
 		
 		Logger.I("Rhodes", "Loading...");
+		showSplashScreen();
+		
+		// Increase WebView rendering priority
+		WebView w = new WebView(this);
+		WebSettings webSettings = w.getSettings();
+		webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
 		
+		// Get screen width/height
 		WindowManager wm = (WindowManager)getSystemService(Context.WINDOW_SERVICE);
 		Display d = wm.getDefaultDisplay();
 		screenHeight = d.getHeight();
 		screenWidth = d.getWidth();
 		
-		try {
-			showSplashScreen("apps/app/loading.png");
-		}
-		catch (Exception e) {
-			setMainView(new SimpleMainView());
-		}
-		
 		// TODO: detect camera availability
 		isCameraAvailable = true;
 		
@@ -645,6 +686,10 @@ public class Rhodes extends Activity {
 		Process.killProcess(Process.myPid());
 	}
 	
+	public static void exit() {
+		RhodesInstance.getInstance().stopSelf();
+	}
+	
 	static {
 		// Load native implementation of rhodes
 		System.loadLibrary("rhodes");

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

@@ -7,23 +7,74 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.ImageView;
 
 public class SplashScreen {
 	
-	private ImageView view;
+	private static final String INSTALLING_PAGE = "apps/app/installing.html";
+	private static final String LOADING_PAGE = "apps/app/loading.html";
+	
+	private View view;
 	
 	private native void nativeStart();
 	private native void nativeHide();
 	
-	public SplashScreen(Context ctx, String file) throws IOException {
-		view = new ImageView(ctx);
+	public SplashScreen(Context ctx, String file) {
 		AssetManager am = ctx.getResources().getAssets();
-		InputStream is = am.open(file);
-		Bitmap bitmap = BitmapFactory.decodeStream(is);
-		view.setImageBitmap(bitmap);
-		view.setId(Rhodes.RHO_SPLASH_VIEW);
+		
+		Bitmap bitmap = null;
+		if (file != null) {
+			try {
+				InputStream is = am.open(file);
+				bitmap = BitmapFactory.decodeStream(is);
+				is.close();
+			}
+			catch (IOException e) {}
+		}
+		if (bitmap != null) {
+			ImageView v = new ImageView(ctx);
+			v.setImageBitmap(bitmap);
+			v.setId(Rhodes.RHO_SPLASH_VIEW);
+			view = v;
+		}
+		else {
+			Rhodes r = RhodesInstance.getInstance();
+			WebView v = r.createWebView();
+			
+			boolean bc = r.isBundleChanged();
+			String page = bc ? INSTALLING_PAGE : LOADING_PAGE;
+			
+			boolean hasNeededPage;
+			try {
+				InputStream is1 = am.open(page);
+				if (is1 != null)
+					is1.close();
+				hasNeededPage = true;
+			}
+			catch (IOException e1) {
+				hasNeededPage = false;
+			}
+			
+			if (hasNeededPage) {
+				v.loadUrl("file:///android_asset/" + page);
+			}
+			else {
+				StringBuffer p = new StringBuffer();
+				p.append("<html><title>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("</title><body>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("...</body></html>");
+				v.loadData(p.toString(), "text/html", "utf-8");
+			}
+			
+			v.setId(Rhodes.RHO_SPLASH_VIEW);
+			
+			view = v;
+		}
 	}
 	
 	public void start(ViewGroup outer) {