fix: notification clearing

ohaiibuzzle · Jan 13, 2024 · b87bc2f · b87bc2f
1 parent 8773900
commit b87bc2f
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/USBNotifier/Core/USBDetector.swift b/USBNotifier/Core/USBDetector.swift
@@ -85,9 +85,17 @@ class USBDetector {
         return devices
     }
 
+    func clearNotifications() {
+        UNUserNotificationCenter.current().removeAllDeliveredNotifications()
+    }
+
     private func sendNotifications(for device: USBDevice,
                                    status: USBConnectionStatus,
                                    sound: Bool = false) {
+        if Storage.shared.ephemeralNotifs {
+            clearNotifications()
+        }
+
         let notificationContent = UNMutableNotificationContent()
         switch status {
         case .connected:
@@ -112,10 +120,6 @@ class USBDetector {
         }
     }
 
-    func clearNotifications() {
-        UNUserNotificationCenter.current().removeAllDeliveredNotifications()
-    }
-
     private func sendNotifications(for devices: [USBDevice],
                                    status: USBConnectionStatus,
                                    sound: Bool = false) {
@@ -130,6 +134,11 @@ class USBDetector {
             }
         }
 
+        // If the user choosed to have the notification clears themselves, do it
+        if Storage.shared.ephemeralNotifs {
+            clearNotifications()
+        }
+
         let notificationContent = UNMutableNotificationContent()
         switch status {
         case .connected: