oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing notifications.

Browse source 
// FREEBIE
This commit is contained in:
Matthew Chen 2017-05-17 15:45:00 -04:00
parent fc7dec04aa
commit 5fd93eace0
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Signal/src/environment/NotificationsManager.m
View file

@ -14,6 +14,7 @@
#import <SignalServiceKit/TSErrorMessage.h>
#import <SignalServiceKit/TSIncomingMessage.h>
#import <SignalServiceKit/TextSecureKitEnv.h>
#import <SignalServiceKit/Threading.h>
@interface NotificationsManager ()
@ -215,11 +216,11 @@
- (void)presentNotification:(UILocalNotification *)notification identifier:(NSString *)identifier
{
dispatch_async(dispatch_get_main_queue(), ^{
DispatchMainThreadSafe(^{
// Replace any existing notification
// e.g. when an "Incoming Call" notification gets replaced with a "Missed Call" notification.
if (self.currentNotifications[identifier]) {
[self cancelNotificationWithIdentifierMainThread:identifier];
[self cancelNotificationWithIdentifier:identifier];
}
[[UIApplication sharedApplication] scheduleLocalNotification:notification];
@ -231,25 +232,19 @@
- (void)cancelNotificationWithIdentifier:(NSString *)identifier
{
dispatch_async(dispatch_get_main_queue(), ^{
[self cancelNotificationWithIdentifierMainThread:identifier];
DispatchMainThreadSafe(^{
UILocalNotification *notification = self.currentNotifications[identifier];
if (!notification) {
DDLogWarn(
@"%@ Couldn't cancel notification because none was found with identifier: %@", self.tag, identifier);
return;
}
[self.currentNotifications removeObjectForKey:identifier];
[[UIApplication sharedApplication] cancelLocalNotification:notification];
});
}
- (void)cancelNotificationWithIdentifierMainThread:(NSString *)identifier
{
OWSAssert([NSThread isMainThread]);
UILocalNotification *notification = self.currentNotifications[identifier];
if (!notification) {
DDLogWarn(@"%@ Couldn't cancel notification because none was found with identifier: %@", self.tag, identifier);
return;
}
[self.currentNotifications removeObjectForKey:identifier];
[[UIApplication sharedApplication] cancelLocalNotification:notification];
}
#pragma mark - Logging
+ (NSString *)tag