rhodes 2.0.3 → 2.1.0

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

@@ -205,7 +205,7 @@ public class NetworkAccess implements INetworkAccess {
 			
 			try {
 				String url = strUrl;
-				if ( RhoConf.getInstance().getBool("bb_sim_use_deviceside") || !ignoreSuffix )
+				//if ( RhoConf.getInstance().getBool("bb_sim_use_deviceside") || !ignoreSuffix )
 					url += URLsuffix;
                 if (url.startsWith("https"))
 					url += ";EndToEndDesired;RdHTTPS";

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

@@ -88,6 +88,21 @@ public class SSLSocket extends BaseSocket {
 			}
 		});
 
+		klass.defineMethod( "flush", new RubyNoArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyBlock block )
+			{
+		    	try{
+					((SSLSocket)receiver).flush();
+					
+					return RubyConstant.QNIL;
+				}catch(Exception e)
+				{
+					LOG.ERROR("close failed.", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+		
 		klass.defineMethod( "close", new RubyNoArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyBlock block )
 			{

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

@@ -87,6 +87,21 @@ public class TCPSocket extends BaseSocket {
 			}
 		});
 
+		klass.defineMethod( "flush", new RubyNoArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyBlock block )
+			{
+		    	try{
+					((TCPSocket)receiver).flush();
+					
+					return RubyConstant.QNIL;
+				}catch(Exception e)
+				{
+					LOG.ERROR("close failed.", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+		
 		klass.defineMethod( "close", new RubyNoArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyBlock block )
 			{

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

@@ -12,7 +12,7 @@ import com.xruby.runtime.lang.*;
 import com.xruby.runtime.builtin.ObjectFactory;
 import com.xruby.runtime.builtin.RubyArray;
 import com.rho.net.NetRequest;
-import com.rho.RhoRuby;
+import com.rho.RhoAppAdapter;
 import j2me.lang.MathEx;
 
 public class GeoLocation extends RhoThread{
@@ -241,7 +241,7 @@ public class GeoLocation extends RhoThread{
 	        	String strFullUrl = netRequest.resolveUrl(m_strUrl);
 	        	String strBody = "rho_callback=1";
 	        	if (bError && isAvailable() )
-	        		strBody += "&status=error&error_code=" + RhoRuby.ERR_GEOLOCATION;
+	        		strBody += "&status=error&error_code=" + RhoAppAdapter.ERR_GEOLOCATION;
 	        	else	
 	        		strBody += "&status=ok";
 	        		

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

@@ -35,8 +35,13 @@ public class WebView
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
 				try {
-					String url = args.get(0).toString();
-					navigate(url);
+					if ( args.get(0) == RubyConstant.QNIL )
+						LOG.ERROR("WebView.navigate failed: url is nil");
+					else
+					{
+						String url = args.get(0).toString();
+						navigate(url);
+					}
 					return RubyConstant.QNIL;
 				} catch(Exception e) {
 					LOG.ERROR("navigate failed.", e);
@@ -95,7 +100,7 @@ public class WebView
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) 
 			{
 				try {
-					RhodesApplication.getInstance().executeJavascript(args.get(0).toStr());
+					RhodesApplication.getInstance().executeJavascript("javascript:" + args.get(0).toStr());
 					//String url = "javascript:"+args.get(0).toStr();
 					//RhodesApplication.getInstance().navigateUrl(url);
 					return RubyConstant.QNIL;

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

@@ -5,15 +5,16 @@ import java.util.Vector;
 
 import javax.microedition.io.*;
 
-import com.rho.FilePath;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhodesApp;
+import com.rho.Tokenizer;
 import com.rho.sync.SyncThread;
 import com.rho.RhoConf;
 
 import net.rim.device.api.util.*;
 import net.rim.device.api.io.http.*;
+import com.rho.FilePath;
 
 public class PushListeningThread extends Thread {
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
@@ -52,6 +53,11 @@ public class PushListeningThread extends Thread {
         InputStream input = null;
         MDSPushInputStream pushInputStream=null;
         
+        //{
+        //	String test = "do_sync=AeropriseSrd,AeropriseRequest,AeropriseWorklog,AeropriseCategory,AeropriseUser\nalert=push message\nvibrate=2\nsound=welcome.mp3";
+        //	processPushMessage(test.getBytes(), test.length());
+        //}
+        
         while (!_stop)
         {
         try 
@@ -231,10 +237,25 @@ public class PushListeningThread extends Thread {
             	String msg = new String(data, 0, nLen);
             	LOG.INFO("Triger sync on PUSH message [" + msg + " ]");
 
+            	String[] op;
+            	String[] ops = split(msg,"\n");
+            	
             	if ( RhodesApp.getInstance() != null )
             	{
-            		try{
-	            		if ( RhodesApp.getInstance().callPushCallback(msg) )
+            		try
+            		{
+            			String strMsg = "";
+                    	for (int loop = 0; loop < ops.length; loop++) 
+                    	{
+                    		if ( ops[loop] == null || ops[loop].length() == 0 )
+                    			continue;
+                    		
+                    		if ( strMsg .length() > 0 )
+                    			strMsg += "&";
+                    		strMsg += ops[loop];
+                    	}
+                    	
+	            		if ( RhodesApp.getInstance().callPushCallback(strMsg) )
 	            			return;
             		}catch(Exception exc)
             		{
@@ -243,17 +264,26 @@ public class PushListeningThread extends Thread {
             		}
             	}
             	
-            	String[] op;
-            	String[] ops = split(msg,"\n");
             	for (int loop = 0; loop < ops.length; loop++) {
             		if (ops[loop].startsWith("do_sync")) {
             			op = splitOnce(ops[loop],"=");
             			if(op.length <= 1 || "all".equalsIgnoreCase(op[1])) {
             				SyncThread.doSyncAllSources(false);
-            			} else if ((op[1] != null) && (op[1].length()>0)){
-            				SyncThread.doSyncSourceByUrl(op[1].trim(),false);
+            			} else if ((op[1] != null) && (op[1].length()>0))
+            			{
+            				Tokenizer stringtokenizer = new Tokenizer(op[1].trim(), ",");
+            				while (stringtokenizer.hasMoreTokens()) 
+            				{
+            					String tok = stringtokenizer.nextToken();
+            					String name = tok.trim();
+            					if (name.length() == 0) 
+            						continue;
+            					
+                				SyncThread.doSyncSourceByName(name,false);
+            				}
+            				
             			}
-            		} else if (ops[loop].startsWith("show_popup")) {
+            		} else if (ops[loop].startsWith("alert")) {
             			op = splitOnce(ops[loop],"=");
             			if (op.length>1) {
             				showPopup(op[1]);
@@ -265,7 +295,7 @@ public class PushListeningThread extends Thread {
             			} else {
             				vibrate("2500");
             			}
-            		} else if (ops[loop].startsWith("play_file")) {
+            		} else if (ops[loop].startsWith("sound")) {
             			op = splitOnce(ops[loop],"=");
             			if (op.length>1) {
             				op = splitOnce(op[1],",");

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

@@ -198,12 +198,6 @@ final public class RhodesApplication extends UiApplication implements SystemList
    
     public void navigateBack()
     {
-    	if ( RHODESAPP().isCloseBack() )
-    	{
-    		_mainScreen.close();
-    		return;
-    	}
-    	
     	String url = "";
     	if ( _history.size() <= 1 )
     	{
@@ -308,7 +302,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
     private boolean m_bOpenLink = false;
     private String m_strGetLink, m_strEmailMenu, m_strCallMenu;
     boolean openLink(){
-    	LOG.INFO("openLink");
+    	LOG.TRACE("openLink");
     	try{
     		m_bOpenLink = true;
     		//TODO: catch by ID?    		
@@ -316,15 +310,15 @@ final public class RhodesApplication extends UiApplication implements SystemList
             {
 		        Version.SoftVersion ver = Version.getSoftVersion();
 		        if ( ver.nMajor > 4 )
-		        	m_strGetLink = RhoRuby.getMessageText("open_link_menu");
+		        	m_strGetLink = RhoAppAdapter.getMessageText("open_link_menu");
 		        else
-		        	m_strGetLink = RhoRuby.getMessageText("get_link_menu");
+		        	m_strGetLink = RhoAppAdapter.getMessageText("get_link_menu");
             }
 
             if (m_strEmailMenu==null)
-            	m_strEmailMenu = RhoRuby.getMessageText("email_menu");
+            	m_strEmailMenu = RhoAppAdapter.getMessageText("email_menu");
             if (m_strCallMenu==null)
-            	m_strCallMenu = RhoRuby.getMessageText("call_menu");
+            	m_strCallMenu = RhoAppAdapter.getMessageText("call_menu");
             
 	    	Menu menu = _mainScreen.getMenu(0);
 	        int size = menu.getSize();
@@ -468,7 +462,11 @@ final public class RhodesApplication extends UiApplication implements SystemList
     private static boolean m_bRubyInit = false;
 	public void activate()
 	{
-		rhodes_activate();
+		if (!m_bActivate)
+			rhodes_activate();
+		else
+			RhoRuby.rho_ruby_activateApp();
+		
 		super.activate();
 	}
 	
@@ -612,7 +610,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
 	        add(_labelStatus = new LabelField(status != null ? status : "", Field.FIELD_HCENTER));
 	        add(new LabelField(""));
 	        
-	        ButtonField hideButton = new ButtonField( RhoRuby.getMessageText("hide"), Field.FIELD_HCENTER );
+	        ButtonField hideButton = new ButtonField( RhoAppAdapter.getMessageText("hide"), Field.FIELD_HCENTER );
 			hideButton.setChangeListener( new HideListener(this) );
 			add(hideButton);
 	    }
@@ -667,14 +665,17 @@ final public class RhodesApplication extends UiApplication implements SystemList
     			return;
     		}
     		
-    		if ( m_nOrientation != nOrientation )
-    		{
+    		if ( m_nOrientation != nOrientation && m_bRubyInit )
+	    	{
     			try{
     				RhodesApp.getInstance().callScreenRotationCallback(x, y, m_nOrientation==1 ? 90 : -90);
     			}catch(Exception exc)
     			{
     				LOG.ERROR("Screen rotation callback failed.", exc);
     			}
+    			
+        		//this.invalidate();
+        		//this.updateDisplay();
     		}
     		
     		m_nOrientation = nOrientation;
@@ -783,12 +784,15 @@ final public class RhodesApplication extends UiApplication implements SystemList
 		{
 			final String _label = label;
 			// Is this a default item? If so, use the existing menu item we have.
-    	    if (value.equalsIgnoreCase(RhodesApplication.LABEL_HOME)) {
+
+			if (value.equalsIgnoreCase(RhodesApplication.LABEL_BACK)) {
+				setDefaultItemToMenuItems(label, backItem);
+			}else if ( label.equalsIgnoreCase("back") ){
+	    		RHODESAPP().setAppBackUrl(value);
+	    	}else if (value.equalsIgnoreCase(RhodesApplication.LABEL_HOME)) {
     	    	setDefaultItemToMenuItems(label, homeItem);
     	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_REFRESH)) {
     	    	setDefaultItemToMenuItems(label, refreshItem);
-    	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_BACK)) {
-    	    	setDefaultItemToMenuItems(label, backItem);
     	    }  else if (value.equalsIgnoreCase(RhodesApplication.LABEL_SYNC)) {
     	    	setDefaultItemToMenuItems(label, syncItem);
     	    } else if (value.equalsIgnoreCase(RhodesApplication.LABEL_OPTIONS)) {
@@ -804,21 +808,16 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	    } else if (label.equalsIgnoreCase(RhodesApplication.LABEL_NONE)) {
     	    	menuItems = null;
     	    } else {
-    	    	if ( label.equalsIgnoreCase("back") )
-    	    		//m_strAppBackUrl = value;
-    	    		RHODESAPP().setAppBackUrl(value);
-    	    	else
-    	    	{
-					MenuItem itemToAdd = new MenuItem(label, 200000, 10) 
+				MenuItem itemToAdd = new MenuItem(label, 200000, 10) 
+				{
+					public void run() 
 					{
-						public void run() 
+						try{
+							RHODESAPP().loadUrl(value);
+						}catch(Exception exc)
 						{
-							try{
-								RHODESAPP().loadUrl(value);
-							}catch(Exception exc)
-							{
-								LOG.ERROR("Execute menu item: '" + _label + "' failed.", exc);
-							}
+							LOG.ERROR("Execute menu item: '" + _label + "' failed.", exc);
+						}
 /*							if (value != null && value.startsWith("callback:") )
 							{
 								String url = RHODESAPP().canonicalizeRhoUrl(value.substring(9));
@@ -830,22 +829,21 @@ final public class RhodesApplication extends UiApplication implements SystemList
 								addToHistory(url, null );
 								navigateUrl(url);
 							}*/
-						}
-					};
-					menuItems.addElement(itemToAdd);
-    	    	}
+					}
+				};
+				menuItems.addElement(itemToAdd);
     	    }
 		}
 
 		void updateMenuItemsLabel()
 		{
-	    	homeItem.setText(RhoRuby.getMessageText("home_menu"));
-	    	refreshItem.setText(RhoRuby.getMessageText("refresh_menu"));
-	    	backItem.setText(RhoRuby.getMessageText("back_menu"));
-	    	syncItem.setText(RhoRuby.getMessageText("sync_menu"));
-	    	optionsItem.setText(RhoRuby.getMessageText("options_menu"));
-	    	logItem.setText(RhoRuby.getMessageText("log_menu"));
-	    	closeItem.setText(RhoRuby.getMessageText("close_menu"));
+	    	homeItem.setText(RhoAppAdapter.getMessageText("home_menu"));
+	    	refreshItem.setText(RhoAppAdapter.getMessageText("refresh_menu"));
+	    	backItem.setText(RhoAppAdapter.getMessageText("back_menu"));
+	    	syncItem.setText(RhoAppAdapter.getMessageText("sync_menu"));
+	    	optionsItem.setText(RhoAppAdapter.getMessageText("options_menu"));
+	    	logItem.setText(RhoAppAdapter.getMessageText("log_menu"));
+	    	closeItem.setText(RhoAppAdapter.getMessageText("close_menu"));
 		}
 		
 		private void setDefaultItemToMenuItems(String label, MenuItem item) {

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

@@ -15,15 +15,7 @@ import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.xruby.runtime.builtin.RubyHash;
 import com.xruby.runtime.builtin.RubyString;
-import com.xruby.runtime.lang.RubyBasic;
-import com.xruby.runtime.lang.RubyBlock;
-import com.xruby.runtime.lang.RubyClass;
-import com.xruby.runtime.lang.RubyConstant;
-import com.xruby.runtime.lang.RubyException;
-import com.xruby.runtime.lang.RubyNoArgMethod;
-import com.xruby.runtime.lang.RubyOneArgMethod;
-import com.xruby.runtime.lang.RubyRuntime;
-import com.xruby.runtime.lang.RubyValue;
+import com.xruby.runtime.lang.*;
 
 public class RingtoneManager extends RubyBasic {
 
@@ -68,7 +60,7 @@ public class RingtoneManager extends RubyBasic {
 		}
 	}
 
-	public static void initMethods(RubyClass klass) {
+	public static void initMethods(RubyModule klass) {
 		klass.getSingletonClass().defineMethod("get_all_ringtones", new RubyNoArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyBlock block) {
 				HashSet mediaDirs = new HashSet();

data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java

@@ -6,9 +6,9 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import org.json.me.JSONArray;
-import org.json.me.JSONException;
-import org.json.me.JSONObject;
+import org.json.me.RhoJSONArray;
+import org.json.me.RhoJSONException;
+import org.json.me.RhoJSONObject;
 
 import j2me.lang.MathEx;
 
@@ -378,7 +378,7 @@ public class GoogleMapField extends Field implements RhoMapField {
 			cmd.mapField.draw(cmd.latitude, cmd.longitude, cmd.zoom, img);
 		}
 		
-		private void processCommand(MapGeocodingCommand cmd) throws IOException, JSONException {
+		private void processCommand(MapGeocodingCommand cmd) throws IOException, RhoJSONException {
 			LOG.TRACE("Processing map geocoding command (thread #" + hashCode() + "): " + cmd.description());
 			
 			if (cmd.annotation.street_address == null) {
@@ -397,22 +397,22 @@ public class GoogleMapField extends Field implements RhoMapField {
 			byte[] data = fetchData(finalUrl);
 			String response = new String(data);
 			
-			JSONObject resp = new JSONObject(response);
-			JSONObject status = resp.getJSONObject("Status");
+			RhoJSONObject resp = new RhoJSONObject(response);
+			RhoJSONObject status = resp.getJSONObject("Status");
 			int statusCode = status.getInt("code");
 			if (statusCode/100 != 2) {
 				LOG.ERROR("Error received from geocoding service: " + statusCode);
 				return;
 			}
 			
-			JSONArray placemarks = resp.getJSONArray("Placemark");
+			RhoJSONArray placemarks = resp.getJSONArray("Placemark");
 			if (placemarks.length() == 0) {
 				LOG.ERROR("Geocoding request return empty response");
 				return;
 			}
-			JSONObject placemark = placemarks.getJSONObject(0);
-			JSONObject point = placemark.getJSONObject("Point");
-			JSONArray coordinates = point.getJSONArray("coordinates");
+			RhoJSONObject placemark = placemarks.getJSONObject(0);
+			RhoJSONObject point = placemark.getJSONObject("Point");
+			RhoJSONArray coordinates = point.getJSONArray("coordinates");
 			if (coordinates.length() < 2) {
 				LOG.ERROR("Geocoding response contains less than 2 coordinates");
 				return;

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -204,6 +204,7 @@ extern VALUE rho_sys_has_network();
 
 // http://www.apple.com/iphone/specs.html
 static const double RHO_IPHONE_PPI = 163.0;
+static const double RHO_IPHONE4_PPI = 326.0;
 // http://www.apple.com/ipad/specs/
 static const double RHO_IPAD_PPI = 132.0;
 
@@ -233,10 +234,16 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
     else if (strcasecmp("ppi_x", szPropName) == 0 ||
              strcasecmp("ppi_y", szPropName) == 0) {
 #ifdef __IPHONE_3_2
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
             *resValue = rho_ruby_create_double(RHO_IPAD_PPI);
-        else
+            return 1;
+        }
 #endif
+        UIDevice *device = [UIDevice currentDevice];
+        NSString *version = [device systemVersion];
+        if ([version length] >= 2 && [[version substringToIndex:2] isEqualToString:@"4."])
+            *resValue = rho_ruby_create_double(RHO_IPHONE4_PPI);
+        else
             *resValue = rho_ruby_create_double(RHO_IPHONE_PPI);
         
         return 1;

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -44,8 +44,9 @@
     [self useImage:image]; 
     // Remove the picker interface and release the picker object. 
     [picker dismissModalViewControllerAnimated:YES];
-    picker.view.hidden = YES;
-    //[picker release];
+    [picker.view removeFromSuperview];
+	//picker.view.hidden = YES;
+    [picker release];
 #ifdef __IPHONE_3_2
     [popover dismissPopoverAnimated:YES];
 #endif
@@ -58,8 +59,9 @@
     
     // Remove the picker interface and release the picker object. 
     [picker dismissModalViewControllerAnimated:YES]; 
-    picker.view.hidden = YES;
-    //[picker release]; 
+    [picker.view removeFromSuperview];
+	//picker.view.hidden = YES;
+    [picker release]; 
 #ifdef __IPHONE_3_2
     [popover dismissPopoverAnimated:YES];
 #endif

data/platform/iphone/Classes/DateTimePicker.m

@@ -10,6 +10,8 @@
 #import "Rhodes.h"
 
 void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
+    if (!rho_rhodesapp_check_mode())
+        return;
     DateTime* dateTime = [[DateTime alloc] init];
     dateTime.url = [NSString stringWithUTF8String:callback];
     dateTime.title = [NSString stringWithUTF8String:title];

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -29,6 +29,8 @@
     
     // size up the toolbar and set its frame
     [self.toolbar sizeToFit];
+	self.toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+	self.toolbar.autoresizesSubviews = YES;
     CGFloat toolbarHeight = [self.toolbar frame].size.height;
     
     // TODO: This is an approximate y-origin, figure out why it is off by 3.7
@@ -45,10 +47,12 @@
     
     // Setup label for toolbar
     self.barLabel = [[UILabel alloc] initWithFrame:toolbarFrame];
-    barLabel.text = self.dateTime.title;
-    barLabel.textColor = [UIColor whiteColor]; 
-    barLabel.backgroundColor = [UIColor clearColor];
-    barLabel.textAlignment = UITextAlignmentCenter;
+    self.barLabel.text = self.dateTime.title;
+    self.barLabel.textColor = [UIColor whiteColor]; 
+    self.barLabel.backgroundColor = [UIColor clearColor];
+    self.barLabel.textAlignment = UITextAlignmentCenter;
+	self.barLabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+	self.barLabel.autoresizesSubviews = YES;
 
     UIBarButtonItem *flexItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
                                                                               target:self action:nil];
@@ -67,18 +71,19 @@
 - (void)createPicker:(UIView*)parent
 {
     self.parentView = parent;
-    CGRect parentFrame = parent.frame;
+    CGRect parentFrame = parent.bounds;
     
     // Create the picker
     if (self.pickerView == nil) {
         CGRect frame = parentFrame;
         frame.size.height = 220;
         frame.origin.y = parentFrame.origin.y + parentFrame.size.height - frame.size.height;
-        self.pickerView = [[UIDatePicker alloc] initWithFrame:frame];
+		self.pickerView = [[UIDatePicker alloc] initWithFrame:frame];
     }
     
     if (self.pickerView.superview == nil) {
-        self.pickerView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        self.pickerView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+        self.pickerView.autoresizesSubviews = YES;
         
         // Determine picker type
         int mode = self.dateTime.format;
@@ -138,6 +143,13 @@
     // the date picker has finished sliding downwards, so remove it
     [self.pickerView removeFromSuperview];
     [self.barLabel removeFromSuperview];
+    [self.toolbar removeFromSuperview];
+	[self.pickerView release];
+	self.pickerView = nil;
+    [self.barLabel release];
+    self.barLabel = nil;
+    [self.toolbar release];
+    self.toolbar = nil;
 }
 
 - (void)animateDown

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -17,6 +17,8 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Location"
 
+int rho_rhodesapp_check_mode();
+
 static const CFTimeInterval kTimeOutInSeconds = 25;
 static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
 
@@ -220,6 +222,8 @@ _TimerCallBack(CFRunLoopTimerRef timer, void* context) {
 }
 
 void geo_update() {
+    if (!rho_rhodesapp_check_mode())
+        return;
     LocationController *loc = [LocationController sharedInstance];
     [loc performSelectorOnMainThread:[loc onUpdateLocation] withObject:nil waitUntilDone:NO];
 }

data/platform/iphone/Classes/MapView/MapViewController.h

@@ -12,7 +12,7 @@
 #import <MapKit/MKReverseGeocoder.h>
 #import "GoogleGeocoder.h"
 
-#include "common/rhoparams.h"
+#include "ruby/ext/rho/rhoruby.h"
 
 @interface MapViewController : UIViewController <MKReverseGeocoderDelegate,MKMapViewDelegate> {
     MKMapView *mapView;

data/platform/iphone/Classes/MapView/MapViewController.m

@@ -10,7 +10,6 @@
 #import "MapViewController.h"
 #import "Rhodes.h"
 
-#include "common/rhoparams.h"
 #include "logging/RhoLog.h"
 #include "ruby/ext/rho/rhoruby.h"
 
@@ -429,12 +428,16 @@ static MapViewController *mc = nil;
 #endif
 
 void mapview_create(rho_param *p) {
+    if (!rho_rhodesapp_check_mode())
+        return;
 #ifdef __IPHONE_3_0
 	[MapViewController createMap:rho_param_dup(p)];
 #endif	
 }
 
 void mapview_close() {
+    if (!rho_rhodesapp_check_mode())
+        return;
 #ifdef __IPHONE_3_0
     [MapViewController closeMap];
 #endif

data/platform/iphone/Classes/NativeBar.m

@@ -11,7 +11,7 @@
 #import "SimpleMainView.h"
 #import "TabbedMainView.h"
 
-#include "common/rhoparams.h"
+//#include "common/rhoparams.h"
 #include "logging/RhoLog.h"
 #include "ruby/ext/rho/rhoruby.h"
 
@@ -91,6 +91,8 @@ static int started = 0;
 
 void create_nativebar(int bar_type, rho_param *p)
 {
+    if (!rho_rhodesapp_check_mode())
+        return;
     rho_param *params = NULL;
     switch (p->type) {
         case RHO_PARAM_ARRAY:
@@ -171,6 +173,8 @@ void create_nativebar(int bar_type, rho_param *p)
 }
 
 void remove_nativebar() {
+    if (!rho_rhodesapp_check_mode())
+        return;
     int bar_type = NOBAR_TYPE;
     id runnable = [RhoNativeBarCreateTask class];
     id arg1 = [NSValue valueWithBytes:&bar_type objCType:@encode(int)];
@@ -178,6 +182,8 @@ void remove_nativebar() {
 }
 
 void nativebar_switch_tab(int index) {
+    if (!rho_rhodesapp_check_mode())
+        return;
     id runnable = [RhoNativeBarSwitchTabTask class];
     id arg = [NSValue valueWithBytes:&index objCType:@encode(int)];
     [Rhodes performOnUiThread:runnable arg:arg wait:YES];