diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 220255be4..537c26721 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -26,7 +26,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat static let mainWindow = "mainWindow" } - var userNotificationManager: UserNotificationManager! var extensionContainersFile: ExtensionContainersFile! var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile! @@ -213,7 +212,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat } UNUserNotificationCenter.current().delegate = self - userNotificationManager = UserNotificationManager() + _ = UserNotificationManager.shared #if DEBUG refreshTimer!.update() diff --git a/Shared/UserNotifications/UserNotificationManager.swift b/Shared/UserNotifications/UserNotificationManager.swift index 15160e8a5..d293ab9e1 100644 --- a/Shared/UserNotifications/UserNotificationManager.swift +++ b/Shared/UserNotifications/UserNotificationManager.swift @@ -13,6 +13,8 @@ import UserNotifications final class UserNotificationManager: NSObject { + static let shared = UserNotificationManager() + override init() { super.init() NotificationCenter.default.addObserver(self, selector: #selector(accountDidDownloadArticles(_:)), name: .AccountDidDownloadArticles, object: nil) diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 2ebbc6419..92b96697c 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -25,7 +25,6 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationC private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "Application") - var userNotificationManager: UserNotificationManager! var extensionContainersFile: ExtensionContainersFile! var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile! var widgetDataEncoder: WidgetDataEncoder! @@ -87,7 +86,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationC } UNUserNotificationCenter.current().delegate = self - userNotificationManager = UserNotificationManager() + _ = UserNotificationManager.shared extensionContainersFile = ExtensionContainersFile() extensionFeedAddRequestFile = ExtensionFeedAddRequestFile()