Commit 16c13f4f by Daniel Roek

Removed PermissionStatusNotDetermined from iOS implementation

parent 671610b6
...@@ -115,7 +115,6 @@ typedef NS_ENUM(int, PermissionStatus) { ...@@ -115,7 +115,6 @@ typedef NS_ENUM(int, PermissionStatus) {
PermissionStatusDenied = 0, PermissionStatusDenied = 0,
PermissionStatusGranted, PermissionStatusGranted,
PermissionStatusRestricted, PermissionStatusRestricted,
PermissionStatusNotDetermined,
PermissionStatusLimited, PermissionStatusLimited,
}; };
......
...@@ -75,8 +75,7 @@ ...@@ -75,8 +75,7 @@
BOOL success = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]; BOOL success = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
result([[NSNumber alloc] initWithBool:success]); result([[NSNumber alloc] initWithBool:success]);
} else { } else {
result(@false); result(@false); }
}
} }
+ (id)createPermissionStrategy:(PermissionGroup)permission { + (id)createPermissionStrategy:(PermissionGroup)permission {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
return [AudioVideoPermissionStrategy permissionStatus:AVMediaTypeAudio]; return [AudioVideoPermissionStrategy permissionStatus:AVMediaTypeAudio];
#endif #endif
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
- (ServiceStatus)checkServiceStatus:(PermissionGroup)permission { - (ServiceStatus)checkServiceStatus:(PermissionGroup)permission {
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -40,18 +40,18 @@ ...@@ -40,18 +40,18 @@
#if PERMISSION_CAMERA #if PERMISSION_CAMERA
mediaType = AVMediaTypeVideo; mediaType = AVMediaTypeVideo;
#else #else
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
#endif #endif
} else if (permission == PermissionGroupMicrophone) { } else if (permission == PermissionGroupMicrophone) {
#if PERMISSION_MICROPHONE #if PERMISSION_MICROPHONE
mediaType = AVMediaTypeAudio; mediaType = AVMediaTypeAudio;
#else #else
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
#endif #endif
} else { } else {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
} }
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
switch (status) { switch (status) {
case AVAuthorizationStatusNotDetermined: case AVAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case AVAuthorizationStatusRestricted: case AVAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case AVAuthorizationStatusDenied: case AVAuthorizationStatusDenied:
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
return PermissionStatusGranted; return PermissionStatusGranted;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
} }
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
switch (status) { switch (status) {
case CNAuthorizationStatusNotDetermined: case CNAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case CNAuthorizationStatusRestricted: case CNAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case CNAuthorizationStatusDenied: case CNAuthorizationStatusDenied:
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
switch (status) { switch (status) {
case kABAuthorizationStatusNotDetermined: case kABAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case kABAuthorizationStatusRestricted: case kABAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case kABAuthorizationStatusDenied: case kABAuthorizationStatusDenied:
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
} }
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
+ (void)requestPermissionsFromContactStore:(PermissionStatusHandler)completionHandler API_AVAILABLE(ios(9)) { + (void)requestPermissionsFromContactStore:(PermissionStatusHandler)completionHandler API_AVAILABLE(ios(9)) {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#endif #endif
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
- (ServiceStatus)checkServiceStatus:(PermissionGroup)permission { - (ServiceStatus)checkServiceStatus:(PermissionGroup)permission {
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus permissionStatus = [self checkPermissionStatus:permission]; PermissionStatus permissionStatus = [self checkPermissionStatus:permission];
if (permissionStatus != PermissionStatusNotDetermined) { if (permissionStatus != PermissionStatusDenied) {
completionHandler(permissionStatus); completionHandler(permissionStatus);
return; return;
} }
...@@ -41,18 +41,18 @@ ...@@ -41,18 +41,18 @@
#if PERMISSION_EVENTS #if PERMISSION_EVENTS
entityType = EKEntityTypeEvent; entityType = EKEntityTypeEvent;
#else #else
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
#endif #endif
} else if (permission == PermissionGroupReminders) { } else if (permission == PermissionGroupReminders) {
#if PERMISSION_REMINDERS #if PERMISSION_REMINDERS
entityType = EKEntityTypeReminder; entityType = EKEntityTypeReminder;
#else #else
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
#endif #endif
} else { } else {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
} }
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
switch (status) { switch (status) {
case EKAuthorizationStatusNotDetermined: case EKAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case EKAuthorizationStatusRestricted: case EKAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case EKAuthorizationStatusDenied: case EKAuthorizationStatusDenied:
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
return PermissionStatusGranted; return PermissionStatusGranted;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusAuthorizedWhenInUse && permission == PermissionGroupLocationAlways) { if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusAuthorizedWhenInUse && permission == PermissionGroupLocationAlways) {
// don't do anything and continue requesting permissions // don't do anything and continue requesting permissions
} else if (status != PermissionStatusNotDetermined) { } else if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
} }
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
if (permission == PermissionGroupLocationAlways) { if (permission == PermissionGroupLocationAlways) {
switch (authorizationStatus) { switch (authorizationStatus) {
case kCLAuthorizationStatusNotDetermined: case kCLAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case kCLAuthorizationStatusRestricted: case kCLAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case kCLAuthorizationStatusAuthorizedWhenInUse: case kCLAuthorizationStatusAuthorizedWhenInUse:
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
switch (authorizationStatus) { switch (authorizationStatus) {
case kCLAuthorizationStatusNotDetermined: case kCLAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case kCLAuthorizationStatusRestricted: case kCLAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case kCLAuthorizationStatusDenied: case kCLAuthorizationStatusDenied:
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
switch (authorizationStatus) { switch (authorizationStatus) {
case kCLAuthorizationStatusNotDetermined: case kCLAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case kCLAuthorizationStatusRestricted: case kCLAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case kCLAuthorizationStatusDenied: case kCLAuthorizationStatusDenied:
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
case kCLAuthorizationStatusAuthorized: case kCLAuthorizationStatusAuthorized:
return PermissionStatusGranted; return PermissionStatusGranted;
default: default:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
#pragma clang diagnostic pop #pragma clang diagnostic pop
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
completionHandler([MediaLibraryPermissionStrategy determinePermissionStatus:status]); completionHandler([MediaLibraryPermissionStrategy determinePermissionStatus:status]);
}]; }];
} else { } else {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
return; return;
} }
} }
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
return [MediaLibraryPermissionStrategy determinePermissionStatus:status]; return [MediaLibraryPermissionStrategy determinePermissionStatus:status];
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
+ (PermissionStatus)determinePermissionStatus:(MPMediaLibraryAuthorizationStatus)authorizationStatus API_AVAILABLE(ios(9.3)){ + (PermissionStatus)determinePermissionStatus:(MPMediaLibraryAuthorizationStatus)authorizationStatus API_AVAILABLE(ios(9.3)){
switch (authorizationStatus) { switch (authorizationStatus) {
case MPMediaLibraryAuthorizationStatusNotDetermined: case MPMediaLibraryAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case MPMediaLibraryAuthorizationStatusDenied: case MPMediaLibraryAuthorizationStatusDenied:
return PermissionStatusDenied; return PermissionStatusDenied;
case MPMediaLibraryAuthorizationStatusRestricted: case MPMediaLibraryAuthorizationStatusRestricted:
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
return PermissionStatusGranted; return PermissionStatusGranted;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
if (settings.authorizationStatus == UNAuthorizationStatusDenied) { if (settings.authorizationStatus == UNAuthorizationStatusDenied) {
permissionStatus = PermissionStatusDenied; permissionStatus = PermissionStatusDenied;
} else if (settings.authorizationStatus == UNAuthorizationStatusNotDetermined) { } else if (settings.authorizationStatus == UNAuthorizationStatusNotDetermined) {
permissionStatus = PermissionStatusNotDetermined; permissionStatus = PermissionStatusDenied;
} }
dispatch_semaphore_signal(sem); dispatch_semaphore_signal(sem);
}]; }];
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@implementation PhonePermissionStrategy @implementation PhonePermissionStrategy
- (PermissionStatus)checkPermissionStatus:(PermissionGroup)permission { - (PermissionStatus)checkPermissionStatus:(PermissionGroup)permission {
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
- (ServiceStatus)checkServiceStatus:(PermissionGroup)permission { - (ServiceStatus)checkServiceStatus:(PermissionGroup)permission {
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
} }
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
+ (PermissionStatus)determinePermissionStatus:(PHAuthorizationStatus)authorizationStatus { + (PermissionStatus)determinePermissionStatus:(PHAuthorizationStatus)authorizationStatus {
switch (authorizationStatus) { switch (authorizationStatus) {
case PHAuthorizationStatusNotDetermined: case PHAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case PHAuthorizationStatusRestricted: case PHAuthorizationStatusRestricted:
return PermissionStatusRestricted; return PermissionStatusRestricted;
case PHAuthorizationStatusDenied: case PHAuthorizationStatusDenied:
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
return PermissionStatusLimited; return PermissionStatusLimited;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
}]; }];
} else { } else {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
} }
} }
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
switch (status) { switch (status) {
case CMAuthorizationStatusNotDetermined: case CMAuthorizationStatusNotDetermined:
permissionStatus = PermissionStatusNotDetermined; permissionStatus = PermissionStatusDenied;
break; break;
case CMAuthorizationStatusRestricted: case CMAuthorizationStatusRestricted:
permissionStatus = PermissionStatusRestricted; permissionStatus = PermissionStatusRestricted;
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
return permissionStatus; return permissionStatus;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
PermissionStatus status = [self checkPermissionStatus:permission]; PermissionStatus status = [self checkPermissionStatus:permission];
if (status != PermissionStatusNotDetermined) { if (status != PermissionStatusDenied) {
completionHandler(status); completionHandler(status);
return; return;
} }
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
completionHandler([SpeechPermissionStrategy determinePermissionStatus:authorizationStatus]); completionHandler([SpeechPermissionStrategy determinePermissionStatus:authorizationStatus]);
}]; }];
} else { } else {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
} }
} }
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
return [SpeechPermissionStrategy determinePermissionStatus:status]; return [SpeechPermissionStrategy determinePermissionStatus:status];
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
+ (PermissionStatus)determinePermissionStatus:(SFSpeechRecognizerAuthorizationStatus)authorizationStatus API_AVAILABLE(ios(10.0)){ + (PermissionStatus)determinePermissionStatus:(SFSpeechRecognizerAuthorizationStatus)authorizationStatus API_AVAILABLE(ios(10.0)){
switch (authorizationStatus) { switch (authorizationStatus) {
case SFSpeechRecognizerAuthorizationStatusNotDetermined: case SFSpeechRecognizerAuthorizationStatusNotDetermined:
return PermissionStatusNotDetermined; return PermissionStatusDenied;
case SFSpeechRecognizerAuthorizationStatusDenied: case SFSpeechRecognizerAuthorizationStatusDenied:
return PermissionStatusDenied; return PermissionStatusDenied;
case SFSpeechRecognizerAuthorizationStatusRestricted: case SFSpeechRecognizerAuthorizationStatusRestricted:
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
return PermissionStatusGranted; return PermissionStatusGranted;
} }
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
@end @end
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@implementation UnknownPermissionStrategy @implementation UnknownPermissionStrategy
- (PermissionStatus)checkPermissionStatus:(PermissionGroup)permission { - (PermissionStatus)checkPermissionStatus:(PermissionGroup)permission {
return PermissionStatusNotDetermined; return PermissionStatusDenied;
} }
- (ServiceStatus)checkServiceStatus:(PermissionGroup)permission { - (ServiceStatus)checkServiceStatus:(PermissionGroup)permission {
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
} }
- (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler { - (void)requestPermission:(PermissionGroup)permission completionHandler:(PermissionStatusHandler)completionHandler {
completionHandler(PermissionStatusNotDetermined); completionHandler(PermissionStatusDenied);
} }
@end @end
...@@ -53,9 +53,6 @@ extension PermissionActions on Permission { ...@@ -53,9 +53,6 @@ extension PermissionActions on Permission {
/// Shortcuts for checking the [status] of a [Permission]. /// Shortcuts for checking the [status] of a [Permission].
extension PermissionCheckShortcuts on Permission { extension PermissionCheckShortcuts on Permission {
/// If this permission was never requested before.
Future<bool> get isUndetermined => status.isUndetermined;
/// If the user granted this permission. /// If the user granted this permission.
Future<bool> get isGranted => status.isGranted; Future<bool> get isGranted => status.isGranted;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment