Change activation policy in notification manager

google · Jul 16, 2024 · fdfc329 · fdfc329
1 parent 08965cf
commit fdfc329
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 30 deletions.
diff --git a/Source/gui/SNTBinaryMessageWindowController.m b/Source/gui/SNTBinaryMessageWindowController.m
@@ -116,18 +116,6 @@ - (void)loadWindow {
   }
 }
 
-- (void)showWindow:(id)sender {
-  // Add app to Cmd+Tab and Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyRegular;
-  [super showWindow:sender];
-}
-
-- (void)windowWillClose:(NSNotification *)notification {
-  // Remove app from Cmd+Tab and Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyAccessory;
-  [super windowWillClose:notification];
-}
-
 - (NSString *)messageHash {
   return self.event.fileSHA256;
 }

diff --git a/Source/gui/SNTDeviceMessageWindowController.m b/Source/gui/SNTDeviceMessageWindowController.m
@@ -50,18 +50,9 @@ - (void)showWindow:(id)sender {
                                               customMsg:self.attributedCustomMessage];
   self.window.delegate = self;
 
-  // Add app to Cmd+Tab and Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyRegular;
-
   [super showWindow:sender];
 }
 
-- (void)windowWillClose:(NSNotification *)notification {
-  // Remove app from Cmd+Tab and Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyAccessory;
-  [super windowWillClose:notification];
-}
-
 - (NSAttributedString *)attributedCustomMessage {
   return [SNTBlockMessage formatMessage:self.customMessage];
 }

diff --git a/Source/gui/SNTFileAccessMessageWindowController.m b/Source/gui/SNTFileAccessMessageWindowController.m
@@ -66,18 +66,9 @@ - (void)showWindow:(id)sender {
 
   self.window.delegate = self;
 
-  // Make sure app doesn't appear in Cmd+Tab or Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyAccessory;
-
   [super showWindow:sender];
 }
 
-- (void)windowWillClose:(NSNotification *)notification {
-  // Remove app from Cmd+Tab and Dock.
-  NSApp.activationPolicy = NSApplicationActivationPolicyAccessory;
-  [super windowWillClose:notification];
-}
-
 - (NSAttributedString *)attributedCustomMessage {
   return [SNTBlockMessage attributedBlockMessageForFileAccessEvent:self.event
                                                      customMessage:self.customMessage];

diff --git a/Source/gui/SNTNotificationManager.m b/Source/gui/SNTNotificationManager.m
@@ -71,6 +71,8 @@ - (void)windowDidCloseSilenceHash:(NSString *)hash {
     [bc resume];
     [[bc remoteObjectProxy] spindown];
     [bc invalidate];
+    // Remove app from Cmd+Tab and Dock.
+    NSApp.activationPolicy = NSApplicationActivationPolicyAccessory;
     [NSApp hide:self];
   }
 }
@@ -125,6 +127,8 @@ - (void)queueMessage:(SNTMessageWindowController *)pendingMsg {
   [self.pendingNotifications addObject:pendingMsg];
 
   if (!self.currentWindowController) {
+    // Add app to Cmd+Tab and Dock.
+    NSApp.activationPolicy = NSApplicationActivationPolicyRegular;
     [self showQueuedWindow];
   }
 }