rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -11,8 +11,8 @@ import com.rho.RhoClassFactory;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhodesApp;
-import com.xruby.runtime.builtin.ObjectFactory;
 import com.xruby.runtime.lang.*;
+import com.xruby.runtime.builtin.*;
 import com.rho.RhoRubyHelper;
 import com.rho.file.IRAFile;
 
@@ -29,6 +29,8 @@ public class System {
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("System");
 	
+	private static RhodesApp RHODESAPP(){ return RhodesApp.getInstance(); }
+	
 	public static void initMethods(RubyClass klass){
 		klass.getSingletonClass().defineMethod( "get_property", new RubyOneArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block )
@@ -267,6 +269,43 @@ public class System {
 			}
 		});
 		
+		klass.getSingletonClass().defineMethod( "start_timer", new RubyVarArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
+			{
+				try 
+				{
+					if ( args == null || args.size() != 3 )
+						throw new RubyException(RubyRuntime.ArgumentErrorClass, 
+								"in System.start_timer: wrong number of arguments ( " + args.size() + " for " + 3 + " )");
+					
+					int nInterval = args.get(0).toInt();
+					String url = args.get(1).toStr();
+					String params = args.get(2).toStr();
+					
+					RHODESAPP().getTimer().addTimer(nInterval, url, params);
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("start_timer failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+		
+		klass.getSingletonClass().defineMethod( "stop_timer", new RubyOneArgMethod(){ 
+			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block )
+			{
+				try 
+				{
+					String url = arg1.toStr();
+					
+					RHODESAPP().getTimer().stopTimer(url);
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("stop_timer failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});		
 	}
     
     //@RubyLevelMethod(name="get_property", module=true)
@@ -287,6 +326,12 @@ public class System {
     		return ObjectFactory.createInteger(getScreenWidth()); 
     	if ( strPropName.equalsIgnoreCase("screen_height") )
     		return ObjectFactory.createInteger(getScreenHeight());
+    	if ( strPropName.equalsIgnoreCase("screen_orientation")) {
+    		if (getScreenHeight() >= getScreenWidth()) {
+    			return ObjectFactory.createString("portrait");
+    		}
+			return ObjectFactory.createString("landscape");
+    	}
     	if ( strPropName.equalsIgnoreCase("ppi_x"))
     		return ObjectFactory.createFloat(getScreenPpiX());
     	if ( strPropName.equalsIgnoreCase("ppi_y"))

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

@@ -1423,7 +1423,14 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         	    	synchronized(m_mxStackCommands)
         	    	{
         	    		if ( m_stackCommands.isEmpty() )
-        	    			wait(INTERVAL_INFINITE);
+        	    		{
+        	    			int nTimeout = (int)RHODESAPP().getTimer().getNextTimeout();
+        	    			waitMs(nTimeout == 0 ? INTERVAL_INFINITE : nTimeout);
+        	    			
+        	    			if ( !m_bExit && m_stackCommands.isEmpty() )
+        	    				RHODESAPP().getTimer().checkTimers();
+        	    				
+        	    		}
         	    	}
         		}
         		

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

@@ -27,7 +27,9 @@ public class CameraFilesListener implements FileSystemJournalListener {
 	
 	private final String[] _folders = {
 			"file:///store/home/user/pictures/",
-			"file:///sdcard/blackberry/pictures/"
+			"file:///sdcard/blackberry/pictures/",
+			"file:///store/home/user/camera/",
+			"file:///sdcard/blackberry/camera/"			
 	};
 	
 	public CameraFilesListener(CameraScreen screen) {
@@ -72,8 +74,16 @@ public class CameraFilesListener implements FileSystemJournalListener {
         		continue;
         	
         	String lpath = path.toLowerCase();
-        	if (!lpath.startsWith("file:///sdcard/blackberry/pictures/") &&
-        			!lpath.startsWith("file:///store/home/user/pictures/"))
+        	boolean bKnownFolder = false;
+        	for( int i = 0; i < _folders.length; i++)
+        	{
+        		if ( lpath.startsWith(_folders[i]))
+        		{
+        			bKnownFolder = true;
+        			break;
+        		}
+        	}
+        	if (!bKnownFolder)
         		continue;
         	
         	if (lpath.endsWith(".dat"))

data/platform/iphone/Classes/AppManager/AppManager.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 
-@interface AppManager : NSObject {
+@interface AppManager : NSObject <UIDocumentInteractionControllerDelegate>{
 
 	
 }
@@ -24,4 +24,8 @@
 					 toPath:(NSString*)target remove:(BOOL)remove;
 - (void) configure;
 
+- (UIViewController *) documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller;
+
+
+
 @end

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

@@ -23,6 +23,8 @@
 #import "logging/RhoLog.h"
 #import "../Event/Event.h"
 
+#import "Rhodes.h"
+
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -30,6 +32,55 @@
 static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned int ziplen);
 //const char* RhoGetRootPath();
 
+
+
+BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
+    NSError *error;
+    
+    NSDictionary *attributes = [fileManager attributesOfItemAtPath:path error:&error]; 
+    
+    if (attributes == nil) {
+        //NSLog(@"     SymLink  NO : %@", path);
+        return NO;
+    }
+    
+    NSString* fileType = [attributes objectForKey:NSFileType];
+    
+    if (fileType == nil) {
+        //NSLog(@"     SymLink  NO : %@", path);
+        return NO;
+    }
+
+    BOOL res = [NSFileTypeSymbolicLink isEqualToString:fileType];
+    if (res) {
+        //NSLog(@"     SymLink YES : %@", path);
+    }
+    else {
+        //NSLog(@"     SymLink  NO : %@", path);
+    }
+    
+    return res;
+}
+
+
+@interface RhoFileManagerDelegate_RemoveOnly_SymLinks : NSObject {
+@public
+}
+
+-(BOOL)fileManager:(NSFileManager *)fileManager shouldRemoveItemAtPath:(NSString *)path;
+@end
+
+@implementation RhoFileManagerDelegate_RemoveOnly_SymLinks
+
+
+-(BOOL)fileManager:(NSFileManager *)fileManager shouldRemoveItemAtPath:(NSString *)path {
+    return isPathIsSymLink(fileManager, path);
+}
+
+@end
+
+
+
 @implementation AppManager
 
 + (AppManager *)instance
@@ -126,6 +177,7 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
     return result;
 }
 
+
 /*
  * Configures AppManager
  */
@@ -157,6 +209,30 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
 	
     if (contentChanged) {
 #ifdef RHO_DONT_COPY_ON_START
+        // we have next situations when we should remove old content:
+        // 1. we upgrade old version (where we copy all files)
+        //    we should remove all files
+        // 2. we upgrade version with symlinks
+        //    we should remove only symlinks 
+        // we check old "lib" file - if it is SymLink then we have new version of Rhodes (with SymLinks instead of files)
+
+        NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
+        //BOOL libExist = [fileManager fileExistsAtPath:testName];
+        //if (libExist) {
+        //    NSLog(@" Lib File is Exist: %@", testName);
+        //}
+        //else {
+        //    NSLog(@" Lib File is NOT Exist: %@", testName);
+        //}
+        
+        BOOL isNewVersion = isPathIsSymLink(fileManager, testName);
+        
+        RhoFileManagerDelegate_RemoveOnly_SymLinks* myDelegate = nil;
+        if (isNewVersion) {
+            myDelegate = [[RhoFileManagerDelegate_RemoveOnly_SymLinks alloc] init];
+            [fileManager setDelegate:myDelegate];
+        }
+
         NSError *error;
         // Create symlink to "lib"
         NSString *src = [bundleRoot stringByAppendingPathComponent:@"lib"];
@@ -185,13 +261,22 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
                 NSString *target = [dst stringByAppendingPathComponent:child];
                 NSLog(@"dst: %@", target);
                 [fileManager removeItemAtPath:target error:&error];
-                if ([child isEqualToString:@"rhoconfig.txt"])
+                if ([child isEqualToString:@"rhoconfig.txt"]) {
+                    [fileManager setDelegate:nil];
+                    [fileManager removeItemAtPath:target error:&error];
+                    [fileManager setDelegate:myDelegate];
                     [fileManager copyItemAtPath:fchild toPath:target error:&error];
-                else
+                }
+                else {
                     [fileManager createSymbolicLinkAtPath:target withDestinationPath:fchild error:&error];
+                }
             }
         }
         
+        [fileManager setDelegate:nil];
+        if (myDelegate != nil) {
+            [myDelegate release];
+        }
         // Finally, copy "hash" and "name" files
         NSString *items[] = {@"hash", @"name"};
         for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
@@ -216,12 +301,43 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
         }
 #endif
 	}
-
+    
 	rho_logconf_Init(rho_native_rhopath());
 	rho_rhodesapp_create(rho_native_rhopath());
 	RAWLOG_INFO("Rhodes started");
 }
 
+
+- (UIViewController *) documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller {
+    
+    return [[Rhodes sharedInstance] mainView]; 
+    
+}
+
+- (void)openDocInteractCommand:(NSString*)url {
+    if (NSClassFromString(@"UIDocumentInteractionController")) {
+        NSURL *fileURL = [NSURL fileURLWithPath:url];
+        
+        UIDocumentInteractionController* docController = [UIDocumentInteractionController interactionControllerWithURL:fileURL];
+        
+        docController.delegate = self;//[AppManager instance];
+        
+        BOOL result = [docController presentPreviewAnimated:YES];
+        
+        if (!result) {
+        }    
+    }
+}
+
+
+
+
+- (void)openDocInteract:(NSString*)url {
+	[self performSelectorOnMainThread:@selector(openDocInteractCommand:) withObject:url waitUntilDone:NO];	
+}
+
+
+
 @end
 
 const char* rho_native_rhopath() 
@@ -250,12 +366,20 @@ VALUE rho_sys_get_locale()
 int rho_sys_get_screen_width()
 {
     CGRect rect = [[UIScreen mainScreen] bounds];
+    UIInterfaceOrientation current_orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
+        return rect.size.height;
+	}
     return rect.size.width;
 }
 
 int rho_sys_get_screen_height()
 {
     CGRect rect = [[UIScreen mainScreen] bounds];
+    UIInterfaceOrientation current_orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
+        return rect.size.width;
+	}
     return rect.size.height;
 }
 
@@ -284,15 +408,32 @@ void rho_sys_app_uninstall(const char *appname) {
 	NSLog(@"ALERT: Uninstall of applications is unsupported on iOS platfrom !!!");	
 }
 
+
 void rho_sys_open_url(const char* url) 
 {
     RAWLOG_INFO1("rho_sys_open_url: %s", url);	
 	
 	NSString* strUrl = [NSString stringWithUTF8String:url];
 	BOOL res = FALSE;
-	if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:strUrl]])
-		res = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:strUrl]];
-	
+
+    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:strUrl];
+    if (!fileExists) {
+        NSString *fixed_path = [NSString stringWithUTF8String:rho_rhodesapp_getapprootpath()];
+        fixed_path = [fixed_path stringByAppendingString:strUrl];
+        fileExists = [[NSFileManager defaultManager] fileExistsAtPath:fixed_path];
+        if (fileExists) {
+            strUrl = fixed_path;
+        }
+    }
+    if (fileExists) {
+        res = TRUE;
+        [[AppManager instance] openDocInteract:strUrl];
+    }
+    else {
+        if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:strUrl]]) {
+            res = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:strUrl]];
+        }
+    }
 	if ( res)
 		RAWLOG_INFO("rho_sys_open_url suceeded.");	
 	else
@@ -317,8 +458,20 @@ void rho_sys_run_app(const char* appname, VALUE params)
 			}
 		//}
 	}
+    const char* full_url = [app_name UTF8String];
+    RAWLOG_INFO1("rho_sys_run_app: %s", full_url);	
 	
-	rho_sys_open_url([app_name UTF8String]);
+
+	BOOL res = FALSE;
+
+    if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:app_name]]) {
+        res = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:app_name]];
+    }
+	
+	if ( res)
+		RAWLOG_INFO("rho_sys_run_app suceeded.");	
+	else
+		RAWLOG_INFO("rho_sys_run_app failed.");	
 }
 
 
@@ -346,6 +499,16 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         {*resValue = rho_ruby_create_integer(rho_sys_get_screen_width()); return 1; }
     else if (strcasecmp("screen_height", szPropName) == 0)
         {*resValue = rho_ruby_create_integer(rho_sys_get_screen_height()); return 1; }
+    else if (strcasecmp("screen_orientation", szPropName) == 0) {
+        UIInterfaceOrientation current_orientation = [[UIApplication sharedApplication] statusBarOrientation];
+        if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
+            *resValue = rho_ruby_create_string("landscape");
+        }
+        else {
+            *resValue = rho_ruby_create_string("portrait");
+        }
+        return 1;
+    }
     else if (strcasecmp("has_network", szPropName) == 0)
         {*resValue = rho_sys_has_network(); return 1; }
     else if (strcasecmp("has_camera", szPropName) == 0) {

data/platform/iphone/Classes/DateTimePicker.m

@@ -8,6 +8,8 @@
 
 #import "DateTime.h"
 #import "Rhodes.h"
+#import "DateTimePickerDelegate.h"
+
 
 
 void choose_datetime_with_range(char* callback, char* title, long initial_time, int format, char* data, long min_time, long max_time) {
@@ -27,4 +29,15 @@ void choose_datetime_with_range(char* callback, char* title, long initial_time,
 
 void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
     choose_datetime_with_range(callback, title, initial_time, format, data, 0, 0 );
-}
+}
+
+void set_change_value_callback_datetime(char* callback) {
+    NSString* ns_callback = nil;
+    if (callback != NULL) {
+        ns_callback = [NSString stringWithUTF8String:callback];
+        if ([ns_callback length] <= 0) {
+            ns_callback = nil;
+        }
+    }
+    [DateTimePickerDelegate setChangeValueCallback:ns_callback];
+}

data/platform/iphone/Classes/DateTimePickerDelegate.h

@@ -31,4 +31,6 @@
 - (IBAction)cancelAction:(id)sender;
 - (void)createPicker:(UIView*)parent;
 
++(void)setChangeValueCallback:(NSString*)callback;
+
 @end

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -8,6 +8,10 @@
 
 #import "DateTimePickerDelegate.h"
 #import "common/RhodesApp.h"
+#import "ruby/ext/rho/rhoruby.h"
+
+
+static NSString* ourChangeValueCallback = nil;
 
 @implementation DateTimePickerDelegate
 
@@ -68,6 +72,26 @@
     [doneItem release];
 }
 
+
+-(void) onChangeValue:(id)sender {
+    if (ourChangeValueCallback == nil) {
+        return;
+    }
+    
+    long long ldate = [self.pickerView.date timeIntervalSince1970];
+
+	NSString* strBody = @"&rho_callback=1";
+	strBody = [strBody stringByAppendingString:@"&status=change&result="];
+	strBody = [strBody stringByAppendingString:[[NSString alloc] initWithFormat:@"%qi" , ldate]];
+	strBody = [strBody stringByAppendingString:@"&opaque="];
+	strBody = [strBody stringByAppendingString:self.dateTime.data];
+
+	const char* cb = [ourChangeValueCallback UTF8String];
+	const char* b = [strBody UTF8String];
+	rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+}
+
+
 - (void)createPicker:(UIView*)parent
 {
     self.parentView = parent;
@@ -145,14 +169,13 @@
     // the date picker has finished sliding upwards, so add toolbar
     [self.parentView addSubview:self.toolbar];
     [self.parentView addSubview:self.barLabel];
+    [self.pickerView addTarget:self action:@selector(onChangeValue:) forControlEvents:UIControlEventValueChanged]; 
 }
 
 - (void)slideDownDidStop
 {
     // 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];
@@ -175,13 +198,17 @@
     [UIView setAnimationDidStopSelector:@selector(slideDownDidStop)];
     
     // Remove toolbar immediately
+    [self.barLabel removeFromSuperview];
     [self.toolbar removeFromSuperview];
+
     self.pickerView.frame = endFrame;
     [UIView commitAnimations];
 }
 
 - (IBAction)cancelAction:(id)sender
 {
+    ourChangeValueCallback = nil;
+    [self.pickerView removeTarget:self action:@selector(onChangeValue:) forControlEvents:UIControlEventValueChanged];
     //NSString *message = @"status=cancel";
     //[self doCallback:message];
     rho_rhodesapp_callDateTimeCallback(
@@ -192,6 +219,8 @@
 
 - (IBAction)dateAction:(id)sender
 {
+    ourChangeValueCallback = nil;
+    [self.pickerView removeTarget:self action:@selector(onChangeValue:) forControlEvents:UIControlEventValueChanged];
     long ldate = [self.pickerView.date timeIntervalSince1970];
     //NSMutableString *message = [[NSMutableString alloc] initWithFormat:@"status=ok&result=%@", [NSNumber numberWithLong:ldate]];
     //if (self.dateTime.data) {
@@ -205,4 +234,9 @@
     [self animateDown];
 }
 
++(void)setChangeValueCallback:(NSString*)callback {
+    ourChangeValueCallback = callback;
+}
+
+
 @end