rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java

@@ -311,7 +311,7 @@ public class SyncThread extends RhoThread
 	{
 		boolean bShowStatus = oSyncCmd.m_bShowStatus && !this.isNoThreadedMode();
 		m_oSyncEngine.getNotify().enableReporting(bShowStatus);
-		if (bShowStatus)
+		if (m_oSyncEngine.getNotify().isReportingEnabled())
 			m_statusListener.createStatusPopup(RhoAppAdapter.getMessageText("syncronizing_data"));
 	}	
 	
@@ -365,8 +365,8 @@ public class SyncThread extends RhoThread
 	public void setPollInterval(int nInterval)
 	{ 
 	    m_nPollInterval = nInterval; 
-	    if ( m_nPollInterval == 0 )
-	        m_oSyncEngine.stopSync();
+	    //if ( m_nPollInterval == 0 )
+	    //    m_oSyncEngine.stopSync();
 	
 	    addSyncCommand(new SyncCommand(scChangePollInterval, false)); 
 	}
@@ -391,6 +391,8 @@ public class SyncThread extends RhoThread
 	
 	public static void stopSync()throws Exception
 	{
+		LOG.INFO("STOP sync");
+		
 		if ( getSyncEngine().isSyncing() )
 		{
 			getSyncEngine().stopSyncByUser();
@@ -634,17 +636,33 @@ public class SyncThread extends RhoThread
 			new RubyOneArgMethod() {
 				protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {
 					try{
+						int nOldInterval = getInstance().getPollInterval(); 
 						int nInterval = arg1.toInt();
 						getInstance().setPollInterval(nInterval);
+						
+						
+						return ObjectFactory.createInteger(nOldInterval);
 					}catch(Exception e)
 					{
 						LOG.ERROR("set_pollinterval failed", e);
 						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 					}
-					
-					return RubyConstant.QNIL;
 				}
 			});
+		klass.getSingletonClass().defineMethod("get_pollinterval",
+				new RubyNoArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyBlock block) {
+						try{
+							int nOldInterval = getInstance().getPollInterval(); 
+							return ObjectFactory.createInteger(nOldInterval);
+						}catch(Exception e)
+						{
+							LOG.ERROR("set_pollinterval failed", e);
+							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+						}
+					}
+				});
+		
 		klass.getSingletonClass().defineMethod("set_syncserver",
 				new RubyOneArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {
@@ -810,13 +828,48 @@ public class SyncThread extends RhoThread
 							getSyncEngine().setNonThreadedMode(!bThreadMode);
 						}catch(Exception e)
 						{
-							LOG.ERROR("set_pagesize failed", e);
+							LOG.ERROR("set_threaded_mode failed", e);
+							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+						}
+						
+						return RubyConstant.QNIL;
+					}
+			});
+
+		klass.getSingletonClass().defineMethod("enable_status_popup",
+				new RubyOneArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {
+						try{
+							boolean bEnable = arg1 == RubyConstant.QTRUE;
+							getSyncEngine().getNotify().enableStatusPopup(bEnable);
+						}catch(Exception e)
+						{
+							LOG.ERROR("enable_status_popup failed", e);
 							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 						}
 						
 						return RubyConstant.QNIL;
 					}
 			});
+
+		klass.getSingletonClass().defineMethod("set_source_property",
+				new RubyVarArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
+						try{
+							Integer nSrcID = new Integer(args.get(0).toInt());
+							String strPropName = args.get(1).toStr(); 
+							String strPropValue = args.get(2).toStr();
+							
+							SyncEngine.getSourceOptions().setProperty(nSrcID, strPropName, strPropValue);
+							
+							return RubyConstant.QNIL;
+						}catch(Exception e)
+						{
+							LOG.ERROR("set_source_property failed", e);
+							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+						}
+					}
+			});
 		
 	}
 

data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyFloat_Methods.java

@@ -1,5 +1,6 @@
 package com.xruby.GeneratedMethods;
 import com.xruby.runtime.lang.*;
+import com.xruby.runtime.builtin.RubyBignum;
 import com.xruby.runtime.builtin.RubyFixnum;
 import com.xruby.runtime.builtin.RubyFloat;
 public class RubyFloat_Methods{
@@ -77,5 +78,9 @@ klass.defineMethod( "**", new RubyOneArgMethod(){
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
 		return ((RubyFloat)receiver).pow(arg);}
 });
+klass.defineMethod( "to_f", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyFloat)receiver).to_f();}
+});
 
 }}

data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java

@@ -76,10 +76,6 @@ klass.defineMethod( "capitalize", new RubyNoArgMethod(){
 	protected RubyValue run(RubyValue receiver, RubyBlock block ){
 		return ((RubyString)receiver).capitalize();}
 });
-klass.defineMethod( "strip", new RubyNoArgMethod(){ 
-	protected RubyValue run(RubyValue receiver, RubyBlock block ){
-		return ((RubyString)receiver).strip();}
-});
 klass.defineMethod( "upcase", new RubyNoArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyBlock block ){
 		return ((RubyString)receiver).upcase();}
@@ -218,18 +214,34 @@ klass.defineMethod( "concat", new RubyOneArgMethod(){
 		return ((RubyString)receiver).concat(arg);}
 });
 klass.aliasMethod("<<","concat");
+klass.defineMethod( "squeeze!", new RubyVarArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
+		return ((RubyString)receiver).squeeze_danger(args);}
+});
 klass.defineMethod( "strip!", new RubyNoArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyBlock block ){
 		return ((RubyString)receiver).stripBang();}
 });
-klass.defineMethod( "squeeze!", new RubyVarArgMethod(){ 
-	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
-		return ((RubyString)receiver).squeeze_danger(args);}
+klass.defineMethod( "strip", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyString)receiver).strip();}
 });
 klass.defineMethod( "lstrip!", new RubyNoArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyBlock block ){
 		return ((RubyString)receiver).lstripBang();}
 });
+klass.defineMethod( "lstrip", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyString)receiver).lstrip();}
+});
+klass.defineMethod( "rstrip!", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyString)receiver).rstripBang();}
+});
+klass.defineMethod( "rstrip", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyString)receiver).rstrip();}
+});
 klass.defineMethod( "chomp!", new RubyVarArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
 		return ((RubyString)receiver).chomp_danger(args);}

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/ArrayPacker.java

@@ -916,7 +916,7 @@ class ArrayPacker {
 
                         result.append(encodes(ptr, todo, type));
                         plen -= todo;
-                        ptr += todo;
+                        ptr = ptr.substring(todo);
                     }
                     break;
 

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFloat.java

@@ -91,6 +91,11 @@ public class RubyFloat extends RubyNumeric {
 		return ObjectFactory.createFixnum((long)this.value_);
 	}
 	
+	////@RubyLevelMethod(name="to_f")
+	public RubyFloat to_f() {
+		return this;
+	}
+	
 	//@RubyLevelMethod(name="coerce")
 	public RubyArray coerce(RubyValue v) {
 		return new RubyArray(v.toRubyFloat(), this);

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java

@@ -448,6 +448,27 @@ public class RubyString extends RubyBasic {
         return ObjectFactory.createString(sb_.toString().trim());
     }
 
+    //@RubyLevelMethod(name="strip!")
+    public RubyValue stripBang() {
+        String str = this.sb_.toString();
+        int orgSize = str.length();
+        str = str.trim();
+        this.sb_ = new StringBuffer(str);
+        if (str.length() == orgSize) {
+            return RubyConstant.QNIL;
+        }
+
+        return this;
+    }
+
+    //@RubyLevelMethod(name="lstrip")
+    public RubyValue lstrip() 
+    {
+        RubyString str = ObjectFactory.createString(sb_.toString());
+        str.lstripBang();
+    	return str;
+    }
+    
     //@RubyLevelMethod(name="lstrip!")
     public RubyValue lstripBang() {
         int i = 0;
@@ -463,20 +484,31 @@ public class RubyString extends RubyBasic {
         sb_.delete(0, i);
         return this;
     }
+    
+    //@RubyLevelMethod(name="rstrip")
+    public RubyValue rstrip() 
+    {
+        RubyString str = ObjectFactory.createString(sb_.toString());
+        str.rstripBang();
+    	return str;
+    }
 
-    //@RubyLevelMethod(name="strip!")
-    public RubyValue stripBang() {
-        String str = this.sb_.toString();
-        int orgSize = str.length();
-        str = str.trim();
-        this.sb_ = new StringBuffer(str);
-        if (str.length() == orgSize) {
+    //@RubyLevelMethod(name="rstrip!")
+    public RubyValue rstripBang() {
+        int i = sb_.length()-1;
+        while (i >= 0 && CharacterMe.isWhitespace(sb_.charAt(i))) {
+            i--;
+        }
+
+        if (sb_.length()-1 == i) {
+            //No change
             return RubyConstant.QNIL;
         }
 
+        sb_.delete(i+1, sb_.length());
         return this;
     }
-
+    
     //@RubyLevelMethod(name="capitalize")
     public RubyString capitalize() {
         int length = this.sb_.length();
@@ -1109,13 +1141,25 @@ public class RubyString extends RubyBasic {
             if ( !( bSkipFirstEmptyItem && 0 == i && (str == null || str.equals(""))) )
             {
                 //To conform ruby's behavior, discard the first empty element
-            	if (str == null)
-            		a.add(RubyConstant.QNIL);
-            	else
+            	//if (str == null)
+            	//	a.add(RubyConstant.QNIL);
+            	//else
             		a.add(ObjectFactory.createString(str));
             }
             ++i;
         }
+        
+        if ( nLimit == 0 )
+        {
+	        for( i = a.size()-1; i >=0 ;i--)
+	        {
+	        	if ( ((RubyString)a.get(i)).length()>0 )
+	        		break;
+	        	
+	        	a.delete_at(i);
+	        }
+        }
+        
         return a;
     }
 

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java

@@ -81,12 +81,28 @@ public class RubyTime extends RubyBasic {
         return (long)((t1 - t2) * 1000000);
     }
 
+	private String get2FixedDigit(int nDigit){
+		if ( nDigit > 9 )
+			return Integer.toString(nDigit);
+			
+		return "0" + Integer.toString(nDigit);
+	}
+
     public String toString() {
         //SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", Locale.US);
         //sdf.setCalendar(date_);
     	//return sdf.format(date_.getTime()).replace("GMT", "UTC");
-    	String strDate = date_.getTime().toString();
-        StringMe.replaceAll(strDate, "GMT", "UTC");
+    	//String strDate = date_.getTime().toString();
+        //StringMe.replaceAll(strDate, "GMT", "UTC");
+    	
+    	String strDate = date_.get(Calendar.YEAR) + "-" + 
+    	  get2FixedDigit(date_.get(Calendar.MONTH)+1) + "-" +
+    	  get2FixedDigit(date_.get(Calendar.DATE)) + " " + 
+    	  get2FixedDigit(date_.get(Calendar.HOUR_OF_DAY)) + ":" +
+    	  get2FixedDigit(date_.get(Calendar.MINUTE)) + ":" + 
+    	  get2FixedDigit(date_.get(Calendar.SECOND)) + " " +
+    	  date_.getTimeZone().toString();
+    	  
         return strDate;
     }
 

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java

@@ -662,7 +662,7 @@ public class RubyKernelModule {
         RubyClass klass = receiver.getRubyClass();
         klass = (klass != null) ? klass.getRealClass() : null;
         String msg =  "undefined method '" + method_name.toString() + "' for " + klass.getName();
-        LOG.ERROR(msg);
+        //LOG.ERROR(msg);
         throw new RubyException(RubyRuntime.NoMethodErrorClass,msg);
     }
     
@@ -778,11 +778,14 @@ public class RubyKernelModule {
             mode = val.toString();
         }
 
-        try{
-        	io = ObjectFactory.createResourceFile(filename, mode);
-        }catch (java.lang.Error exc)
+        if ( mode.equalsIgnoreCase("r") )
         {
-        	LOG.TRACE("Cannot open file from jar: " + filename, exc);
+	        try{
+	        	io = ObjectFactory.createResourceFile(filename, mode);
+	        }catch (java.lang.Error exc)
+	        {
+	        	LOG.TRACE("Cannot open file from jar: " + filename, exc);
+	        }
         }
         
         if ( io == null )

data/platform/bb/RubyVM/src/j2me/lang/CharacterMe.java

@@ -154,7 +154,7 @@ public class CharacterMe {
     }
     
     public static boolean isJavaIdentifierPart(char ch) {
-        return CharacterDataLatin1.isJavaIdentifierStart(ch);
+        return CharacterDataLatin1.isJavaIdentifierPart(ch);
     }
     
 }

data/platform/bb/RubyVM/src/j2me/util/StringParser.java

@@ -13,6 +13,8 @@ class StringParser implements Enumeration
 	{
 		m_strToSplit = strToSplit;
 		m_strDelim = strDelim;
+		
+		m_bFinish = !(m_strToSplit != null && m_strToSplit.length() > 0); 
 	}
 	
 	public boolean hasMoreElements() 

data/platform/bb/build/RubyVM_build.files

@@ -42,6 +42,7 @@ platform/bb/RubyVM/src/com/rho/RhoParams.java
 platform/bb/RubyVM/src/com/rho/RhoParamArray.java
 platform/bb/RubyVM/src/com/rho/StringScanner.java
 platform/bb/RubyVM/src/com/rho/Capabilities.java
+platform/bb/RubyVM/src/com/rho/AppBuildConfig.java
 platform/bb/RubyVM/src/com/rho/Extensions.java
 platform/bb/RubyVM/src/com/rho/sync/JSONArrayIterator.java
 platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.java

data/platform/bb/build/bb.rake

@@ -2,6 +2,7 @@
 require "fileutils"
 
 def fixWin7SimBug (rhoconfig) 
+=begin
 	file = rhoconfig
 	tmpfile = file + ".tmp"
 	no_deviceside_postfix_isFound = 0
@@ -19,6 +20,7 @@ def fixWin7SimBug (rhoconfig)
 	  end
 	end
 	FileUtils.move(tmpfile, file)
+=end
 end
 
 
@@ -149,7 +151,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"
@@ -373,7 +375,21 @@ namespace "build" do
       f.write "MIDlet-Name: rhodes\n"
       f.write "MicroEdition-Profile: MIDP-2.0\n"
       f.write "MIDlet-Jar-Size: 0\n"
-      f.write "RIM-MIDlet-Flags-1: 1\n" if $service_enabled
+      
+      if $service_enabled      
+        if $hidden_app == "0"
+            f.write "RIM-MIDlet-Flags-1: 1\n" 
+        else
+            f.write "RIM-MIDlet-Flags-1: 3\n" 
+        end    
+      else
+        if $hidden_app == "0"
+            f.write "RIM-MIDlet-Flags-1: 0\n" 
+        else
+            f.write "RIM-MIDlet-Flags-1: 2\n" 
+        end    
+      end
+      
       f.close
     
     end
@@ -674,6 +690,7 @@ namespace "package" do
         $stdout.flush
         
         create_alx_file('rhodesApp', $outfilebase)
+        
       else
         puts 'rhodes .cod files are up to date'
         $stdout.flush
@@ -787,6 +804,8 @@ namespace "package" do
         exit 1
       end
       $stdout.flush
+
+      File.open(File.join($targetdir,"app_info.txt"), "w") { |f| f.write( $outfilebase ) }
       
       create_alx_file('rhodesApp', $outfilebase)
     end

data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java

@@ -6,15 +6,15 @@ import net.rim.device.api.ui.container.MainScreen;
 
 public abstract class RhoMainScreen extends MainScreen {
 	
-	protected abstract void onTouchUnclick();
+	protected abstract boolean onTouchUnclick();
 	
 	protected boolean touchEvent(TouchEvent message) {
 		int nEvent = message.getEvent();
 		
 		if ( nEvent == TouchEvent.UNCLICK )
 		{
-			onTouchUnclick();
-			return true;
+			if ( onTouchUnclick() )
+			    return true;
 		}
 		
 		return super.touchEvent(message);

data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java

@@ -4,7 +4,7 @@ import net.rim.device.api.ui.container.MainScreen;
 
 public abstract class RhoMainScreen extends MainScreen {
 	
-	protected abstract void onTouchUnclick();
+	protected abstract boolean onTouchUnclick();
 	
 	public boolean isTouchScreen()
 	{

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

@@ -160,8 +160,7 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 	
 					if ( codeModule != null )
 					{
-						String moduleName = ApplicationDescriptor
-						   .currentApplicationDescriptor().getModuleName();
+						String moduleName = getModuleName();
 						
 						for(int i = 0; i < codeModule.length; i++) 
 						{

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -39,7 +39,7 @@ public class NetworkAccess implements INetworkAccess {
 		String strDeviceside = ";deviceside=true";
 		if ( com.rho.RhoConf.getInstance().getInt("no_deviceside_postfix") == 1 )
 			strDeviceside = "";
-
+		
 		if (DeviceInfo.isSimulator()) 
 		{
 			URLsuffix = strDeviceside;
@@ -65,18 +65,16 @@ public class NetworkAccess implements INetworkAccess {
 				
 				ServiceRecord[] srs = sb.getRecords();
 				// search for BIS-B transport
-				if (URLsuffix == null) {
-					for (int i = 0; i < srs.length; i++) {
-						if (srs[i].isDisabled() || !srs[i].isValid())
-							continue;
-						if (srs[i].getCid().equals("IPPP")
-								&& srs[i].getName().equals("IPPP for BIBS")) {
-							LOG.INFO("SRS: CID: " + srs[i].getCid() + " NAME: " + srs[i].getName());
-							
-							URLsuffix = ";deviceside=false;ConnectionType=mds-public";
-							networkConfigured = true;
-							break;
-						}
+				for (int i = 0; i < srs.length; i++) {
+					if (srs[i].isDisabled() || !srs[i].isValid())
+						continue;
+					if (srs[i].getCid().equals("IPPP")
+							&& srs[i].getName().equals("IPPP for BIBS")) {
+						LOG.INFO("SRS: CID: " + srs[i].getCid() + " NAME: " + srs[i].getName());
+						
+						URLsuffix = ";deviceside=false;ConnectionType=mds-public";
+						networkConfigured = true;
+						break;
 					}
 				}
 				
@@ -134,7 +132,7 @@ public class NetworkAccess implements INetworkAccess {
 			return 0;
 		
 		m_nMaxPacketSize = RhoConf.getInstance().getInt("bb_net_maxpacketsize_kb")*1024;
-		if ( (DeviceInfo.isSimulator() || URLsuffix.indexOf(";deviceside=true") < 0) && m_nMaxPacketSize == 0 )
+		if ( (/*DeviceInfo.isSimulator() ||*/ URLsuffix.indexOf(";deviceside=true") < 0) && m_nMaxPacketSize == 0 )
 		{
 			//avoid 403 error on BES/BIS
 			//http://supportforums.blackberry.com/t5/Java-Development/HTTP-Error-413-when-downloading-small-files/m-p/103918
@@ -205,8 +203,9 @@ public class NetworkAccess implements INetworkAccess {
 			
             String strMsg = ioe.getMessage(); 
 			boolean bTimeout = strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0);
+			boolean bDNS = strMsg != null && (strMsg.equalsIgnoreCase("Error trying to resolve") || strMsg.indexOf("DNS") >= 0);
 			
-			if ( bTimeout || bThrowIOException )				
+			if ( bTimeout || bDNS || bThrowIOException )				
 			{				
 				if (conn != null)
 					conn.close();
@@ -236,7 +235,7 @@ public class NetworkAccess implements INetworkAccess {
 		if ( conn == null )
 		{
 			conn = doConnect(strUrl + URLsuffix, false);
-			if ( conn == null )
+			if ( conn == null && URLsuffix != null && URLsuffix.length() > 0 )
 				conn = doConnect(strUrl, true);				
 		}
 		

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

@@ -72,6 +72,10 @@ public class RhoCalendar extends RubyBasic {
 				PIM.EVENT_LIST, PIM.READ_WRITE);
 	}
 	
+	public static boolean has_calendar() {
+		return (PIM.getInstance() != null);
+	}
+	
     //@RubyAllocMethod
     public static RhoCalendar alloc(RubyValue receiver)throws Exception 
     {

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

@@ -12,6 +12,10 @@ import com.rho.RhodesApp;
 import com.xruby.runtime.builtin.ObjectFactory;
 import com.xruby.runtime.lang.*;
 import com.rho.RhoRubyHelper;
+
+import net.rim.device.api.system.ApplicationDescriptor;
+import net.rim.device.api.system.ApplicationManager;
+import net.rim.device.api.system.CodeModuleManager;
 import net.rim.device.api.system.DeviceInfo;
 import net.rim.device.api.system.Backlight;
 
@@ -136,10 +140,62 @@ public class System {
 			}
 		});
 
+		klass.getSingletonClass().defineMethod( "app_installed?", new RubyOneArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block )
+			{
+				try 
+				{
+					String app_name = arg1.toStr();
+					int nHandle = CodeModuleManager.getModuleHandle(app_name);
+					
+					return nHandle != 0 ? RubyConstant.QTRUE : RubyConstant.QFALSE;
+				} catch(Exception e) {
+					LOG.ERROR("run_app failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+
+		klass.getSingletonClass().defineMethod( "app_uninstall", new RubyOneArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block )
+			{
+				try 
+				{
+					String app_name = arg1.toStr();
+					int nHandle = CodeModuleManager.getModuleHandle(app_name);
+					if ( nHandle == 0 )
+						LOG.ERROR("Cannot find application: " + app_name);
+					else
+					{
+						int nCode = CodeModuleManager.deleteModuleEx(nHandle, true);
+						LOG.INFO("CodeModuleManager.deleteModuleEx return code: " + nCode);
+						
+						if ( nCode == CodeModuleManager.CMM_OK_MODULE_MARKED_FOR_DELETION ) 
+						{
+							LOG.INFO("Device need to be restarted.");
+							CodeModuleManager.promptForResetIfRequired(); 
+						}
+						
+					}
+					
+					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( "run_app", new RubyTwoArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block )
 			{
 				try {
+					String app_name = arg1.toStr();
+					ApplicationManager appMan = ApplicationManager.getApplicationManager();
+					String strParams = arg2 != null && arg2 != RubyConstant.QNIL ? arg2.toStr() : "";
+					
+					appMan.launch(app_name + (strParams.length() > 0 ? "?" + strParams : "") );
+					
 					return RubyConstant.QNIL;
 				} catch(Exception e) {
 					LOG.ERROR("run_app failed", e);
@@ -204,6 +260,8 @@ public class System {
     		return ObjectFactory.createInteger(0);
     	if ( strPropName.equalsIgnoreCase("is_emulator") )
     		return ObjectFactory.createBoolean(DeviceInfo.isSimulator());
+    	if ( strPropName.equalsIgnoreCase("has_calendar") )
+    		return ObjectFactory.createBoolean(RhoCalendar.has_calendar());
     	
     	return RubyConstant.QNIL;
     }