rhodes 3.3.3.beta.4 → 3.3.3

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

@@ -38,16 +38,18 @@
 
 @implementation RhoCameraSettings
 
-@synthesize callback_url, camera_type, color_model, format, width, height, enable_editing;
+@synthesize callback_url, camera_type, color_model, format, width, height, enable_editing, enable_editing_setted, save_to_shared_gallery;
 
 - (id)init:(void*)data url:(NSString*)url{
     self.callback_url = url;
     self.camera_type = CAMERA_SETTINGS_TYPE_MAIN;
     self.color_model = CAMERA_SETTINGS_COLOR_MODEL_RGB;
-    self.format = CAMERA_SETTINGS_FORMAT_JPG;
+    self.format = CAMERA_SETTINGS_FORMAT_NOT_SETTED;
     self.width = 0;
     self.height = 0;
     self.enable_editing = 1;
+    self.enable_editing_setted = 0;
+    self.save_to_shared_gallery = false;
         
     if (data != NULL) {
         rho_param* p =(rho_param*)data; 
@@ -71,6 +73,10 @@
                     if (strcasecmp(value->v.string, "png") == 0) {
                         self.format = CAMERA_SETTINGS_FORMAT_PNG;
                     }
+                    else {
+                        self.format = CAMERA_SETTINGS_FORMAT_JPG;
+                    }
+                    
                 }
                 if (strcasecmp(name, "desired_width") == 0) {
                     NSString* s = [NSString stringWithUTF8String:value->v.string];
@@ -82,10 +88,16 @@
                 }
                 if (strcasecmp(name, "enable_editing") == 0) {
                     self.enable_editing = 1;
+                    self.enable_editing_setted = 1;
                     if (strcasecmp(value->v.string, "false") == 0) {
                         self.enable_editing = 0;
                     }
                 }
+                if (strcasecmp(name, "save_to_shared_gallery") == 0 ) {
+                    if ( strcasecmp(value->v.string, "true") == 0 ) {
+                        self.save_to_shared_gallery = true;
+                    }
+                }
                 
             }
             
@@ -264,6 +276,9 @@
     int imageWidth = (int)img.size.width;
     int imageHeight = (int)img.size.height;
     
+    if ( settings.save_to_shared_gallery ) {    
+        UIImageWriteToSavedPhotosAlbum(img, nil, nil, nil);
+    }    
     
     
     NSString *filename = nil; 	
@@ -321,10 +336,58 @@
     //        isError ? "Can't write image to the storage." : "", 0 );
 } 
 
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
+{
+    if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
+        NSURL* url = (NSURL*)[info objectForKey:UIImagePickerControllerReferenceURL];
+        //const char* cs_url = [[url path] UTF8String];
+        if (url != nil) {
+            NSString* ext = [url pathExtension];
+            //const char* cs_ext = [ext UTF8String];
+            if (ext != nil) {
+                if (([ext compare:@"jpg" options:NSCaseInsensitiveSearch] == NSOrderedSame) || ([ext compare:@"jpeg" options:NSCaseInsensitiveSearch] == NSOrderedSame)) {
+                    // jpg
+                    settings.format = CAMERA_SETTINGS_FORMAT_JPG;
+                }
+                if (([ext compare:@"png" options:NSCaseInsensitiveSearch] == NSOrderedSame)) {
+                    // png
+                    settings.format = CAMERA_SETTINGS_FORMAT_PNG;
+                }
+            }
+        }
+        if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
+            settings.format = CAMERA_SETTINGS_FORMAT_JPG;
+        }
+    }
+    UIImage* image = (UIImage*)[info objectForKey:UIImagePickerControllerEditedImage];
+    if (image == nil) {
+        image = (UIImage*)[info objectForKey:UIImagePickerControllerOriginalImage];
+    }
+    if (image != nil) {     
+        [self useImage:image];
+    }
+    else {
+        rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
+    }
+    // Remove the picker interface and release the picker object. 
+    [picker dismissModalViewControllerAnimated:YES];
+    [picker.view removeFromSuperview];
+	//picker.view.hidden = YES;
+    [picker release];
+#ifdef __IPHONE_3_2
+    [popover dismissPopoverAnimated:YES];
+#endif
+}
+
+
 - (void)imagePickerController:(UIImagePickerController *)picker 
 		didFinishPickingImage:(UIImage *)image 
 		editingInfo:(NSDictionary *)editingInfo 
 { 
+    if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
+        settings.format = CAMERA_SETTINGS_FORMAT_JPG;
+    }
     //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 
@@ -373,14 +436,22 @@
 void take_picture(char* callback_url, rho_param *options_hash) {
     NSString *url = [NSString stringWithUTF8String:callback_url];
     RhoCameraSettings* settings = [[RhoCameraSettings alloc] init:options_hash url:url];
+    if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
+        settings.format = CAMERA_SETTINGS_FORMAT_JPG;
+    }
     [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(takePicture:)
                                               withObject:settings waitUntilDone:NO];
 }
 
-void choose_picture(char* callback_url) {
+void choose_picture(char* callback_url, rho_param *options_hash) {
     NSString *url = [NSString stringWithUTF8String:callback_url];
+    RhoCameraSettings* settings = [[RhoCameraSettings alloc] init:options_hash url:url];
+    if (!settings.enable_editing_setted) {
+        settings.enable_editing = 1;
+    }
+    settings.camera_type = CAMERA_SETTINGS_TYPE_CHOOSE_IMAGE;
     [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(choosePicture:)
-                                              withObject:url waitUntilDone:NO];
+                                              withObject:settings waitUntilDone:NO];
 }
 
 

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

@@ -28,9 +28,11 @@
 
 @interface LocationController : NSObject<CLLocationManagerDelegate> {
 	CLLocationManager* _locationManager;
-	CFRunLoopTimerRef  _timer;
-    
+	NSTimer*  timer;
+    int gps_callback_interval;
+    BOOL isFirstUpdateFromPlatform;
     bool isErrorState;
+    BOOL isEnabled;
 	
 @public	
 	double _dLatitude, _dLongitude, _dAccuracy;
@@ -60,6 +62,10 @@
 - (void)locationManager:(CLLocationManager *)manager
 	   didFailWithError:(NSError *)error;
 
+- (void)onTimerFired:(NSTimer*)theTimer; 
+
+- (void)resetTimerWithNewInterval:(int)interval;
+
 + (LocationController *)sharedInstance;
 
 @end

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

@@ -20,9 +20,9 @@
 int rho_rhodesapp_check_mode();
 int rho_conf_getInt(const char *);
 
-#define RHO_GEO_LOCATION_INACTIVITY_TIMEOUT 25
-static CFTimeInterval timeOutInSeconds = RHO_GEO_LOCATION_INACTIVITY_TIMEOUT;
-static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
+//#define RHO_GEO_LOCATION_INACTIVITY_TIMEOUT 25
+//static CFTimeInterval timeOutInSeconds = RHO_GEO_LOCATION_INACTIVITY_TIMEOUT;
+//static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
 
 // This is a singleton class, see below
 static LocationController *sharedLC = nil;
@@ -46,45 +46,56 @@ static LocationController *sharedLC = nil;
 //@synthesize onUpdateLocation; 
 
 - (bool)update{
-    if (!_locationManager)
-        return false;
-	if (!_locationManager.locationServicesEnabled)
-		return false;
-    if (![CLLocationManager locationServicesEnabled])    
-        return false;
-    if (([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) && 
-        ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined) ) 
-        return false;
-	if (_timer==NULL) {
-		_timer = CFRunLoopTimerCreate(NULL,
-									  CFAbsoluteTimeGetCurrent() + timeOutInSeconds,
-									  0,		// interval
-									  0,		// flags
-									  0,		// order
-									  (CFRunLoopTimerCallBack)_TimerCallBack,
-									  NULL);
-		// Fail if unable to create the timer.
-		if (_timer == NULL)
-			return false;
-        CFRunLoopAddTimer(CFRunLoopGetCurrent(), _timer, kCFRunLoopCommonModes);
-	} else {
-		CFRunLoopTimerSetNextFireDate(_timer, CFAbsoluteTimeGetCurrent() + timeOutInSeconds);
-	}
-	
-    _locationManager.delegate = self; // Tells the location manager to send updates to this object
-	[_locationManager startUpdatingLocation];
-	return true;
+    @synchronized(self) {
+        if (!_locationManager)
+            return false;
+        if (!_locationManager.locationServicesEnabled)
+            return false;
+        if (![CLLocationManager locationServicesEnabled])    
+            return false;
+        if (([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) && 
+            ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined) ) 
+            return false;
+        isEnabled = YES;
+        _locationManager.delegate = self; // Tells the location manager to send updates to this object
+        [_locationManager startUpdatingLocation];
+    }
+    return true;
 }
 
+- (void)onTimerFired:(NSTimer*)theTimer {
+    if (isEnabled) {
+        isFirstUpdateFromPlatform = NO;
+        rho_geo_callcallback();
+    }
+}
+
+- (void)resetTimerCommand:(NSNumber*)value {
+    @synchronized(self){
+        if (timer != nil) {
+            [timer invalidate];
+            timer = nil;
+        }
+        gps_callback_interval = [value integerValue];
+        isFirstUpdateFromPlatform = YES;
+        if (gps_callback_interval > 0) {
+            timer = [NSTimer scheduledTimerWithTimeInterval:gps_callback_interval target:self selector:@selector(onTimerFired:) userInfo:nil repeats:YES];
+        }
+    }
+}
+
+- (void)resetTimerWithNewInterval:(int)interval {
+    [self performSelectorOnMainThread:@selector(resetTimerCommand:) withObject:[NSNumber numberWithInt:interval] waitUntilDone:NO];
+}
+
+
+
 - (void)doUpdateLocation {
 	[self update];
 }
 
 - (void) initLocationManager:(NSObject*)param {
-    int timeout = rho_conf_getInt("geo_location_inactivity_timeout");
-    if (timeout == 0)
-        timeout = RHO_GEO_LOCATION_INACTIVITY_TIMEOUT;
-    timeOutInSeconds = timeout;
+
     self._locationManager = [[[CLLocationManager alloc] init] autorelease];
     self._locationManager.desiredAccuracy = kCLLocationAccuracyBest;
     self._locationManager.delegate = self; // Tells the location manager to send updates to this object
@@ -93,36 +104,40 @@ static LocationController *sharedLC = nil;
 - (id) init {
 	self = [super init];
 	if (self != nil) {
-		//[Rhodes performOnUiThread:[LocationManagerInit class] wait:YES];
 		[self performSelectorOnMainThread:@selector(initLocationManager:) withObject:nil waitUntilDone:YES];
         
-        
-		//self.onUpdateLocation = @selector(doUpdateLocation);	
+        timer = nil;
 		_dLatitude = 0;
 		_dLongitude = 0;
         _dAccuracy = 0;
 		_bKnownPosition = false;
 		isErrorState = false;
+        gps_callback_interval = 0;
+        isFirstUpdateFromPlatform = YES;
+        isEnabled = YES;
     	RAWLOG_INFO("init");
-		
 	}
-	
 	return self;
 }
 
-- (void) stop {
-    if (!_locationManager)
-        return;
-	[_locationManager stopUpdatingLocation];
-    _locationManager.delegate = nil;
-	
-    // Get rid of the timer, if it still exists
-    if (_timer != NULL) {
-        CFRunLoopTimerInvalidate(_timer);
-        CFRelease(_timer);
-        _timer = NULL;
+-(void) stopCommand:(NSNumber*)number {
+    @synchronized(self) {
+        isEnabled = NO;
+        if (!_locationManager)
+            return;
+        [_locationManager stopUpdatingLocation];
+        _locationManager.delegate = nil;
+        
+        if (timer != nil) {
+            [timer invalidate];
+            timer = nil;
+        }
     }
-	
+}
+
+- (void) stop {
+    isEnabled = NO;
+    [self performSelectorOnMainThread:@selector(stopCommand:) withObject:nil waitUntilDone:NO];
 }
 
 // Called when the location is updated
@@ -134,20 +149,17 @@ static LocationController *sharedLC = nil;
 	if (!newLocation)
 		return;
 	
-    bool bNotify = false; 
-	
 	@synchronized(self){
 		
-		bNotify = _bKnownPosition==0 || _dLatitude != newLocation.coordinate.latitude || _dLongitude != newLocation.coordinate.longitude;
-	
 		_dLatitude = newLocation.coordinate.latitude;
 		_dLongitude = newLocation.coordinate.longitude;
         _dAccuracy = newLocation.horizontalAccuracy;//sqrt(newLocation.horizontalAccuracy*newLocation.horizontalAccuracy + newLocation.verticalAccuracy*newLocation.verticalAccuracy);
 		_bKnownPosition = true;	
 	}
-	
-    if ( bNotify )
+    if (isFirstUpdateFromPlatform && isEnabled) {
+        isFirstUpdateFromPlatform = NO;
         rho_geo_callcallback();
+    }
 }
 
 - (double) getLatitude{
@@ -187,17 +199,7 @@ static LocationController *sharedLC = nil;
 - (bool) isAvailable{
 	bool res = false;
 
-    //bool service_enabled = false;
-    //bool service_enabled_f = false;
-    //int auth_status = -1;
-	
     @synchronized(self){
-
-        //if (_locationManager) {
-        //    service_enabled = _locationManager.locationServicesEnabled;
-        //    service_enabled_f = [CLLocationManager locationServicesEnabled];
-        //    auth_status = [CLLocationManager authorizationStatus];
-        //}
 		res =   _locationManager && 
                 _locationManager.locationServicesEnabled && 
                 [CLLocationManager locationServicesEnabled] && 
@@ -209,7 +211,7 @@ static LocationController *sharedLC = nil;
 - (void)locationManager:(CLLocationManager *)manager
 	   didFailWithError:(NSError *)error
 {
-/*    
+    /* Do not remove it - this code used in debugging   
     if (error != nil) {
         const char* description = [[error localizedDescription] UTF8String];
         const char* reason = [[error localizedFailureReason] UTF8String];
@@ -217,7 +219,7 @@ static LocationController *sharedLC = nil;
         int o = 0;
         o = 9;
     }
-*/    
+     */    
     isErrorState = true;
     _bKnownPosition = false;
 	RAWLOG_ERROR("Error in GeoLocation");
@@ -274,11 +276,7 @@ static LocationController *sharedLC = nil;
 
 @end
 
-/* static */ void
-_TimerCallBack(CFRunLoopTimerRef timer, void* context) {
-	RAWLOG_INFO("Stopping location controller on timeout");
-	[[LocationController sharedInstance] stop];
-}
+
 
 void geo_update() {
     if (!rho_rhodesapp_check_mode())
@@ -319,7 +317,7 @@ int rho_geo_known_position() {
 
 void rho_geoimpl_settimeout(int nTimeoutSec)
 {
-    
+    [[LocationController sharedInstance] resetTimerWithNewInterval:nTimeoutSec];
 }
 
 void rho_geoimpl_turngpsoff()

data/platform/iphone/Classes/InitMemoryInfoCollector.h

@@ -0,0 +1,33 @@
+/*------------------------------------------------------------------------
+ * (The MIT License)
+ * 
+ * Copyright (c) 2008-2011 Rhomobile, Inc.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * 
+ * http://rhomobile.com
+ *------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+    void InitMemoryInfoCollector();
+#ifdef __cplusplus
+}
+#endif

data/platform/iphone/Classes/InitMemoryInfoCollector.mm

@@ -0,0 +1,52 @@
+
+#import "InitMemoryInfoCollector.h"
+
+#include "../shared/common/RhoStd.h"
+#include "../shared/common/AutoPointer.h"
+#include "../shared/logging/RhoLogConf.h"
+#include <sstream>
+
+#import <mach/mach.h>
+
+namespace rho
+{
+    namespace common
+    {
+        
+        class IPhoneMemoryInfoCollector : public IMemoryInfoCollector
+        {
+        public:
+            virtual String collect()
+            {
+                struct task_basic_info info;
+                mach_msg_type_number_t size = sizeof(info);
+                kern_return_t kerr = task_info(mach_task_self(),TASK_BASIC_INFO,(task_info_t)&info,&size);
+                if ( KERN_SUCCESS == kerr )
+                {
+                    std::stringstream s;
+                    s << info.resident_size;
+                    return "Memory info: \nResident size: " + s.str() + "\n";
+                }
+                else
+                {
+                    return "Can't get memory info\n";
+                }
+                
+            }
+        };
+        
+    }
+    
+}
+
+static rho::common::CAutoPtr<rho::common::IPhoneMemoryInfoCollector> s_memory_info_collector(new rho::common::IPhoneMemoryInfoCollector());
+
+extern "C"
+{
+
+void InitMemoryInfoCollector()
+{
+    LOGCONF().setMemoryInfoCollector(s_memory_info_collector);
+}
+
+}