rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java

@@ -56,7 +56,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 			String url = request.getURL();
     		if ( URI.isLocalHost(url) || URI.isLocalData(url))
     		{
-                HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null);
+                HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
                 
                 return connection;
     		}else

data/platform/bb/rhodes/rhodes.jdp

@@ -28,11 +28,10 @@ resources\icon.png
 src\com\rho\BBVersionSpecific.java
 src\com\rho\BrowserAdapter.java
 src\com\rho\BrowserAdapter5.java
-src\com\rho\IBrowserAdapter.java
-src\com\rho\Version.java
 src\com\rho\file\Jsr75File.java
 src\com\rho\file\Jsr75RAFileImpl.java
 src\com\rho\file\PersistRAFileImpl.java
+src\com\rho\IBrowserAdapter.java
 src\com\rho\net\BaseSocket.java
 src\com\rho\net\bb\BBHttpConnection.java
 src\com\rho\net\bb\NativeBBHttpConnection.java
@@ -44,8 +43,9 @@ src\com\rho\RhoRubyHelper.java
 src\com\rho\rubyext\Alert.java
 src\com\rho\rubyext\GeoLocation.java
 src\com\rho\rubyext\System.java
-src\com\rho\rubyext\XMLParser.java
 src\com\rho\rubyext\WebView.java
+src\com\rho\rubyext\XMLParser.java
+src\com\rho\Version.java
 src\rhomobile\camera\Camera.java
 src\rhomobile\camera\CameraFilesListener.java
 src\rhomobile\camera\CameraScreen.java
@@ -87,7 +87,7 @@ OutputFileName=rhodes
 RibbonPosition=0
 [RolloverIcons
 ]
-RunOnStartup=1
+RunOnStartup=0
 StartupTier=7
 SystemModule=0
 Type=0

data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java

@@ -197,9 +197,13 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
                 	
                     synchronized (Application.getEventLock()) 
                     {
-                    	Field old = m_oMainScreen.getField(0);
-                    	m_oMainScreen.add(field);
-                    	m_oMainScreen.delete(old);
+                    	if ( m_oMainScreen.getFieldCount() > 0 )
+                    	{
+	                    	Field old = m_oMainScreen.getField(0);
+	                    	m_oMainScreen.add(field);
+	                    	m_oMainScreen.delete(old);
+                    	}else
+                    		m_oMainScreen.add(field);
 /*                        
                         _mainScreen.doPaint();
                         if ( e == null )
@@ -248,7 +252,7 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
         
         try
         {
-        	if (referrer == null || !m_bLoadImageAsync) 
+        	if (referrer == null || URI.isLocalData(url) || !m_bLoadImageAsync) 
         	{
 	        	boolean bLocalHost = URI.isLocalHost(url);
 	        	if ( bLocalHost && m_connResource!= null)

data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java

@@ -5,8 +5,20 @@ import java.util.Vector;
 
 import javax.microedition.media.Player;
 
+import rhomobile.RhodesApplication;
+
 import net.rim.device.api.system.Application;
+import net.rim.device.api.system.Bitmap;
+import net.rim.device.api.ui.Field;
+import net.rim.device.api.ui.FieldChangeListener;
+import net.rim.device.api.ui.Manager;
+import net.rim.device.api.ui.component.BitmapField;
+import net.rim.device.api.ui.component.ButtonField;
 import net.rim.device.api.ui.component.Dialog;
+import net.rim.device.api.ui.component.LabelField;
+import net.rim.device.api.ui.container.HorizontalFieldManager;
+import net.rim.device.api.ui.container.PopupScreen;
+import net.rim.device.api.ui.container.VerticalFieldManager;
 
 import com.rho.RhoClassFactory;
 import com.rho.RhoEmptyLogger;
@@ -49,21 +61,123 @@ public class Alert
     	return val != null && val != RubyConstant.QNIL ? val.toStr() : ""; 
     }
     
+    private static class AlertDialog extends PopupScreen {
+    	
+    	private static AlertDialog current = null;
+    	
+    	private HorizontalFieldManager hfm;
+    	private String callback = null;
+    	
+    	public AlertDialog(String title, String msg, String icon, String c) {
+    		super(new VerticalFieldManager(Manager.NO_VERTICAL_SCROLL | Manager.NO_VERTICAL_SCROLLBAR));
+    		
+    		callback = c;
+    		
+    		Manager mgr = new VerticalFieldManager(Manager.NO_VERTICAL_SCROLL | Manager.NO_VERTICAL_SCROLLBAR);
+    		add(mgr);
+    		
+    		if (title != null) {
+    			LabelField tf = new LabelField(title, Field.FIELD_HCENTER);
+    			mgr.add(tf);
+    		}
+    		
+    		HorizontalFieldManager lfm = new HorizontalFieldManager();
+    		mgr.add(lfm);
+
+    		Bitmap bmp = null;
+    		if (icon != null) {
+    			if (icon.equalsIgnoreCase(alertTypeID.toString()))
+    				bmp = Bitmap.getPredefinedBitmap(Bitmap.EXCLAMATION);
+    			else if (icon.equalsIgnoreCase(questionTypeID.toString()))
+    				bmp = Bitmap.getPredefinedBitmap(Bitmap.QUESTION);
+    			else if (icon.equalsIgnoreCase(infoTypeID.toString()))
+    				bmp = Bitmap.getPredefinedBitmap(Bitmap.INFORMATION);
+    			// TODO: load bitmap from file
+    		}
+			if (bmp != null) {
+				BitmapField bf = new BitmapField(bmp, Field.FIELD_LEFT | Field.FIELD_VCENTER);
+				lfm.add(bf);
+			}
+
+    		LabelField lf = new LabelField(msg, Field.FIELD_HCENTER | Field.FIELD_VCENTER);
+    		lfm.add(lf);
+    		
+    		hfm = new HorizontalFieldManager();
+    		mgr.add(hfm);
+    	}
+    	
+    	private class Callback implements FieldChangeListener {
+
+    		private String id;
+    		private String text;
+    		
+    		public Callback(String i, String t) {
+    			id = i;
+    			text = t;
+    		}
+    		
+			public void fieldChanged(Field field, int context) {
+				try {
+					RhodesApp.getInstance().callPopupCallback(callback, id, text);
+				} catch (Exception e) {
+					LOG.ERROR("show_popup callback failed.", e);
+				}
+				hide();
+			}
+    		
+    	};
+    	
+    	public void addButton(String id, String text) {
+    		ButtonField bf = new ButtonField(text);
+    		bf.setChangeListener(new Callback(id, text));
+    		hfm.add(bf);
+    	}
+    	
+    	public void show() {
+    		RhodesApplication app = (RhodesApplication)Application.getApplication();
+    		app.requestForeground();
+    		app.pushScreen(this);
+    		current = this;
+    	}
+    	
+    	public void hide() {
+    		RhodesApplication app = (RhodesApplication)Application.getApplication();
+    		app.popScreen(this);
+    		current = null;
+    	}
+    	
+    	private static void hidePopup() {
+    		Application.getApplication().invokeLater(new Runnable() {
+    			public void run() {
+    				if (current == null)
+    	    			return;
+    				current.hide();
+    				current = null;
+    			}
+    		});
+    	}
+    };
+    
     private static class PopupHandler implements Runnable
     {
-    	String m_strMessage = "";
-    	String m_strCallback = "";
-    	Vector m_vecButtons = new Vector();
-    	Vector m_vecIDs = new Vector();
-    	private static final int atAlert = 1;
-    	private static final int atQuestion = 2;
-    	private static final int atInfo = 3;
-    	int      m_nType = 0;
+    	//String m_strMessage = "";
+    	//String m_strCallback = "";
+    	//Vector m_vecButtons = new Vector();
+    	//Vector m_vecIDs = new Vector();
+    	//private static final int atAlert = 1;
+    	//private static final int atQuestion = 2;
+    	//private static final int atInfo = 3;
+    	//int      m_nType = 0;
+    	
+    	private AlertDialog dialog;
     	
     	PopupHandler(RubyHash hash)
     	{
-    		m_strMessage = getHashStringValue(hash, messageID );
-    		m_strCallback = getHashStringValue(hash, callbackID );
+    		String title = getHashStringValue(hash, titleID );
+    		String msg = getHashStringValue(hash, messageID );
+    		String icon = getHashStringValue(hash, iconID );
+    		String callback = getHashStringValue(hash, callbackID );
+    		dialog = new AlertDialog(title, msg, icon, callback);
     		
     		RubyValue valButtons = hash.get(buttonsID.toSymbol());
     		if ( valButtons != null && valButtons instanceof RubyArray )
@@ -74,24 +188,24 @@ public class Alert
     				RubyValue valButton = arButtons.get(i);
     				if ( valButton != null && valButton instanceof RubyString )
     				{
-    					m_vecButtons.addElement(valButton.toStr());
-    					m_vecIDs.addElement(valButton.toStr());
+    					String text = valButton.toStr();
+    					dialog.addButton(text, text);
     				}else if ( valButton != null && valButton instanceof RubyHash )
     				{
     					String strLabel = getHashStringValue((RubyHash)valButton, titleID );
     					if ( strLabel.length() > 0 )
     					{
-    						m_vecButtons.addElement(strLabel);
     						String strID = getHashStringValue((RubyHash)valButton, buttonidID );
     						if ( strID.length() > 0 )
-    							m_vecIDs.addElement(strID);
+    							dialog.addButton(strID, strLabel);
     						else
-    							m_vecIDs.addElement(strLabel);
+    							dialog.addButton(strLabel, strLabel);
     					}
     				}
     			}
     		}
     		
+    		/*
     		RubyValue valIcon = hash.get(iconID.toSymbol());
     		if ( valIcon instanceof RubySymbol )
     		{
@@ -109,11 +223,14 @@ public class Alert
     			else
     				m_nType = atInfo;
     		}
+    		*/
     	}
     	
-        public void run() {    	
+        public void run() {
+        	dialog.show();
+        	/*
         	Application.getApplication().requestForeground();
-
+        	
         	switch( m_nType )
         	{
         	case atAlert:
@@ -138,6 +255,7 @@ public class Alert
         		break;
         		
         	}
+        	*/
         }
     	
     }
@@ -254,6 +372,20 @@ public class Alert
 					
 			}
 		});
+		klass.getSingletonClass().defineMethod("hide_popup", new RubyNoArgMethod() {
+
+			protected RubyValue run(RubyValue receiver, RubyBlock block) {
+				try {
+					AlertDialog.hidePopup();
+					return RubyConstant.QNIL;
+				}
+				catch (Exception e) {
+					LOG.ERROR("hide_popup failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+			
+		});
 		klass.getSingletonClass().defineMethod("vibrate", new RubyVarArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) 
 			{

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

@@ -147,24 +147,27 @@ public class PushListeningThread extends Thread {
             } 
             catch (IOException ioe)
             {
-            	LOG.ERROR("Exception thrown by _notify.acceptAndOpen() - exiting push thread", ioe);
-            	
-            	// Likely the stream was closed. Catches the exception thrown by 
-                // _notify.acceptAndOpen() when this program exits.
+            	if ( !_stop )
+            	{
+            		LOG.ERROR("Exception thrown by _notify.acceptAndOpen() - exiting push thread", ioe);
+	            	
+	            	// Likely the stream was closed. Catches the exception thrown by 
+	                // _notify.acceptAndOpen() when this program exits.
+	            	
+	            	_stop = true;
+	                if ( _notify != null ) 
+	                {
+	                    try 
+	                    {
+	                        _notify.close();
+	                    } 
+	                    catch ( IOException e ) 
+	                    {
+	                    }
+	                }
+            	}
             	
-            	_stop = true;
-                
-                if ( _notify != null ) 
-                {
-                    try 
-                    {
-                        _notify.close();
-                        _notify = null;
-                    } 
-                    catch ( IOException e ) 
-                    {
-                    }
-                }
+                _notify = null;
             }
         }
     }

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

@@ -41,6 +41,7 @@ import com.rho.*;
 import com.rho.rubyext.GeoLocation;
 import com.rho.net.NetResponse;
 import com.rho.net.RhoConnection;
+import com.rho.sync.ClientRegister;
 import com.rho.sync.SyncThread;
 import com.rho.sync.ISyncStatusListener;
 import com.rho.file.Jsr75File;
@@ -394,16 +395,21 @@ final public class RhodesApplication extends UiApplication implements SystemList
         	throw new RuntimeException("Application failed and will exit. Log will send to log server." + e.toString());
 		}
 		
-		_pushListeningThread.stop();
-		
-        RhoLogger.close();
 		//LOG.TRACE("Rhodes MAIN exit ***--------------------------***");
     }
 
     void doClose(){   	
     	LOG.TRACE("Rhodes DO CLOSE ***--------------------------***");
-/*    	
-		SyncEngine.stop(null);
+
+    	if ( _pushListeningThread != null )
+    		_pushListeningThread.stop();
+		
+    	if ( ClientRegister.getInstance() != null )
+    		ClientRegister.getInstance().Destroy();
+    	
+    	if ( SyncThread.getInstance() != null )
+    		SyncThread.getInstance().Destroy();
+    	
 		GeoLocation.stop();
         RhoRuby.RhoRubyStop();
         
@@ -412,7 +418,8 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	}catch(IOException exc){
     		LOG.ERROR(exc);
     	}
-*/
+
+        RhoLogger.close();
     }
     
     private int m_activateHookNo = 0;
@@ -812,15 +819,22 @@ final public class RhodesApplication extends UiApplication implements SystemList
 		
 		public void close() {
 			LOG.TRACE("Calling Screen.close");
-			Application.getApplication().requestBackground();
+			
+			if (com.rho.Capabilities.RUNAS_SERVICE)
+				Application.getApplication().requestBackground();
+			else
+			{
+				doClose();
+				super.close();
+			}
 		}
-		
+/*		
 		public boolean onClose() {
 			doClose();
 			return super.onClose();
 			//System.exit(0);
 			//return true;
-		}
+		}*/
 
 		public boolean onMenu(int instance) {
 			// TODO Auto-generated method stub
@@ -915,7 +929,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	if (_mainScreen!=null)
     		return;
     	
-    	if ( ApplicationManager.getApplicationManager().inStartup() )// || isWaitForSDCardAtStartup() )
+    	if ( com.rho.Capabilities.RUNAS_SERVICE && ApplicationManager.getApplicationManager().inStartup() )// || isWaitForSDCardAtStartup() )
     	{
             this.invokeLater( new Runnable() {
                 public void run() 
@@ -928,10 +942,11 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	}
     	
     	try{
-    		System.out.println("RHODES - 1");
-    		if ( !Jsr75File.isSDCardExist() )
-    			Thread.sleep(5000); //Wait till SDCard may appear
-    		System.out.println("RHODES - 1");
+    		if ( com.rho.Capabilities.RUNAS_SERVICE )
+    		{
+    			if ( !Jsr75File.isSDCardExist() )
+    				Thread.sleep(5000); //Wait till SDCard may appear
+    		}
     		
         	RhoLogger.InitRhoLog();
 	    	
@@ -1019,14 +1034,19 @@ final public class RhodesApplication extends UiApplication implements SystemList
         // 2) From System Listener - after system restart and when the app is originally installed
         // To make sure we don't actually do the startup stuff twice,
         // we use _mainScreen as a flag
-        if ( _mainScreen == null ) {
-            LOG.INFO_OUT(" Shedule doStartupWork() ***---------------------------------- " );
-            this.invokeLater( new Runnable() { 
-                public void run() 
-                {
-                    doStartupWork(); 
-                }
-            } );
+        if ( _mainScreen == null ) 
+        {
+        	if ( com.rho.Capabilities.RUNAS_SERVICE )
+        	{
+	            LOG.INFO_OUT(" Shedule doStartupWork() ***---------------------------------- " );
+	            this.invokeLater( new Runnable() { 
+	                public void run() 
+	                {
+	                    doStartupWork(); 
+	                }
+	            } );
+        	}else
+        		doStartupWork();
         }
     }
 
@@ -1035,8 +1055,11 @@ final public class RhodesApplication extends UiApplication implements SystemList
 
     public void powerUp() {
         LOG.INFO_OUT(" POWER UP ***----------------------------------*** " );
-        invokeStartupWork();
-        this.requestBackground();
+        if ( com.rho.Capabilities.RUNAS_SERVICE)
+        {
+        	invokeStartupWork();
+        	this.requestBackground();
+        }
     }
     public void powerOff() {
         LOG.TRACE(" POWER DOWN ***----------------------------------*** " );
@@ -1055,7 +1078,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
         m_activateHooks = new Hashtable();
         this.addSystemListener(this);
         //this.addFileSystemListener(this);
-        if ( ApplicationManager.getApplicationManager().inStartup() ) {
+        if ( com.rho.Capabilities.RUNAS_SERVICE && ApplicationManager.getApplicationManager().inStartup() ) {
             LOG.INFO_OUT("We are in the phone startup, don't start Rhodes yet, leave it to power up call");
         } else {
             invokeStartupWork();
@@ -1137,9 +1160,12 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	    		LOG.ERROR("initRuby crashed.", exc);
     	    		return;
     	    	}
-
-    	    	_pushListeningThread = new PushListeningThread();
-    	    	_pushListeningThread.start();
+    	    	
+    	    	if (com.rho.Capabilities.ENABLE_PUSH)
+    	    	{
+	    	    	_pushListeningThread = new PushListeningThread();
+	    	    	_pushListeningThread.start();
+    	    	}
     	    	
         		while( !m_bExit )
         		{