rhodes 1.5.5 → 2.0.0.beta1

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

@@ -14,7 +14,7 @@ import net.rim.device.api.browser.field.RequestedResource;
 /**
  * 
  */
-class SecondaryResourceFetchThread extends Thread {
+public class SecondaryResourceFetchThread extends Thread {
 
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("RhodesApplication");
@@ -131,7 +131,7 @@ class SecondaryResourceFetchThread extends Thread {
             if (resource != null) {
                 
             	try{
-	                HttpConnection connection = Utilities.makeConnection(resource.getUrl(), resource.getRequestHeaders(), null);
+	                HttpConnection connection = Utilities.makeConnection(resource.getUrl(), resource.getRequestHeaders(), null, null);
 	                resource.setHttpConnection(connection);
 	                
 	                // signal to the browser field that resource is ready
@@ -140,6 +140,15 @@ class SecondaryResourceFetchThread extends Thread {
 	                	{
 	                		_browserField.resourceReady(resource);
 	                	}
+	                	
+	                	if (_imageQueue.size() == 0)
+	                	{
+		                	synchronized (RhodesApplication.getEventLock())
+		                	{
+		                		RhodesApplication.getInstance().invalidateMainScreen();
+		                	}
+	                		
+	                	}
 	                }
             	}catch(Exception exc)
             	{

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

@@ -21,21 +21,25 @@ import com.rho.net.RhoConnection;
 public class Utilities {
 
 	public static HttpConnection makeConnection(String url,
-			HttpHeaders requestHeaders, byte[] postData)throws IOException {
+			HttpHeaders requestHeaders, byte[] postData, HttpConnection oldConn)throws IOException {
 
-		HttpConnection conn = null;
+		HttpConnection conn = oldConn;
 		OutputStream out = null;
 
 		try {
-			if ( URI.isLocalHost(url) )
+			
+			if ( conn == null )
 			{
-				URI uri = new URI(url);
-				conn = new NativeBBHttpConnection( new RhoConnection(uri) );
-			} else {
-				// conn = (HttpConnection) Connector.open(url);
-				IHttpConnection httpconn = RhoClassFactory.getNetworkAccess().connect(url,true);
-				conn = (HttpConnection)(httpconn!=null?httpconn.getNativeConnection() : null);
-				// conn = NetworkAccess.connect(url);
+				if ( URI.isLocalHost(url) )
+				{
+					URI uri = new URI(url);
+					conn = new NativeBBHttpConnection( new RhoConnection(uri) );
+				} else {
+					// conn = (HttpConnection) Connector.open(url);
+					IHttpConnection httpconn = RhoClassFactory.getNetworkAccess().connect(url,true);
+					conn = (HttpConnection)(httpconn!=null?httpconn.getNativeConnection() : null);
+					// conn = NetworkAccess.connect(url);
+				}
 			}
 				
 			if (requestHeaders != null) {

data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java

@@ -31,7 +31,7 @@ import javax.microedition.media.Manager;
 import javax.microedition.media.Player;
 import javax.microedition.media.control.VideoControl;
 
-import com.rho.SimpleFile;
+import com.rho.file.SimpleFile;
 import com.rho.RhoClassFactory;
 
 import com.rho.RhoEmptyLogger;
@@ -186,17 +186,11 @@ public class CameraScreen extends MainScreen {
 		            }
 		            
 		            fname = makeFileName(ext);
-	        		LOG.TRACE("camera filename: " + fname);
 	        		
 		        	file.open(fname, false, false);
-
-	        		LOG.TRACE("camera file open. Encoding: " + encoding);
 		        	
 		            //Retrieve the raw image from the VideoControl
 		        	byte[] image = _videoControl.getSnapshot(encoding);
-		        	
-	        		LOG.TRACE("camera getSnapshot called.");
-		        	
 		        	//Write image data
 		        	file.getOutStream().write(image,0,image.length);
 		        	image = null;
@@ -272,11 +266,11 @@ public class CameraScreen extends MainScreen {
 	    		// First of all, attempting to capture picture using MM API
 	    		
 	            //Create a player for the Blackberry's camera.
-	        	// do not use it:
+                // do not use it:
 	        	//http://supportforums.blackberry.com/t5/Java-Development/ControlledAccessException-from-getSnapshot/m-p/284997;jsessionid=59C552A3EC61C282E67BDF229DDD2701
-	        	
-	        //    player = Manager.createPlayer( "capture://video" ); 
-	        //    LOG.TRACE("Recording using MM API");
+	        		            
+	            //player = Manager.createPlayer( "capture://video" ); 
+	            //LOG.TRACE("Recording using MM API");
 	        }
     	}
     	catch(Exception e) {
@@ -287,7 +281,6 @@ public class CameraScreen extends MainScreen {
     	try
         {
     		if (player != null) {
-    			LOG.INFO("Use VideoControl");
 	            //Set the player to the REALIZED state (see Player docs.)
 	            player.realize();
 	
@@ -311,8 +304,6 @@ public class CameraScreen extends MainScreen {
 	            initializeEncodingList();
     		}
     		else {
-    			LOG.INFO("Use filesystem hook");
-    			
     			RhodesApplication app = RhodesApplication.getInstance();
     			_fileListener = new CameraFilesListener(this);
     			app.addFileSystemJournalListener(_fileListener);

data/platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java

@@ -24,7 +24,7 @@ import net.rim.device.api.i18n.SimpleDateFormat;
 import net.rim.device.api.io.http.HttpHeaders;
 import net.rim.device.api.system.Bitmap;
 
-import com.rho.Jsr75File;
+import com.rho.file.Jsr75File;
 
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;

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

@@ -16,7 +16,7 @@ import com.rho.net.URI;
 
 import com.xruby.runtime.builtin.ObjectFactory;
 
-import rhomobile.WebView;
+import com.rho.rubyext.WebView;
 import rhomobile.mapview.RhoMapField;
 
 import net.rim.device.api.math.Fixed32;
@@ -1019,7 +1019,7 @@ public class GoogleMapField extends Field implements RhoMapField {
 			return false;
 		
 		needToCloseMap = true;
-		WebView.navigate(ObjectFactory.createString(a.url));
+		WebView.navigate(a.url);
 		return true;
 	}
 

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

@@ -10,7 +10,7 @@
 #import <Foundation/Foundation.h>
 
 #include "common/RhoPort.h"
-#import "unzip.h"
+#include "unzip/unzip.h"
 #import "AppManager.h"
 //#import "HttpContext.h"
 //#import "HttpMessage.h"
@@ -114,7 +114,10 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
                                                encoding:NSUTF8StringEncoding];
     NSString *content2 = [[NSString alloc] initWithData:[fileManager contentsAtPath:filePath2]
                                                encoding:NSUTF8StringEncoding];
-    return [content1 isEqualToString:content2];
+    BOOL result = [content1 isEqualToString:content2];
+    [content1 release];
+    [content2 release];
+    return result;
 }
 
 /*
@@ -199,36 +202,56 @@ int rho_sys_get_screen_height()
 
 extern VALUE rho_sys_has_network();
 
-VALUE rho_sysimpl_get_property(char* szPropName)
+// http://www.apple.com/iphone/specs.html
+static const double RHO_IPHONE_PPI = 163.0;
+// http://www.apple.com/ipad/specs/
+static const double RHO_IPAD_PPI = 132.0;
+
+int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
-    VALUE rnil = rho_ruby_get_NIL();
-    
     if (strcasecmp("platform", szPropName) == 0)
-        return rho_ruby_create_string("APPLE");
+        {*resValue = rho_ruby_create_string("APPLE"); return 1;}
     else if (strcasecmp("locale", szPropName) == 0)
-        return rho_sys_get_locale();
+        {*resValue = rho_sys_get_locale(); return 1; }
     else if (strcasecmp("screen_width", szPropName) == 0)
-        return rho_ruby_create_integer(rho_sys_get_screen_width());
+        {*resValue = rho_ruby_create_integer(rho_sys_get_screen_width()); return 1; }
     else if (strcasecmp("screen_height", szPropName) == 0)
-        return rho_ruby_create_integer(rho_sys_get_screen_height());
+        {*resValue = rho_ruby_create_integer(rho_sys_get_screen_height()); return 1; }
     else if (strcasecmp("has_network", szPropName) == 0)
-        return rho_sys_has_network();
+        {*resValue = rho_sys_has_network(); return 1; }
     else if (strcasecmp("has_camera", szPropName) == 0) {
         int has_camera = [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera];
-        return rho_ruby_create_boolean(has_camera);
+        *resValue = rho_ruby_create_boolean(has_camera);
+        return 1;
+    }
+    else if (strcasecmp("ppi_x", szPropName) == 0 ||
+             strcasecmp("ppi_y", szPropName) == 0) {
+#ifdef __IPHONE_3_2
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+            *resValue = rho_ruby_create_double(RHO_IPAD_PPI);
+        else
+#endif
+            *resValue = rho_ruby_create_double(RHO_IPHONE_PPI);
+        
+        return 1;
     }
+    else if (strcasecmp("device_name", szPropName) == 0) 
+    { *resValue = rho_ruby_create_string([[[UIDevice currentDevice] systemName] UTF8String]);  return 1; }
+    else if (strcasecmp("os_version", szPropName) == 0) 
+    { *resValue = rho_ruby_create_string([[[UIDevice currentDevice] systemVersion] UTF8String]);  return 1; }
     /*
     // Removed because it's possibly dangerous: Apple could reject application
     // used such approach from its AppStore
     else if (strcasecmp("phone_number", szPropName) == 0) {
         NSString *num = [[NSUserDefaults standardUserDefaults] stringForKey:@"SBFormattedPhoneNumber"];
         if (!num)
-            return rnil;
-        return rho_ruby_create_string([num UTF8String]);
+            return 0;
+        *resValue =  rho_ruby_create_string([num UTF8String]);
+        return 1;
     }
     */
 
-    return rnil;
+    return 0;
 }
 
 const char* GetApplicationsRootPath() {

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

@@ -10,13 +10,24 @@
 #import <Foundation/Foundation.h>
 #import "RhoDelegate.h"
 
-@interface PickImageDelegate : RhoDelegate <UINavigationControllerDelegate, UIImagePickerControllerDelegate> {
+@interface PickImageDelegate : RhoDelegate <UINavigationControllerDelegate,
+    UIImagePickerControllerDelegate
+#ifdef __IPHONE_3_2
+    , UIPopoverControllerDelegate
+#endif
+> {
+#ifdef __IPHONE_3_2
+@public
+    UIPopoverController *popover;
+#endif
 }
 
 - (void)imagePickerController:(UIImagePickerController *)picker
-		didFinishPickingImage:(UIImage *)image
-		editingInfo:(NSDictionary *)editingInfo;
+        didFinishPickingImage:(UIImage *)image
+                  editingInfo:(NSDictionary *)editingInfo;
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
-
+#ifdef __IPHONE_3_2
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController;
+#endif
 
 @end

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

@@ -6,7 +6,7 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
 
-#import "RhoRunnerAppDelegate.h"
+#import "Rhodes.h"
 #import "PickImageDelegate.h"
 #import "AppManager.h"
 #import "common/RhodesApp.h"
@@ -14,71 +14,74 @@
 @implementation PickImageDelegate
 
 - (void)useImage:(UIImage*)theImage { 
-	NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/public/db-files"];
-	
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	if (![fileManager fileExistsAtPath:folder]) {
-		[fileManager createDirectoryAtPath:folder attributes:nil];
-	}
-	
-	NSString *now = [[[NSDate date] descriptionWithLocale:nil]
-					 stringByReplacingOccurrencesOfString: @":" withString: @"."];
-	now = [now stringByReplacingOccurrencesOfString: @" " withString: @"_"];
-	now = [now stringByReplacingOccurrencesOfString: @"+" withString: @"_"];
-	NSString *filename = [NSString stringWithFormat:@"Image_%@.png", now]; 	
-	NSString *fullname = [folder stringByAppendingPathComponent:filename];
-	NSData *pngImage = UIImagePNGRepresentation(theImage);
-	 
-	//NSString* message;
-	int isError = 0;
-	if([pngImage writeToFile:fullname atomically:YES]) {
-		// Send new image uri to the view
-		//message = [@"status=ok&image_uri=%2Fpublic%2Fdb-files%2F" stringByAppendingString:filename];
-	} else {
-		isError = 1;
-		// Notify view about error
-		//message = @"status=error&message=Can't write image to the storage.";
-	}
-	
-	rho_rhodesapp_callCameraCallback(
-	    [postUrl cStringUsingEncoding:[NSString defaultCStringEncoding]],
-		[filename cStringUsingEncoding:[NSString defaultCStringEncoding]],
-		isError ? "Can't write image to the storage." : "", 0 );
-	//[self doCallback:message];
+    NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/../db/db-files"];
+
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if (![fileManager fileExistsAtPath:folder])
+        [fileManager createDirectoryAtPath:folder attributes:nil];
+
+    NSString *now = [[[NSDate date] descriptionWithLocale:nil]
+             stringByReplacingOccurrencesOfString: @":" withString: @"."];
+    now = [now stringByReplacingOccurrencesOfString: @" " withString: @"_"];
+    now = [now stringByReplacingOccurrencesOfString: @"+" withString: @"_"];
+    NSString *filename = [NSString stringWithFormat:@"Image_%@.png", now]; 	
+    NSString *fullname = [folder stringByAppendingPathComponent:filename];
+    NSData *pngImage = UIImagePNGRepresentation(theImage);
+
+    int isError = ![pngImage writeToFile:fullname atomically:YES];
+    rho_rhodesapp_callCameraCallback([postUrl UTF8String], [filename UTF8String],
+            isError ? "Can't write image to the storage." : "", 0 );
 } 
 
 - (void)imagePickerController:(UIImagePickerController *)picker 
 		didFinishPickingImage:(UIImage *)image 
 		editingInfo:(NSDictionary *)editingInfo 
 { 
-	//If image editing is enabled and the user successfully picks an image, the image parameter of the 
-	//imagePickerController:didFinishPicking Image:editingInfo:method contains the edited image. 
-	//You should treat this image as the selected image, but if you want to store the original image, you can get 
-	//it (along with the crop rectangle) from the dictionary in the editingInfo parameter. 
+    //If image editing is enabled and the user successfully picks an image, the image parameter of the 
+    //imagePickerController:didFinishPicking Image:editingInfo:method contains the edited image. 
+    //You should treat this image as the selected image, but if you want to store the original image, you can get 
+    //it (along with the crop rectangle) from the dictionary in the editingInfo parameter. 
     [self useImage:image]; 
     // Remove the picker interface and release the picker object. 
-    //[[picker parentViewController] dismissModalViewControllerAnimated:YES]; 
     [picker dismissModalViewControllerAnimated:YES];
-	picker.view.hidden = YES;
-    //[picker release]; 
-    [[UIApplication sharedApplication] setStatusBarHidden:NO];
-    [[RhoRunnerAppDelegate sharedDelegate] fixFrame];
+    picker.view.hidden = YES;
+    //[picker release];
+#ifdef __IPHONE_3_2
+    [popover dismissPopoverAnimated:YES];
+#endif
 } 
 
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker 
 { 
-	// Notify view about cancel
-	//NSString* message = @"status=cancel&message=User canceled operation.";
-	//[self doCallback:message];
-	
-	rho_rhodesapp_callCameraCallback( [postUrl cStringUsingEncoding:[NSString defaultCStringEncoding]],"","", 1 );
-	
+    // Notify view about cancel
+    rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
+    
     // Remove the picker interface and release the picker object. 
     [picker dismissModalViewControllerAnimated:YES]; 
-	picker.view.hidden = YES;
+    picker.view.hidden = YES;
     //[picker release]; 
-    [[UIApplication sharedApplication] setStatusBarHidden:NO];
-    [[RhoRunnerAppDelegate sharedDelegate] fixFrame];
+#ifdef __IPHONE_3_2
+    [popover dismissPopoverAnimated:YES];
+#endif
 } 
 
+#ifdef __IPHONE_3_2
+// UIPopoverControllerDelegate implementation
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController {
+    rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
+}
+#endif // __IPHONE_3_2
+
 @end
+
+void take_picture(char* callback_url) {
+    NSString *url = [NSString stringWithUTF8String:callback_url];
+    [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(takePicture:)
+                                              withObject:url waitUntilDone:NO];
+}
+
+void choose_picture(char* callback_url) {
+    NSString *url = [NSString stringWithUTF8String:callback_url];
+    [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(choosePicture:)
+                                              withObject:url waitUntilDone:NO];
+}

data/platform/iphone/Classes/DateTimePicker.h

@@ -0,0 +1,17 @@
+//
+//  DateTimePicker.h
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 29.03.10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface DateTimePicker : NSObject {}
+
++ (void)chooseDateTime:(NSString*)url title:(NSString*)title initialTime:(long)initial_time
+                format:(int)format data:(NSString*)data;
+
+@end

data/platform/iphone/Classes/DateTimePicker.m

@@ -0,0 +1,35 @@
+//
+//  DateTimePicker.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 29.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "DateTimePicker.h"
+#import "DateTime.h"
+#import "Rhodes.h"
+
+@implementation DateTimePicker
+
++ (void)chooseDateTime:(NSString*)url title:(NSString*)title initialTime:(long)initial_time
+                format:(int)format data:(NSString*)data {
+    DateTime* dateTime = [[DateTime alloc] init];
+    dateTime.url = url;
+    dateTime.title = title;
+    dateTime.initialTime = initial_time;
+    dateTime.format = format;
+    dateTime.data = data;
+    [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(chooseDateTime:) withObject:dateTime waitUntilDone:YES];
+    [dateTime release];
+}
+
+@end
+
+void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
+	[DateTimePicker chooseDateTime:[NSString stringWithUTF8String:callback] 
+                              title:[NSString stringWithUTF8String:title]
+                        initialTime:initial_time 
+                             format:format
+                               data:[NSString stringWithUTF8String:data]];
+}