[trello.com/c/3w2UROLD] fix remote notification budge update

Author: vovameister

Adamant/App/AppDelegate.swift

@@ -507,13 +507,9 @@ extension AppDelegate {
             return
         }
 
-        notificationsService.startBackgroundBatchNotifications()
-
         Task {
             let results = await fetchBackgroundData(notificationsService: notificationsService)
 
-            notificationsService.stopBackgroundBatchNotifications()
-
             for result in results {
                 switch result {
                 case .newData:

Adamant/ServiceProtocols/NotificationsService.swift

@@ -262,8 +262,4 @@ protocol NotificationsService: AnyObject, Sendable {
 
     func removeAllPendingNotificationRequests()
     func removeAllDeliveredNotifications()
-
-    // MARK: Background batch notifications
-    func startBackgroundBatchNotifications()
-    func stopBackgroundBatchNotifications()
 }

Adamant/Services/AdamantNotificationService.swift

@@ -65,7 +65,6 @@ final class AdamantNotificationsService: NSObject, NotificationsService {
     private(set) var inAppVibrate: Bool = true
     private(set) var inAppToasts: Bool = true
 
-    private var isBackgroundSession = false
     private var backgroundNotifications = 0
     private var subscriptions = Set<AnyCancellable>()
 
@@ -91,6 +90,13 @@ final class AdamantNotificationsService: NSObject, NotificationsService {
             .notifications(named: .AdamantAccountService.userLoggedOut, object: nil)
             .sink { @MainActor [weak self] _ in self?.onUserLoggedOut() }
             .store(in: &subscriptions)
+        
+        NotificationCenter.default
+            .notifications(named: UIApplication.didBecomeActiveNotification)
+            .sink { @MainActor [weak self] _ in
+                self?.backgroundNotifications = 0
+            }
+            .store(in: &subscriptions)
     }
 
     func setInAppSound(_ value: Bool) {
@@ -249,12 +255,9 @@ extension AdamantNotificationsService {
 
         if let number = type.badge {
             DispatchQueue.onMainThreadSyncSafe {
-                content.badge = NSNumber(value: UIApplication.shared.applicationIconBadgeNumber + backgroundNotifications + number)
-            }
-
-            if isBackgroundSession {
-                backgroundNotifications += number
+                content.badge = NSNumber(value: customBadgeNumber + backgroundNotifications + number)
             }
+            backgroundNotifications += number
         }
 
         let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
@@ -300,18 +303,6 @@ extension AdamantNotificationsService {
     }
 }
 
-// MARK: - Background batch notifications
-extension AdamantNotificationsService {
-    func startBackgroundBatchNotifications() {
-        isBackgroundSession = true
-        backgroundNotifications = 0
-    }
-
-    func stopBackgroundBatchNotifications() {
-        isBackgroundSession = false
-        backgroundNotifications = 0
-    }
-}
 
 extension AdamantNotificationsService {
     fileprivate func onUserLoggedIn() {