From 39578d4c61a03a7f4977d302733804461980e609 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 25 Jan 2021 09:38:00 -0500 Subject: [PATCH] Added NotificationID property to Alarm --- ProjectClock/Models.swift | 2 ++ ProjectClock/Notification.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift index ec441a8..9e12b61 100644 --- a/ProjectClock/Models.swift +++ b/ProjectClock/Models.swift @@ -51,6 +51,7 @@ class Alarm: Codable var text: String var wakeMethod: WVM var alarmTone: SystemSoundID + var notificationID: String /// What days does it repeat (Sun, Mon, Tue, Wed, Thu, Fri, Sat) var repeats: [Bool] @@ -74,6 +75,7 @@ class Alarm: Codable self.repeats = repeats self.lastActivate = lastActivate self.alarmTone = alarmTone + self.notificationID = "notification.id.\(Int.random(in: 1...Int.max))" } /// Does it automatically disable after activating once diff --git a/ProjectClock/Notification.swift b/ProjectClock/Notification.swift index 2f91ed2..db22301 100644 --- a/ProjectClock/Notification.swift +++ b/ProjectClock/Notification.swift @@ -38,7 +38,7 @@ class Notification { // Scheduels alarm notification for proper time let trigger = UNTimeIntervalNotificationTrigger(timeInterval: alarm.nextActivate!.timeIntervalSince(Date()), repeats: false) - let request = UNNotificationRequest(identifier: "notification.id.01", content: content, trigger: trigger) + let request = UNNotificationRequest(identifier: alarm.notificationID, content: content, trigger: trigger) // Sends notification UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)