rhodes 2.2.3 → 2.2.4.beta.1

data/platform/bb/build/bb.rake

@@ -149,7 +149,7 @@ namespace "config" do
     #$rubypath = "res/build-tools/RhoRuby.exe" #path to RhoRuby
 
     $bbver = $app_config["bbver"].to_s
-    $bb6 = true if $bbver == "6.0"
+    #$bb6 = true if $bbver == "6.0"
     
     $builddir = $config["build"]["bbpath"] + "/build"
     $bindir = $app_path + "/bin"
@@ -343,7 +343,12 @@ namespace "build" do
       
       namepath = File.join(sdcardpath,"name.txt")        
       old_appname = File.read(namepath) if File.exists?(namepath)
-      rm_rf sdcardpath if old_appname != $appname
+      if old_appname != $appname
+        rm_rf sdcardpath 
+        #This is eclipse bag : it creates rho folder under simulator
+        rm_rf $config["env"]["paths"][$bbver]["jde"] +"/simulator/Rho/rhodes"
+      end
+        
       mkdir_p sdcardpath unless File.exists?(sdcardpath)
       
       confpath = File.join( sdcardpath, "/apps/rhoconfig.txt" )
@@ -911,7 +916,7 @@ namespace "run" do
         startsim
       end
       
-      task :spec => ["run:bb:stopmdsandsim", "package:bb:production_sim"] do
+      task :spec => ["run:bb:stopmdsandsim", "clean:bb", "package:bb:production_sim"] do
         jde = $config["env"]["paths"][$bbver]["jde"]
         cp_r File.join($targetdir,"/."), jde + "/simulator"
         rm_rf jde + "/simulator/sdcard/Rho"

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

@@ -198,28 +198,39 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 	        {
 	            public void run()
 	            {
-	
-					m_PushMessageThread = new PushMessageThread();
-					String strAppName = RhoConf.getInstance().getString("push_service_appname");
-					String strUrl = RhoConf.getInstance().getString("push_service_url");
-					int nPort = RhoConf.getInstance().getInt("push_service_port");
-					byte btServiceType = RhoConf.getInstance().getString("push_service_type").equalsIgnoreCase("BPAS") ?
-							PushApplicationDescriptor.SERVER_TYPE_BPAS : PushApplicationDescriptor.SERVER_TYPE_NONE;
-					
-					PushApplicationDescriptor pad = new PushApplicationDescriptor(
-							strAppName, nPort, strUrl, btServiceType, 
-							ApplicationDescriptor.currentApplicationDescriptor());
-					
-					PushApplicationStatus status = PushApplicationRegistry.getStatus(pad);
-			
-					LOG.INFO("registerPushService status : " + status.toString());
-			
-					if (status.getStatus() != PushApplicationStatus.STATUS_ACTIVE && status.getStatus() != PushApplicationStatus.STATUS_PENDING)
+	                try
+	                {
+					    m_PushMessageThread = new PushMessageThread();
+					    String strAppName = RhoConf.getInstance().getString("push_service_appname");
+    			        String strUrl = RhoConf.getInstance().getString("push_service_url");
+					    if ( strAppName != null && strAppName.length() > 0 && strUrl != null && strUrl.length() > 0 )
+					    {
+					        int nPort = RhoConf.getInstance().getInt("push_service_port");
+					        byte btServiceType = RhoConf.getInstance().getString("push_service_type").equalsIgnoreCase("BPAS") ?
+							        PushApplicationDescriptor.SERVER_TYPE_BPAS : PushApplicationDescriptor.SERVER_TYPE_NONE;
+        					
+					        PushApplicationDescriptor pad = new PushApplicationDescriptor(
+							        strAppName, nPort, strUrl, btServiceType, 
+							        ApplicationDescriptor.currentApplicationDescriptor());
+        					
+					        PushApplicationStatus status = PushApplicationRegistry.getStatus(pad);
+        			
+					        LOG.INFO("registerPushService status : " + status.toString());
+        			
+					        if (status.getStatus() != PushApplicationStatus.STATUS_ACTIVE && status.getStatus() != PushApplicationStatus.STATUS_PENDING)
+					        {
+        						
+						        LOG.INFO("registerPushService registering push");
+        						
+						        PushApplicationRegistry.registerApplication(pad);
+					        }
+					    }
+					}catch(Exception exc)
+					{
+	                    LOG.ERROR("registerPushService failed.", exc);					
+					}catch(Throwable t)
 					{
-						
-						LOG.INFO("registerPushService registering push");
-						
-						PushApplicationRegistry.registerApplication(pad);
+					    LOG.ERROR("registerPushService crashed.", t);
 					}
 	            }
 	        });

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

@@ -2,6 +2,8 @@ package com.rho;
 
 import java.util.Hashtable;
 
+import net.rim.blackberry.api.browser.Browser;
+import net.rim.blackberry.api.browser.BrowserSession;
 import net.rim.device.api.system.ApplicationDescriptor;
 import net.rim.device.api.system.CodeModuleGroup;
 import net.rim.device.api.system.DeviceInfo;
@@ -131,8 +133,17 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 	{
 		RhodesApplication.getInstance().close();
 	}
+
+	public void open_url(String url)
+	{
+		BrowserSession session = Browser.getDefaultSession();
+		session.showBrowser();
+		session.displayPage(url);
+	}
 	
-	static Hashtable m_appProperties = new Hashtable(); 
+	static Hashtable m_appProperties = new Hashtable();
+	static CodeModuleGroup m_groupRhodes = null;
+	static boolean m_bGroupsInited = false;
 	public String getAppProperty(String name)
 	{
 		String strRes = null;
@@ -142,25 +153,31 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 				strRes = (String)m_appProperties.get(name);
 			else	
 			{
-				CodeModuleGroup[] codeModule = CodeModuleGroup.loadAll();
-
-				if ( codeModule != null )
+				if (!m_bGroupsInited)
 				{
-					String moduleName = ApplicationDescriptor
-					   .currentApplicationDescriptor().getModuleName();
-					
-					for(int i = 0; i < codeModule.length; i++) 
+					m_bGroupsInited = true;
+					CodeModuleGroup[] codeModule = CodeModuleGroup.loadAll();
+	
+					if ( codeModule != null )
 					{
-						String module = codeModule[i].getName();
-						if( module.indexOf( moduleName ) != -1)
+						String moduleName = ApplicationDescriptor
+						   .currentApplicationDescriptor().getModuleName();
+						
+						for(int i = 0; i < codeModule.length; i++) 
 						{
-							CodeModuleGroup group = codeModule[i];
-							if ( group != null )
-								strRes = group.getProperty(name);
-							break;
+							String module = codeModule[i].getName();
+							if( module.indexOf( moduleName ) != -1)
+							{
+								m_groupRhodes = codeModule[i];
+								break;
+							}
 						}
 					}
 				}
+				
+				if (m_groupRhodes != null)				
+					strRes = m_groupRhodes.getProperty(name);
+				
 /*				
 				CodeModuleGroup[] allGroups = CodeModuleGroupManager.loadAll();
 				if ( allGroups != null )

data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java

@@ -272,8 +272,9 @@ public class Jsr75File implements SimpleFile
     	if ( strRoot == null )
     		throw new IOException("Could not find storage");
     	
-    	if ( strDir != null && strDir.length() > 0 ){
-    		String strDirPath = FilePath.join(strRoot, strDir);
+    	if ( strDir != null && strDir.length() > 0 )
+    	{
+    		String strDirPath = strDir.startsWith(strRoot) ? strDir : FilePath.join(strRoot, strDir);
     		strDirPath = FilePath.join(strDirPath, "/");
     		createDir( strDirPath );
     		return strDirPath;

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

@@ -81,7 +81,7 @@ public class Alert
     			mgr.add(tf);
     		}
     		
-    		HorizontalFieldManager lfm = new HorizontalFieldManager();
+    		HorizontalFieldManager lfm = new HorizontalFieldManager(Manager.FIELD_HCENTER| Manager.FIELD_VCENTER);
     		mgr.add(lfm);
 
     		Bitmap bmp = null;
@@ -102,7 +102,8 @@ public class Alert
     		LabelField lf = new LabelField(msg, Field.FIELD_HCENTER | Field.FIELD_VCENTER);
     		lfm.add(lf);
     		
-    		hfm = new HorizontalFieldManager();
+    		hfm = new HorizontalFieldManager(Manager.FIELD_HCENTER| Manager.FIELD_VCENTER);
+    		hfm.setPadding(10, 0, 0, 10);
     		mgr.add(hfm);
     	}
     	

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

@@ -135,6 +135,34 @@ public class System {
 				}
 			}
 		});
+
+		klass.getSingletonClass().defineMethod( "run_app", new RubyTwoArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block )
+			{
+				try {
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("run_app failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+
+		klass.getSingletonClass().defineMethod( "open_url", new RubyOneArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block )
+			{
+				try 
+				{
+		    		RhoRubyHelper helper = new RhoRubyHelper();
+		    		helper.open_url(arg1.toStr());
+					
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("run_app failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
 		
 	}
     

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

@@ -1,6 +1,7 @@
 package rhomobile;
 
 import j2me.util.LinkedList;
+import j2me.util.StringParser;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,6 +11,8 @@ import java.util.Vector;
 
 import javax.microedition.io.HttpConnection;
 
+import net.rim.blackberry.api.browser.Browser;
+import net.rim.blackberry.api.browser.BrowserSession;
 import net.rim.device.api.browser.field.RenderingOptions;
 import net.rim.device.api.io.http.HttpHeaders;
 import net.rim.device.api.system.Application;
@@ -33,7 +36,6 @@ import net.rim.device.api.ui.component.ButtonField;
 import net.rim.device.api.ui.component.LabelField;
 import net.rim.device.api.ui.Manager;
 import net.rim.device.api.math.Fixed32;
-
 //import net.rim.device.api.system.EventInjector.KeyCodeEvent;
 
 import com.rho.*;
@@ -378,8 +380,12 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
      **************************************************************************/
     public static void main(String[] args)
     {
-		_instance = new RhodesApplication();
+    	LOG.INFO_EVENT("main start");
+    	
 		try{
+			_instance = new RhodesApplication();
+			LOG.INFO_EVENT( "RhodesApplication created" );
+			
 			_instance.enterEventDispatcher();
 		}catch(Exception exc)
 		{
@@ -475,9 +481,21 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	private boolean m_bActivate = false;
 	private void rhodes_activate()
 	{
+		if ( !m_bStartupFinish )
+		{
+	        this.invokeLater( new Runnable() { 
+	            public void run() 
+	            {
+	            	//LOG.INFO_EVENT("Activate wait till Startup finish");
+	            	rhodes_activate(); 
+	            }
+	        }, 100, false );
+	        return;
+		}
+		
 		m_bActivate = true;
 		//DO NOT DO ANYTHING before doStartupWork 
-		doStartupWork();
+		//doStartupWork();
 		showSplashScreen();
     	LOG.TRACE("Rhodes start activate ***--------------------------***");
 
@@ -953,6 +971,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     			try{is.close();}catch(IOException exc){}
     		is = null;
     	}
+    	
+    	pushScreen(_mainScreen);
     }
     
     public void showLogScreen()
@@ -962,9 +982,10 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	    UiApplication.getUiApplication().pushScreen(screen);
     }
     
+    boolean m_bStartupFinish = false;
     private void doStartupWork() 
     {
-    	if (_mainScreen!=null)
+/*    	if (_mainScreen!=null)
     		return;
     	
     	if ( com.rho.Capabilities.RUNAS_SERVICE && ApplicationManager.getApplicationManager().inStartup() )// || isWaitForSDCardAtStartup() )
@@ -977,31 +998,44 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
             } );
             
             return;
-    	}
+    	}*/
     	
     	try{
-    		if ( com.rho.Capabilities.RUNAS_SERVICE )
-    		{
+    	    if ( com.rho.Capabilities.RUNAS_SERVICE )
+    	    {
+    	    	while( ApplicationManager.getApplicationManager().inStartup() )
+    	    	{
+    	    		LOG.INFO_EVENT("inStartup");
+    	    		Thread.sleep(1000);
+    	    	}
+    	    	
     			if ( !Jsr75File.isSDCardExist() )
+    			{
+    				LOG.INFO_EVENT("isSDCardExist");
     				Thread.sleep(5000); //Wait till SDCard may appear
-    		}
-    		
+    			}
+    	    }
+    	    
         	RhoLogger.InitRhoLog();
-	    	
+        	
 	        LOG.INFO(" STARTING RHODES: ***----------------------------------*** " );
 	    	
 	        RhodesApp.Create(RhoConf.getInstance().getRhoRootPath());
-	        
+        	
 	    	CKeyListener list = new CKeyListener();
 	    	CTrackwheelListener wheel = new CTrackwheelListener();
 	    	this._history = new Vector();
 	
-	        _mainScreen = new CMainScreen();
-	        _mainScreen.addKeyListener(list);
-	        _mainScreen.addTrackwheelListener(wheel);
-	
-	        pushScreen(_mainScreen);
-	        createBrowserControl();
+	    	synchronized (Application.getEventLock()) 
+	    	{	    	
+		        _mainScreen = new CMainScreen();
+		        _mainScreen.addKeyListener(list);
+		        _mainScreen.addTrackwheelListener(wheel);
+		        //pushScreen(_mainScreen);
+		        createBrowserControl();
+	    	}
+	    	
+	    	LOG.INFO_EVENT("createBrowserControl" );
 	        
 	    	try {
 	    		RhoClassFactory.getNetworkAccess().configure();
@@ -1009,17 +1043,37 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	    	} catch(IOException exc) {
 	    		LOG.ERROR(exc.getMessage());
 	    	}
-
-	        PrimaryResourceFetchThread.Create(this);
+	    	LOG.INFO_EVENT("getNetworkAccess");
+	    	
+	        //PrimaryResourceFetchThread.Create(this);
 	        LOG.INFO("RHODES STARTUP COMPLETED: ***----------------------------------*** " );
 	        
+	        m_bStartupFinish = true;
 	        if ( com.rho.Capabilities.RUNAS_SERVICE && !m_bActivate &&
 	        	 RhoConf.getInstance().getBool("activate_at_startup"))
-	        	rhodes_activate();
+	        {
+		        this.invokeLater( new Runnable() { 
+		            public void run() 
+		            {
+		            	rhodes_activate(); 
+		            }
+		        });
+	        	
+	        }
     	}catch(Exception exc)
     	{
     		LOG.ERROR("doStartupWork failed", exc);
+    		
+    		LOG.ERROR_EVENT("doStartupWork failed", exc);
+    	}catch(Throwable exc)
+    	{
+    		LOG.ERROR("doStartupWork crashed.", exc);
+    		
+    		LOG.ERROR_EVENT("doStartupWork failed", exc);
+    		
+    		return;
     	}
+
     }
     
     public void executeJavascript(String strJavascript)
@@ -1087,7 +1141,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         }else
         	m_oBrowserAdapter = new BrowserAdapter(_mainScreen, this, RhoConf.getInstance().getBool("bb_loadimages_async"));
     }
-    
+    /*
     private void invokeStartupWork() {
         // I think this can get called twice
         // 1) Directly from startup, if the app starts while the BB is up - e.g. after download
@@ -1108,16 +1162,16 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         	}else
         		doStartupWork();
         }
-    }
+    }*/
 
     //----------------------------------------------------------------------
     // SystemListener methods
 
     public void powerUp() {
-        LOG.INFO_OUT(" POWER UP ***----------------------------------*** " );
+    	LOG.INFO_EVENT("POWER UP" );
         if ( com.rho.Capabilities.RUNAS_SERVICE)
         {
-        	invokeStartupWork();
+        	//invokeStartupWork();
         	this.requestBackground();
         }
     }
@@ -1137,12 +1191,17 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         LOG.INFO_OUT(" Construct RhodesApplication() ***----------------------------------*** " );
         m_activateHooks = new Hashtable();
         this.addSystemListener(this);
+        PrimaryResourceFetchThread.Create(this);
+        
         //this.addFileSystemListener(this);
-        if ( com.rho.Capabilities.RUNAS_SERVICE && ApplicationManager.getApplicationManager().inStartup() ) {
+/*        if ( com.rho.Capabilities.RUNAS_SERVICE && ApplicationManager.getApplicationManager().inStartup() ) 
+        {
+        	EventLogger.logEvent(0x4c9d3452d87922f2L, "inStartup".getBytes());
+        	
             LOG.INFO_OUT("We are in the phone startup, don't start Rhodes yet, leave it to power up call");
         } else {
             invokeStartupWork();
-        }
+        }*/
     }
 
     public void refreshCurrentPage(){
@@ -1204,6 +1263,12 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     		
             public void run() 
             {
+            	_application.doStartupWork();
+            	if (!_application.m_bStartupFinish)
+            	{
+            		return;
+            	}
+            	
         		LOG.INFO( "Starting HttpServerThread main routine..." );
             	//wait(80);
     	    	try{
@@ -1350,6 +1415,26 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         		return;
         	}
         	
+        	URI uri = new URI(_url);
+        	String query = uri.getQueryString();
+        	if (query != null) {
+        		StringParser tok = new StringParser(query, "&");
+        		while (tok.hasMoreElements()) {
+        			String pair = (String)tok.nextElement();
+        			StringParser nv = new StringParser(pair, "=");
+        			String name = (String)nv.nextElement();
+        			String value = (String)nv.nextElement();
+        			if (name == null || value == null)
+        				continue;
+        			
+        			if (name.equals("rho_open_target") && value.equals("_blank")) {
+    		    		RhoRubyHelper helper = new RhoRubyHelper();
+    		    		helper.open_url(_url);
+        				return;
+        			}
+        		}
+        	}
+        	
     		HttpConnection connection = Utilities.makeConnection(_url, _requestHeaders, _postData, null);
     		
     		if ( m_bInternalRequest )