rhodes 3.0.0 → 3.0.1.beta.2

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

@@ -90,7 +90,7 @@ public class WebView {
 
 	public static void navigate(String url, int index) {
 		try {
-			PerformOnUiThread.exec(new NavigateTask(url, index), false);
+			PerformOnUiThread.exec(new NavigateTask(url, index));
 		}
 		catch (Exception e) {
 			reportFail("navigate", e);
@@ -99,7 +99,7 @@ public class WebView {
 	
 	public static void navigateBack() {
 		try {
-			PerformOnUiThread.exec(new NavigateBackTask(activeTab()), false);
+			PerformOnUiThread.exec(new NavigateBackTask(activeTab()));
 		}
 		catch (Exception e) {
 			reportFail("navigateBack", e);
@@ -108,7 +108,7 @@ public class WebView {
 	
 	public static void refresh(int index) {
 		try {
-			PerformOnUiThread.exec(new RefreshTask(index), false);
+			PerformOnUiThread.exec(new RefreshTask(index));
 		}
 		catch (Exception e) {
 			reportFail("refresh", e);
@@ -129,7 +129,7 @@ public class WebView {
 	
 	public static void executeJs(String js, int index) {
 		try {
-			PerformOnUiThread.exec(new NavigateTask("javascript:" + js, index), false);
+			PerformOnUiThread.exec(new NavigateTask("javascript:" + js, index));
 		}
 		catch (Exception e) {
 			reportFail("executeJs", e);
@@ -138,7 +138,7 @@ public class WebView {
 	
 	public static void setCookie(String url, String cookie) {
 		try {
-			PerformOnUiThread.exec(new SetCookieTask(url, cookie), false);
+			PerformOnUiThread.exec(new SetCookieTask(url, cookie));
 		}
 		catch (Exception e) {
 			reportFail("setCookie", e);

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

@@ -29,6 +29,7 @@ import android.os.Vibrator;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
@@ -43,48 +44,75 @@ public class Alert {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 
-	public static void showPopup(final Object params) {
-		try {
-			Logger.T(TAG, "showPopup");
-			PerformOnUiThread.exec(new Runnable() {
-				public void run() {
-					PopupActivity.showDialog(params);
-				}
-			}, false);
-		}
-		catch (Exception e) {
-			reportFail("showPopup", e);
-		}
-	}
-	
-	public static void hidePopup() {
-		try {
-			Logger.T(TAG, "hidePopup");
-			PerformOnUiThread.exec(new Runnable() {
-				public void run() {
-					PopupActivity.hidePopup();
-				}
-			}, false);
-		}
-		catch (Exception e) {
-			reportFail("hidePopup", e);
-		}
-	}
+    public static void showPopup(final Object params) {
+        RhodesApplication.runWhen(
+                RhodesApplication.AppState.AppActivated,
+                new RhodesApplication.StateHandler(true) {
+                    @Override
+                    public void run() {
+                        try {
+                            Logger.T(TAG, "showPopup");
+                            //PerformOnUiThread.exec(new Runnable() {
+                            //    @Override
+                            //    public void run() {
+                                    PopupActivity.showDialog(params);
+                            //    }
+                            //});
+                        }
+                        catch (Exception e) {
+                            reportFail("showPopup", e);
+                            setError(e);
+                        }
+                    }
+                });
+    }
+
+    public static void hidePopup() {
+        RhodesApplication.runWhen(
+                RhodesApplication.AppState.AppActivated,
+                new RhodesApplication.StateHandler(true) {
+                    @Override
+                    public void run() {
+                        try {
+                            Logger.T(TAG, "hidePopup");
+                            //PerformOnUiThread.exec(new Runnable() {
+                            //    @Override
+                            //    public void run() {
+                                    PopupActivity.hidePopup();
+                            //    }
+                            //});
+                        }
+                        catch (Exception e) {
+                            reportFail("hidePopup", e);
+                            setError(e);
+                        }
+                    }
+                });
+    }
+
+    public static void showStatusPopup(final String title, final String message, final String hide) {
+        RhodesApplication.runWhen(
+                RhodesApplication.AppState.AppActivated,
+                new RhodesApplication.StateHandler(true) {
+                    @Override
+                    public void run() {
+                        try {
+                            Logger.I(TAG, "showStatusPopup");
+                            //PerformOnUiThread.exec(new Runnable() {
+                            //    @Override
+                            //    public void run() {
+                                    PopupActivity.showStatusDialog(title, message, hide);
+                            //    }
+                            //});
+                        }
+                        catch (Exception e) {
+                            reportFail("showStatusPopup", e);
+                            setError(e);
+                        }
+                    }
+                });
+    }
 
-	public static void showStatusPopup(final String title, final String message, final String hide) {
-		try {
-			Logger.I(TAG, "showStatusPopup");
-			PerformOnUiThread.exec(new Runnable() {
-				public void run() {
-					PopupActivity.showStatusDialog(title, message, hide);
-				}
-			}, false);
-		}
-		catch (Exception e) {
-			reportFail("showStatusPopup", e);
-		}
-	}
-	
 	public static void vibrate(int duration) {
 		try {
 			if (!Capabilities.VIBRATE_ENABLED)

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

@@ -160,9 +160,11 @@ public class PopupActivity extends Activity {
 		createDialog(title, message, icon, buttons, callback);
 	}
 	
-	private void createDialog(String title, String message, Drawable icon, Vector<CustomButton> buttons, String callback) {
+	synchronized private void createDialog(String title, String message, Drawable icon, Vector<CustomButton> buttons, String callback) {
 		Context ctx = this;
 		
+		Logger.T(TAG, "Creating dialog{ title: " + title + ", message: " + message + ", buttons cnt: " + buttons.size() + ", callback: " + callback);
+		
 		int nTopPadding = 10;
         
 		Dialog dialog = new Dialog(ctx);
@@ -250,7 +252,7 @@ public class PopupActivity extends Activity {
 	}
 	
 	@SuppressWarnings("unchecked")
-	public static void showDialog(Context ctx, Object params) {
+	public static void showDialog(RhodesService ctx, Object params) {
 		String title = "";
 		String message = null;
 		String icon = null;
@@ -316,7 +318,7 @@ public class PopupActivity extends Activity {
 		}
 		
 		Intent intent = new Intent(ctx, PopupActivity.class);
-		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+		//intent.addFlags(/*Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION*/);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".title", title);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".message", message);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".icon", icon);
@@ -337,7 +339,7 @@ public class PopupActivity extends Activity {
 		}
 		
 		Intent intent = new Intent(ctx, PopupActivity.class);
-		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+		//intent.addFlags(/*Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION*/);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".title", title);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".message", message);
 		intent.putExtra(INTENT_EXTRA_PREFIX + ".buttons.ids", new String[] {hide});
@@ -345,7 +347,7 @@ public class PopupActivity extends Activity {
 		ctx.startActivity(intent);
 	}
 	
-	public static void hidePopup() {
+	public synchronized static void hidePopup() {
 		if (currentAlert == null)
 			return;
 		currentAlert.dismiss();

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

@@ -2,6 +2,7 @@ package com.rhomobile.rhodes.util;
 
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesApplication;
 
 public class PerformOnUiThread implements Runnable {
 	
@@ -27,39 +28,71 @@ public class PerformOnUiThread implements Runnable {
 		}
 	}
 	
-	public static void exec(Runnable r, int delay) {
-		try {
-			RhodesActivity ra = RhodesActivity.getInstance();
-			ra.post(r, delay);
-		}
-		catch (Exception e) {
-			Logger.E(TAG, "exec failed: " + e.getMessage());
-		}
-	}
-	
-	public static void exec(Runnable r, boolean wait) {
-		try {
-			RhodesActivity ra = RhodesActivity.getInstance();
-			if (!wait) {
-				ra.post(r);
-			}
-			else {
-				long thrId = Thread.currentThread().getId();
-				if (ra.getUiThreadId() == thrId) {
-					// We are already in UI thread
-					r.run();
-				}
-				else {
-					// Post request to UI thread and wait when it would be done
-					synchronized (r) {
-						ra.post(new PerformOnUiThread(r));
-						r.wait();
-					}
-				}
-			}
-		}
-		catch (Exception e) {
-			Logger.E(TAG, "exec failed: " + e.getMessage());
-		}
-	}
+	public static void exec(final Runnable r, final int delay) {
+        RhodesApplication.runWhen(
+                RhodesApplication.UiState.MainActivityCreated,
+                new RhodesApplication.StateHandler(true) {
+                    @Override
+                    public void run() {
+                        try {
+                            RhodesActivity.safeGetInstance().post(r, delay);
+                        }
+                        catch (Exception e) {
+                            Logger.E(TAG, "exec failed: " + e.getMessage());
+                            setError(e);
+                        }
+                    }
+                });
+    }
+
+    @Deprecated
+	public static void exec(final Runnable r, final boolean wait) {
+        if (wait)
+            sync_exec(r);
+        else
+            exec(r);
+    }
+
+    public static void exec(final Runnable r) {
+        RhodesApplication.runWhen(
+                RhodesApplication.UiState.MainActivityCreated,
+                new RhodesApplication.StateHandler(true) {
+                    @Override
+                    public void run() {
+                        try {
+                            RhodesActivity.safeGetInstance().post(r);
+                        } catch (Exception e) {
+                            Logger.E(TAG, "exec failed: " + e.getMessage());
+                            setError(e);
+                        }
+                    }
+                });
+    }
+    
+    
+    // Special exec edition for RhoBluetoothManager
+    //TODO: Use future pattern to return result and wait
+    @Deprecated
+    public static void sync_exec(final Runnable r)
+    {
+        try {
+            RhodesActivity ra = RhodesActivity.safeGetInstance();
+            
+            long thrId = Thread.currentThread().getId();
+            if (ra.getUiThreadId() == thrId) {
+                // We are already in UI thread
+                r.run();
+            }
+            else {
+                // Post request to UI thread and wait when it would be done
+                synchronized (r) {
+                    ra.post(new PerformOnUiThread(r));
+                    r.wait();
+                }
+            }
+        } catch (Exception e) {
+            Logger.E(TAG, "exec failed: " + e.getMessage());
+            Thread.dumpStack();
+        }
+    }
 };

data/platform/android/build/RhodesSRC_build.files

@@ -15,6 +15,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityListener.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

data/platform/android/build/android.rake

@@ -7,7 +7,7 @@ USE_OWN_STLPORT = false
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0" }.each do |k,v|
+{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0", 12 => "3.1" }.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -1570,7 +1570,7 @@ namespace "run" do
         device_flag = '-e'
 
         logclear(device_flag)
-        run_emulator :hidden => true
+        run_emulator( :hidden => true ) if device_flag == '-e'
         do_uninstall(device_flag)
         
         # Failsafe to prevent eternal hangs

data/platform/bb/RubyVM/src/com/rho/RhoConf.java

@@ -402,6 +402,7 @@ public class RhoConf {
 		
 		NetResponse resp = null;
 		try{
+			nq.sslVerifyPeer(false);
 			resp = nq.pushMultipartData(strQuery, oItem, com.rho.sync.SyncThread.getSyncEngine(), null );
 		}catch(Exception exc)
 		{

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -57,8 +57,11 @@ public class DBAdapter extends RubyBasic
 	public void close()
 	{ 
 		try{
-			m_dbStorage.close();
-			m_dbStorage = null;
+			if ( m_dbStorage != null )
+			{
+				m_dbStorage.close();
+				m_dbStorage = null;
+			}
 		}catch(Exception exc)
 		{
     		LOG.ERROR("DB close failed.", exc);
@@ -1179,10 +1182,19 @@ public class DBAdapter extends RubyBasic
 		    	
 			}
 		});
-		/*klass.defineMethod( "close", new RubyNoArgMethod(){ 
-			protected RubyValue run(RubyValue receiver, RubyBlock block ){
-				return ((DBAdapter)receiver).rb_close();}
-		});*/
+		klass.defineMethod( "close", new RubyNoArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyBlock block )
+			{
+		    	try{
+					((DBAdapter)receiver).close();
+					return ObjectFactory.createInteger(0);
+		    	}catch( Exception e ){
+		    		LOG.ERROR("close failed.", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+		    	}
+			}
+		});
+		
 		klass.defineMethod( "execute", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
 				return ((DBAdapter)receiver).rb_execute(args.get(0), args.get(1), 

data/platform/bb/build/bb.rake

@@ -250,7 +250,7 @@ namespace "build" do
     def runPreverify(args)  
       jdehome = $config["env"]["paths"][$bbver]["jde"]
     
-      startdir = pwd
+      startdir = Dir.pwd()
       chdir $tmpdir
       puts Jake.run(File.join(jdehome,"bin/preverify"),args)
       chdir startdir

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -480,15 +480,16 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	if ( ClientRegister.getInstance() != null )
     		ClientRegister.getInstance().Destroy();
     	
-    	if ( SyncThread.getInstance() != null )
-    		SyncThread.getInstance().Destroy();
-    	
     	RhoRuby.rho_ruby_deactivateApp();
     	RhoRuby.rho_ruby_uiDestroyed();
     	
 		GeoLocation.stop();
+
+    	if ( SyncThread.getInstance() != null )
+    		SyncThread.getInstance().Destroy();
+
         RhoRuby.RhoRubyStop();
-        
+    	
     	try{
     		RhoClassFactory.getNetworkAccess().close();
     	}catch(IOException exc){

data/platform/iphone/Classes/SimpleMainView.m

@@ -616,7 +616,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	self.webView.backgroundColor = bc;
 	self.view.backgroundColor = bc;
 	
-	NSString* data = [NSString stringWithFormat:@"<body bgcolor=\"#%X\"></body>", bkg_color]; 
+	NSString* data = [NSString stringWithFormat:@"<body bgcolor=\"#%6$X\"></body>", bkg_color]; 
 	
 	self.webView.hidden = YES;