New notifications section in settings (#1273)

ElementX/Sources/Services/Notification/Manager/NotificationManager.swift

@@ -24,7 +24,9 @@ class NotificationManager: NSObject, NotificationManagerProtocol {
     private let appSettings: AppSettings
     
     private var userSession: UserSessionProtocol?
-
+    private var cancellables = Set<AnyCancellable>()
+    private var notificationsEnabled = false
+    
     init(notificationCenter: UserNotificationCenterProtocol,
          appSettings: AppSettings) {
         self.notificationCenter = notificationCenter
@@ -50,15 +52,35 @@ class NotificationManager: NSObject, NotificationManagerProtocol {
                                                     options: [])
         notificationCenter.setNotificationCategories([messageCategory, inviteCategory])
         notificationCenter.delegate = self
+        
+        notificationsEnabled = appSettings.enableNotifications
+        MXLog.info("[NotificationManager] app setting 'enableNotifications' is '\(notificationsEnabled)'")
+        
+        // Listen for changes to AppSettings.enableNotifications
+        appSettings.$enableNotifications
+            .sink { [weak self] newValue in
+                self?.enableNotifications(newValue)
+            }
+            .store(in: &cancellables)
+        
+        // Request authorization uppon UIApplication.didBecomeActiveNotification notification
+        NotificationCenter.default.publisher(for: UIApplication.didBecomeActiveNotification)
+            .sink { [weak self] _ in
+                self?.requestAuthorization()
+            }
+            .store(in: &cancellables)
     }
-
+    
     func requestAuthorization() {
+        guard appSettings.enableNotifications, !userSession.isNil else { return }
         Task {
             do {
-                let granted = try await notificationCenter.requestAuthorization(options: [.alert, .sound, .badge])
-                MXLog.info("[NotificationManager] permission granted: \(granted)")
+                let permissionGranted = try await notificationCenter.requestAuthorization(options: [.alert, .sound, .badge])
+                MXLog.info("[NotificationManager] permission granted: \(permissionGranted)")
                 await MainActor.run {
-                    self.delegate?.authorizationStatusUpdated(self, granted: granted)
+                    if permissionGranted {
+                        self.delegate?.registerForRemoteNotifications()
+                    }
                 }
             } catch {
                 MXLog.error("[NotificationManager] request authorization failed: \(error)")
@@ -136,6 +158,17 @@ class NotificationManager: NSObject, NotificationManagerProtocol {
         appSettings.pusherProfileTag = newTag
         return newTag
     }
+    
+    private func enableNotifications(_ enable: Bool) {
+        guard notificationsEnabled != enable else { return }
+        notificationsEnabled = enable
+        MXLog.info("[NotificationManager] app setting 'enableNotifications' changed to '\(enable)'")
+        if enable {
+            requestAuthorization()
+        } else {
+            delegate?.unregisterForRemoteNotifications()
+        }
+    }
 }
 
 // MARK: - UNUserNotificationCenterDelegate

ElementX/Sources/Services/Notification/Manager/NotificationManagerProtocol.swift

@@ -18,8 +18,6 @@ import Foundation
 import UserNotifications
 
 protocol NotificationManagerDelegate: AnyObject {
-    func authorizationStatusUpdated(_ service: NotificationManagerProtocol,
-                                    granted: Bool)
     func shouldDisplayInAppNotification(_ service: NotificationManagerProtocol,
                                         content: UNNotificationContent) -> Bool
     func notificationTapped(_ service: NotificationManagerProtocol,
@@ -27,6 +25,8 @@ protocol NotificationManagerDelegate: AnyObject {
     func handleInlineReply(_ service: NotificationManagerProtocol,
                            content: UNNotificationContent,
                            replyText: String) async
+    func registerForRemoteNotifications()
+    func unregisterForRemoteNotifications()
 }
 
 // MARK: - NotificationManagerProtocol

ElementX/Sources/Services/Notification/Manager/UserNotificationCenterProtocol.swift

@@ -22,4 +22,8 @@ protocol UserNotificationCenterProtocol: AnyObject {
     func add(_ request: UNNotificationRequest) async throws
     func requestAuthorization(options: UNAuthorizationOptions) async throws -> Bool
     func setNotificationCategories(_ categories: Set<UNNotificationCategory>)
+    func authorizationStatus() async -> UNAuthorizationStatus
 }
+
+// sourcery: AutoMockable
+extension UserNotificationCenterProtocol { }