Merge pull request #280 from timothyjasonwilliams/0.7

correctly check ios version

Merge pull request #280 from timothyjasonwilliams/0.7
correctly check ios version
fa87fdc5 · Sebastián Katzer · f82b9d32 · 24354dce · fa87fdc5
Commit fa87fdc5 authored Oct 03, 2014 by Sebastián Katzer
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 19 deletions

APPLocalNotification.m src/ios/APPLocalNotification.m +19 -19

No files found.
--- a/src/ios/APPLocalNotification.m
+++ b/src/ios/APPLocalNotification.m
@@ -238,18 +238,18 @@
 */
 - (void) promptForPermission:(CDVInvokedUrlCommand *)command
 {
-#ifdef __IPHONE_8_0
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
-    UIUserNotificationType types =
+        UIUserNotificationType types =
-    UIUserNotificationTypeAlert|UIUserNotificationTypeBadge|UIUserNotificationTypeSound;
+        UIUserNotificationTypeAlert|UIUserNotificationTypeBadge|UIUserNotificationTypeSound;
-    UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:types
+        UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:types
-                                                                             categories:nil];
+                                                                                 categories:nil];
-    [self.commandDelegate runInBackground:^{
+        [self.commandDelegate runInBackground:^{
-        [[UIApplication sharedApplication]
+            [[UIApplication sharedApplication]
-         registerUserNotificationSettings:settings];
+             registerUserNotificationSettings:settings];
-    }];
+        }];
-#endif
+    }
 }
 /**
@@ -257,17 +257,17 @@
 */
 - (BOOL) hasPermissionToSheduleNotifications
 {
-#ifdef __IPHONE_8_0
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
-    UIUserNotificationSettings *settings = [[UIApplication sharedApplication]
+        UIUserNotificationSettings *settings = [[UIApplication sharedApplication]
-                                                currentUserNotificationSettings];
+                                                    currentUserNotificationSettings];
-    UIUserNotificationType requiredTypes =
+        UIUserNotificationType requiredTypes =
-    UIUserNotificationTypeAlert|UIUserNotificationTypeBadge|UIUserNotificationTypeSound;
+        UIUserNotificationTypeAlert|UIUserNotificationTypeBadge|UIUserNotificationTypeSound;
-    return (settings.types & requiredTypes);
+        return (settings.types & requiredTypes);
-#else
+    } else {
-    return YES;
+        return YES;
-#endif
+    }
 }
 /**