Commit da094647 by Sebastián Katzer Committed by GitHub

Revert "Update APPLocalNotification.m iOS10beta" (#1055)

parent 2253a460
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#import "APPLocalNotificationOptions.h" #import "APPLocalNotificationOptions.h"
#import "UIApplication+APPLocalNotification.h" #import "UIApplication+APPLocalNotification.h"
#import "UILocalNotification+APPLocalNotification.h" #import "UILocalNotification+APPLocalNotification.h"
@import UserNotifications;
@interface APPLocalNotification () @interface APPLocalNotification ()
...@@ -692,53 +691,27 @@ ...@@ -692,53 +691,27 @@
*/ */
- (void) fireEvent:(NSString*)event notification:(UILocalNotification*)notification - (void) fireEvent:(NSString*)event notification:(UILocalNotification*)notification
{ {
NSString* js;
if (IsAtLeastiOSVersion(@"10.0")) { NSString* params = [NSString stringWithFormat:
UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init]; @"\"%@\"", self.applicationState];
content.title = [NSString localizedUserNotificationStringForKey:notification.alertTitle arguments:nil];
content.body = [NSString localizedUserNotificationStringForKey:notification.alertBody if (notification) {
arguments:nil]; NSString* args = [notification encodeToJSON];
content.sound = [UNNotificationSound defaultSound];
params = [NSString stringWithFormat:
/// 4. update application icon badge numberß @"%@,'%@'",
//content.badge = @([[UIApplication sharedApplication] applicationIconBadgeNumber] + 1); args, self.applicationState];
// Deliver the notification in five seconds. }
UNTimeIntervalNotificationTrigger *trigger = [UNTimeIntervalNotificationTrigger
triggerWithTimeInterval:1.f repeats:NO]; js = [NSString stringWithFormat:
UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:@"FiveSecond" @"cordova.plugins.notification.local.core.fireEvent('%@', %@)",
content:content trigger:trigger]; event, params];
/// 3. schedule localNotification
UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter]; if (deviceready) {
[center addNotificationRequest:request withCompletionHandler:^(NSError * _Nullable error) { [self.commandDelegate evalJs:js];
if (!error) {
NSLog(@"add NotificationRequest succeeded!");
}
}];
} else { } else {
[self.eventQueue addObject:js];
NSString* js;
NSString* params = [NSString stringWithFormat:
@"\"%@\"", self.applicationState];
if (notification) {
NSString* args = [notification encodeToJSON];
params = [NSString stringWithFormat:
@"%@,'%@'",
args, self.applicationState];
}
js = [NSString stringWithFormat:
@"cordova.plugins.notification.local.core.fireEvent('%@', %@)",
event, params];
if (deviceready) {
[self.commandDelegate evalJs:js];
} else {
[self.eventQueue addObject:js];
}
} }
} }
@end @end
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