Commit 16c13f4f by Daniel Roek

Removed PermissionStatusNotDetermined from iOS implementation

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