Tweaked unread count logic, reverted another change

Session/Meta/AppDelegate.swift

@@ -381,16 +381,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                         // Ensure we haven't timed out yet
                         guard timer.isCancelled == false else { return }
                         
-                        /// Update the app badge in case the unread count changed (but only if the database is valid and
+                        /// Update the app badge in case the unread count changed
-                        /// not suspended)
                         if
-                            dependencies[singleton: .storage].isValid &&
+                            let unreadCount: Int = dependencies[singleton: .storage].read({ db in
-                            !dependencies[singleton: .storage].isSuspended
+                                try Interaction.fetchAppBadgeUnreadCount(db, using: dependencies)
+                            })
                         {
-                            let unreadCount: Int = dependencies[singleton: .storage]
-                                .read { db in try Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) }
-                                .defaulting(to: 0)
-                            
                             DispatchQueue.main.async(using: dependencies) {
                                 UIApplication.shared.applicationIconBadgeNumber = unreadCount
                             }
@@ -792,14 +788,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             /// number incorrectly)
             DispatchQueue.global(qos: .default).async {
                 guard
-                    dependencies[singleton: .storage].isValid &&
+                    let unreadCount: Int = dependencies[singleton: .storage].read({ db in try
-                    !dependencies[singleton: .storage].isSuspended
+                        Interaction.fetchAppBadgeUnreadCount(db, using: dependencies)
+                    })
                 else { return }
                 
-                let unreadCount: Int = dependencies[singleton: .storage]
-                    .read { db in try Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) }
-                    .defaulting(to: 0)
-                
                 DispatchQueue.main.async(using: dependencies) {
                     UIApplication.shared.applicationIconBadgeNumber = unreadCount
                 }

SessionNotificationServiceExtension/NSENotificationPresenter.swift

@@ -90,15 +90,9 @@ public class NSENotificationPresenter: NotificationsManagerType {
             .defaulting(to: db[.defaultNotificationSound] ?? Preferences.Sound.defaultNotificationSound)
             .notificationSound(isQuiet: false)
         
-        /// Update the app badge in case the unread count changed (but only if the database is valid and
+        /// Update the app badge in case the unread count changed
-        /// not suspended)
+        if let unreadCount: Int = try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) {
-        if
+            notificationContent.badge = NSNumber(value: unreadCount)
-            dependencies[singleton: .storage].isValid &&
-            !dependencies[singleton: .storage].isSuspended
-        {
-            notificationContent.badge = (try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies))
-                .map { NSNumber(value: $0) }
-                .defaulting(to: NSNumber(value: 0))
         }
         
         // Title & body
@@ -207,15 +201,9 @@ public class NSENotificationPresenter: NotificationsManagerType {
             .defaulting(to: db[.defaultNotificationSound] ?? Preferences.Sound.defaultNotificationSound)
             .notificationSound(isQuiet: false)
         
-        /// Update the app badge in case the unread count changed (but only if the database is valid and
+        /// Update the app badge in case the unread count changed
-        /// not suspended)
+        if let unreadCount: Int = try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) {
-        if
+            notificationContent.badge = NSNumber(value: unreadCount)
-            dependencies[singleton: .storage].isValid &&
-            !dependencies[singleton: .storage].isSuspended
-        {
-            notificationContent.badge = (try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies))
-                .map { NSNumber(value: $0) }
-                .defaulting(to: NSNumber(value: 0))
         }
         
         notificationContent.title = Constants.app_name

SessionNotificationServiceExtension/NotificationServiceExtension.swift

@@ -478,16 +478,13 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
         switch resolution {
             case .ignoreDueToMainAppRunning: break
             default:
-                /// Update the app badge in case the unread count changed (but only if the database is valid and
+                /// Update the app badge in case the unread count changed
-                /// not suspended)
                 if
-                    dependencies[singleton: .storage].isValid &&
+                    let unreadCount: Int = dependencies[singleton: .storage].read({ [dependencies] db in
-                    !dependencies[singleton: .storage].isSuspended
+                        try Interaction.fetchAppBadgeUnreadCount(db, using: dependencies)
+                    })
                 {
-                    silentContent.badge = dependencies[singleton: .storage]
+                    silentContent.badge = NSNumber(value: unreadCount)
-                        .read { [dependencies] db in try Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) }
-                        .map { NSNumber(value: $0) }
-                        .defaulting(to: NSNumber(value: 0))
                 }
                 
                 dependencies[singleton: .storage].suspendDatabaseAccess()
@@ -547,15 +544,9 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
         notificationContent.userInfo = [ NotificationServiceExtension.isFromRemoteKey : true ]
         notificationContent.title = Constants.app_name
         
-        /// Update the app badge in case the unread count changed (but only if the database is valid and
+        /// Update the app badge in case the unread count changed
-        /// not suspended)
+        if let unreadCount: Int = try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies) {
-        if
+            notificationContent.badge = NSNumber(value: unreadCount)
-            dependencies[singleton: .storage].isValid &&
-            !dependencies[singleton: .storage].isSuspended
-        {
-            notificationContent.badge = (try? Interaction.fetchAppBadgeUnreadCount(db, using: dependencies))
-                .map { NSNumber(value: $0) }
-                .defaulting(to: NSNumber(value: 0))
         }
         
         if let sender: String = callMessage.sender {

SessionSnodeKit/Models/SnodeRecursiveResponse.swift

@@ -7,7 +7,7 @@ public class SnodeRecursiveResponse<T: SnodeSwarmItem>: SnodeResponse {
         case swarm
     }
     
-    public let swarm: [String: T]
+    internal let swarm: [String: T]
     
     // MARK: - Initialization