rhodes 3.4.2 → 3.5.1.12

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

@@ -46,6 +46,6 @@
 
 - (UIViewController *) documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller;
 
-
+- (void) openURL:(NSString*)url;
 
 @end

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

@@ -441,18 +441,61 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
         BOOL result = [docController presentPreviewAnimated:YES];
         
         if (!result) {
+            CGPoint centerPoint = [Rhodes sharedInstance].window.center;
+            CGRect centerRec = CGRectMake(centerPoint.x, centerPoint.y, 0, 0);
+            BOOL isValid = [docController presentOpenInMenuFromRect:centerRec inView:[Rhodes sharedInstance].window animated:YES];
         }    
     }
 }
 
-
-
+- (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionController *)docController
+{
+    //[docController release];
+    //docController = nil;
+}
 
 - (void)openDocInteract:(NSString*)url {
 	[self performSelectorOnMainThread:@selector(openDocInteractCommand:) withObject:url waitUntilDone:NO];	
 }
 
 
+- (void) openURLComand:(NSString*)url {
+    
+    RAWLOG_INFO1("rho_sys_open_url: %s", url);
+	
+	NSString* strUrl = url;//[NSString stringWithUTF8String:url];
+	BOOL res = FALSE;
+    
+    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
+		RAWLOG_INFO("rho_sys_open_url failed.");
+}
+
+
+- (void) openURL:(NSString*)url {
+    [self performSelectorOnMainThread:@selector(openURLComand:) withObject:[url retain] waitUntilDone:NO];
+}
+
+
 
 @end
 
@@ -604,33 +647,7 @@ void rho_sys_app_uninstall(const char *appname) {
 
 void rho_sys_open_url(const char* url) 
 {
-    RAWLOG_INFO1("rho_sys_open_url: %s", url);	
-	
-	NSString* strUrl = [NSString stringWithUTF8String:url];
-	BOOL res = FALSE;
-
-    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
-		RAWLOG_INFO("rho_sys_open_url failed.");	
+    [[AppManager instance] openURL:[NSString stringWithUTF8String:url]];
 }
 
 void rho_sys_app_install(const char *url) {

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

@@ -454,6 +454,15 @@ void choose_picture(char* callback_url, rho_param *options_hash) {
                                               withObject:settings waitUntilDone:NO];
 }
 
+void save_image_to_device_gallery(const char* image_path, rho_param* options_hash) {
+	NSString* path = [NSString stringWithUTF8String:image_path];
+	UIImage* img = [UIImage imageWithContentsOfFile:path];
+	
+	if ( img != nil ) {
+		UIImageWriteToSavedPhotosAlbum(img, nil, nil, nil);
+	}
+}
+
 
 VALUE get_camera_info(const char* camera_type) {
     

data/platform/iphone/Classes/Event/Event.h

@@ -29,4 +29,9 @@
 #import <EventKit/EventKit.h>
 #endif
 
-BOOL is_rho_calendar_supported();
+BOOL is_rho_calendar_supported();
+
+#define CALENDAR_AUTHORIZATION_STATUS_NOT_DETERMINED "Not Determined"
+#define CALENDAR_AUTHORIZATION_STATUS_RESTRICTED "Restricted"
+#define CALENDAR_AUTHORIZATION_STATUS_DENIED "Denied"
+#define CALENDAR_AUTHORIZATION_STATUS_AUTHORIZED "Authorized"

data/platform/iphone/Classes/Event/Event.m

@@ -20,6 +20,10 @@
 #define DEFAULT_LOGCATEGORY "Event"
 
 
+#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+
+
+
 BOOL is_rho_calendar_supported() {
 	BOOL res = YES;
 #if defined(__IPHONE_4_0)
@@ -32,13 +36,75 @@ BOOL is_rho_calendar_supported() {
 
 static void calendar_check()
 {
+    BOOL calendar_available = NO;
+    
 #if defined(__IPHONE_4_0)
     NSString *version = [[UIDevice currentDevice] systemVersion];
-    if ([version hasPrefix:@"3."] || [version hasPrefix:@"2."])
+    if ([version hasPrefix:@"3."] || [version hasPrefix:@"2."]) {
+        calendar_available = NO;
+    }
+    else {
+        calendar_available = YES;
+    }
 #endif
+    
+    
+    if (!calendar_available) {
         rb_raise(rb_eRuntimeError, "No calendar support on this device");
+    }
+    else {
+
+#if defined(__IPHONE_6_0)
+        if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"6.0")) {
+            __block BOOL accessGranted = NO;
+            dispatch_semaphore_t sema = dispatch_semaphore_create(0);
+            [[[Rhodes sharedInstance] getEventStore] requestAccessToEntityType:EKEntityTypeEvent completion:
+             ^(BOOL granted, NSError* error) {
+                 accessGranted = granted;
+                 dispatch_semaphore_signal(sema);
+             }
+             ];
+            dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+            dispatch_release(sema);
+            
+            if (accessGranted) {
+            }
+        }
+#endif
+        
+    }
+    
+}
+
+const char* calendar_get_authorization_status(void) {
+    calendar_check();
+    const char* result = CALENDAR_AUTHORIZATION_STATUS_AUTHORIZED;
+#if defined(__IPHONE_6_0)
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"6.0")) {
+        ABAuthorizationStatus status = [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent];
+        if ( status == kABAuthorizationStatusNotDetermined ) {
+            result = CALENDAR_AUTHORIZATION_STATUS_NOT_DETERMINED;
+        }
+        else if ( status == kABAuthorizationStatusDenied ) {
+            result = CALENDAR_AUTHORIZATION_STATUS_DENIED;
+        }
+        else if ( status == kABAuthorizationStatusAuthorized ) {
+            result = CALENDAR_AUTHORIZATION_STATUS_AUTHORIZED;
+        }
+        else if ( status == kABAuthorizationStatusRestricted ) {
+            result = CALENDAR_AUTHORIZATION_STATUS_RESTRICTED;
+        }
+        else {
+            result = CALENDAR_AUTHORIZATION_STATUS_NOT_DETERMINED;
+        }
+    }
+#endif
+    return result;
+    
 }
 
+
+
 #ifdef __IPHONE_4_0
 static VALUE dateToRuby(NSDate *date)
 {

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

@@ -35,7 +35,7 @@
     BOOL isEnabled;
 	
 @public	
-	double _dLatitude, _dLongitude, _dAccuracy;
+	double _dLatitude, _dLongitude, _dAccuracy, _dAltitude;
 	bool _bKnownPosition;
 	
 	//SEL onUpdateLocation;	
@@ -52,6 +52,7 @@
 - (double) getLatitude;
 - (double) getLongitude;
 - (double) getAccuracy;
+- (double) getAltitude;
 - (bool) isKnownPosition;
 - (bool) isAvailable;
 

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

@@ -109,6 +109,7 @@ static LocationController *sharedLC = nil;
         timer = nil;
 		_dLatitude = 0;
 		_dLongitude = 0;
+		_dAltitude = 0;
         _dAccuracy = 0;
 		_bKnownPosition = false;
 		isErrorState = false;
@@ -153,7 +154,8 @@ static LocationController *sharedLC = nil;
 		
 		_dLatitude = newLocation.coordinate.latitude;
 		_dLongitude = newLocation.coordinate.longitude;
-        _dAccuracy = newLocation.horizontalAccuracy;//sqrt(newLocation.horizontalAccuracy*newLocation.horizontalAccuracy + newLocation.verticalAccuracy*newLocation.verticalAccuracy);
+        	_dAccuracy = newLocation.horizontalAccuracy;//sqrt(newLocation.horizontalAccuracy*newLocation.horizontalAccuracy + newLocation.verticalAccuracy*newLocation.verticalAccuracy);
+		_dAltitude = newLocation.altitude;
 		_bKnownPosition = true;	
 	}
     if (isFirstUpdateFromPlatform && isEnabled) {
@@ -188,6 +190,15 @@ static LocationController *sharedLC = nil;
 	return res;	
 }
 
+- (double) getAltitude{
+	double res = 0; 
+	@synchronized(self){
+		res = _dAltitude;
+	}
+	
+	return res;
+}
+
 - (bool) isKnownPosition{
 	bool res = false;
 	@synchronized(self){
@@ -305,6 +316,11 @@ double rho_geo_longitude() {
 	return [[LocationController sharedInstance] getLongitude];
 }
 
+double rho_geo_altitude() {
+	geo_update();
+	return [[LocationController sharedInstance] getAltitude];
+}
+
 float rho_geo_accuracy() {
 	geo_update();
 	return (float)[[LocationController sharedInstance] getAccuracy ];

data/platform/iphone/Classes/NetworkStatusMonitor.h

@@ -0,0 +1,17 @@
+//
+//  NetworkStatusMonitor.h
+//  rhorunner
+//
+//  Created by Alex Epifanoff on 03.09.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+	void initNetworkMonitoring();
+    int getNetworkStatusPollInterval();
+	void networkStatusNotify(int status);
+#ifdef __cplusplus
+}
+#endif

data/platform/iphone/Classes/NetworkStatusMonitor.mm

@@ -0,0 +1,58 @@
+//
+//  NetworkStatusMonitor.m
+//  rhorunner
+//
+//  Created by Alex Epifanoff on 03.09.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+
+#import "NetworkStatusMonitor.h"
+#import "Reachability.h"
+
+#include "common/RhodesApp.h"
+#include "common/RhoStd.h"
+#include "common/AutoPointer.h"
+
+namespace rho
+{
+	namespace common
+	{
+		class IPhoneNetworkStatusMonitor : public INetworkStatusMonitor
+		{
+		private:
+			int m_pollInterval;
+			INetworkStatusReceiver* m_receiver;
+		public:
+			IPhoneNetworkStatusMonitor() : m_pollInterval(20), m_receiver(0) {}
+			virtual void setPollInterval(int pollInterval) { m_pollInterval = pollInterval; }
+			virtual void setNetworkStatusReceiver(INetworkStatusReceiver* receiver) { m_receiver = receiver; }
+			int getPollInterval() const { return m_pollInterval; }
+			void callNotify(rho::common::enNetworkStatus status) {
+				if ( m_receiver != 0 ) {
+					m_receiver->onNetworkStatusChanged(status);
+				}
+			}
+		};
+	}
+}
+
+static rho::common::CAutoPtr<rho::common::IPhoneNetworkStatusMonitor> s_network_status_monitor(new rho::common::IPhoneNetworkStatusMonitor());
+
+extern "C"
+{
+	void initNetworkMonitoring()
+	{
+		RHODESAPP().setNetworkStatusMonitor(s_network_status_monitor);
+	}
+	
+    int getNetworkStatusPollInterval()
+	{
+		return s_network_status_monitor->getPollInterval();
+	}
+	
+	void networkStatusNotify(int status)
+	{
+		s_network_status_monitor->callNotify(status==0?(rho::common::networkStatusDisconnected):(rho::common::networkStatusConnected));
+	}	
+}

data/platform/iphone/Classes/Phonebook/phonebook.h

@@ -33,3 +33,9 @@ typedef struct __LocalPhonebook {
 	CFIndex			 _index;
 	CFIndex			 _len;
 } LocalPhonebook;
+
+
+#define AUTHORIZATION_STATUS_NOT_DETERMINED "Not Determined"
+#define AUTHORIZATION_STATUS_RESTRICTED "Restricted"
+#define AUTHORIZATION_STATUS_DENIED "Denied"
+#define AUTHORIZATION_STATUS_AUTHORIZED "Authorized"

data/platform/iphone/Classes/Phonebook/phonebook.m

@@ -37,6 +37,11 @@
 
 #define logging_enable NO
 
+#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+
+
+
+
 static int _getProperty(char* property);
 static CFStringRef getAddressPartValue(ABRecordRef record, const char* property) ;
 
@@ -50,15 +55,66 @@ void* openPhonebook() {
 		return NULL;
 	
 	memset(phonebook, 0, sizeof(LocalPhonebook));
-	
-	phonebook->_ab = ABAddressBookCreate();
-	if (phonebook->_ab) {
-		phonebook->_people = NULL;
-		phonebook->_len = 0;
-	}
+    
+    __block BOOL accessGranted = YES;
+
+#if defined(__IPHONE_6_0)
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"6.0")) {
+        if (ABAddressBookRequestAccessWithCompletion != NULL) { // we're on iOS 6
+            accessGranted = NO;
+            dispatch_semaphore_t sema = dispatch_semaphore_create(0);
+            ABAddressBookRequestAccessWithCompletion(phonebook->_ab, ^(bool granted, CFErrorRef error) {
+                accessGranted = granted;
+                dispatch_semaphore_signal(sema);
+            });
+            dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+            dispatch_release(sema);
+        }
+        else { // we're on iOS 5 or older
+            accessGranted = YES;
+        }
+    }
+#endif
+    if (accessGranted) {
+        phonebook->_ab = ABAddressBookCreate();
+        if (phonebook->_ab) {
+            phonebook->_people = NULL;
+            phonebook->_len = 0;
+        }
+    }
+
 	return phonebook;
 }
 
+
+const char* phonebook_get_authorization_status() {
+    const char* result = AUTHORIZATION_STATUS_AUTHORIZED;
+#if defined(__IPHONE_6_0)
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"6.0")) {
+        if (ABAddressBookGetAuthorizationStatus != NULL) {
+            ABAuthorizationStatus status = ABAddressBookGetAuthorizationStatus();
+            if ( status == kABAuthorizationStatusNotDetermined ) {
+                result = AUTHORIZATION_STATUS_NOT_DETERMINED;
+            }
+            else if ( status == kABAuthorizationStatusDenied ) {
+                result = AUTHORIZATION_STATUS_DENIED;
+            }
+            else if ( status == kABAuthorizationStatusAuthorized ) {
+                result = AUTHORIZATION_STATUS_AUTHORIZED;
+            }
+            else if ( status == kABAuthorizationStatusRestricted ) {
+                result = AUTHORIZATION_STATUS_RESTRICTED;
+            }
+            else {
+                result = AUTHORIZATION_STATUS_NOT_DETERMINED;
+            }
+        }
+    }
+#endif
+    return result;
+}
+
+
 void  closePhonebook(void* pb) {
 	if (logging_enable) RAWLOG_INFO("phonebook :: closePhonebook");
 	if (pb) {