Merge pull request #3 from niamster/dm/dock

a workaround to keep the app hidden from the dock
niamster · Jan 12, 2022 · 93f58a4 · 93f58a4
2 parents 02dcb79 + f999f31
commit 93f58a4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/gh-notifications-osx.xcodeproj/project.pbxproj b/gh-notifications-osx.xcodeproj/project.pbxproj
@@ -309,7 +309,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "gh.gh-notifications-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -334,7 +334,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "gh.gh-notifications-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/gh-notifications-osx/Notifications.swift b/gh-notifications-osx/Notifications.swift
@@ -66,13 +66,15 @@ class GHNotificationsUpdate: Object {
 
 extension String: Error {}
 
-class Notifications {
+class Notifications: NSObject, UNUserNotificationCenterDelegate {
     var statusItem: NSStatusItem!
     var popover: NSPopover!
     var error: Error?
     let logger = Puppy.default
 
-    init() {
+    override init() {
+        super.init()
+
         let bundleId = Bundle.main.bundleIdentifier ?? "gh-notifications-osx"
         Puppy.default.add(OSLogger("os", category: "notifications"))
         do {
@@ -106,8 +108,9 @@ class Notifications {
         logger.info("Started GitHub notifications notifier: '\(Bundle.main.bundleIdentifier ?? "?")'")
         logger.info("Realm DB path: \(Realm.Configuration.defaultConfiguration.fileURL!.absoluteString)")
 
-        NSApp.setActivationPolicy(.prohibited)
+        hideFromDock()
 
+        UNUserNotificationCenter.current().delegate = self
         UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { _, error in
             if let error = error {
                 self.logger.error("Failed to request authorization: '\(error.localizedDescription)'")
@@ -147,6 +150,12 @@ class Notifications {
         return String(decoding: password, as: UTF8.self)
     }
 
+    func hideFromDock() {
+        DispatchQueue.main.async {
+            NSApp.setActivationPolicy(.prohibited)
+        }
+    }
+
     func markErrorMaybe() {
         if error == nil {
             return
@@ -182,6 +191,19 @@ class Notifications {
         }
     }
 
+    func userNotificationCenter(_: UNUserNotificationCenter, didReceive _: UNNotificationResponse, withCompletionHandler: () -> Void) {
+        Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { timer in
+            let activationPolicy = NSApp.activationPolicy()
+            if activationPolicy == .prohibited {
+                timer.invalidate()
+                return
+            }
+            self.logger.debug("Activation policy was altered: '\(activationPolicy)'")
+            self.hideFromDock()
+        }
+        withCompletionHandler()
+    }
+
     func showDelta(_ notifications: [NotificationThread]) throws {
         let realm = try Realm()
         let now = Date()