Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUI: Fix distributed notifications in silent mode #936

Merged
merged 2 commits into from
Nov 16, 2022
Merged

GUI: Fix distributed notifications in silent mode #936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dcbacd
GUI: Fix distributed notifications in silent mode
russellhancox Nov 15, 2022
7f642c2
Merge branch 'main' into fix-distributed-notifications
russellhancox Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Source/gui/SNTNotificationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,16 @@ - (BOOL)notificationAlreadyQueued:(SNTMessageWindowController *)pendingMsg {
}

- (void)queueMessage:(SNTMessageWindowController *)pendingMsg {
NSString *messageHash = [pendingMsg messageHash];
// Post a distributed notification, regardless of queue state.
[self postDistributedNotification:pendingMsg];

// If GUI is in silent mode or if there's already a notification queued for
// this message, don't do anything else.
if ([SNTConfigurator configurator].enableSilentMode) return;
if ([self notificationAlreadyQueued:pendingMsg]) return;

// See if this message is silenced.
// See if this message has been user-silenced.
NSString *messageHash = [pendingMsg messageHash];
NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
NSDate *silenceDate = [ud objectForKey:silencedNotificationsKey][messageHash];
if ([silenceDate isKindOfClass:[NSDate class]]) {
Expand All @@ -114,7 +120,6 @@ - (void)queueMessage:(SNTMessageWindowController *)pendingMsg {

pendingMsg.delegate = self;
[self.pendingNotifications addObject:pendingMsg];
[self postDistributedNotification:pendingMsg];

if (!self.currentWindowController) {
[self showQueuedWindow];
Expand Down Expand Up @@ -315,8 +320,6 @@ - (void)postRuleSyncNotificationWithCustomMessage:(NSString *)message {
}

- (void)postBlockNotification:(SNTStoredEvent *)event withCustomMessage:(NSString *)message {
if ([SNTConfigurator configurator].enableSilentMode) return;

if (!event) {
LOGI(@"Error: Missing event object in message received from daemon!");
return;
Expand All @@ -329,8 +332,6 @@ - (void)postBlockNotification:(SNTStoredEvent *)event withCustomMessage:(NSStrin
}

- (void)postUSBBlockNotification:(SNTDeviceEvent *)event withCustomMessage:(NSString *)message {
if ([SNTConfigurator configurator].enableSilentMode) return;

if (!event) {
LOGI(@"Error: Missing event object in message received from daemon!");
return;
Expand Down