Merge branch 'trello.com/c/aZtAfZ44' into release/3.11.0

Author: vovameister

Adamant/Helpers/UserDefaultsManager.swift

@@ -16,9 +16,11 @@ public class Chatroom: NSManagedObject, @unchecked Sendable {
 
     func markAsReaded() {
         hasUnreadMessages = false
-
+        
         if let trs = transactions as? Set<ChatTransaction> {
-            trs.filter { $0.isUnread }.forEach { $0.isUnread = false }
+            trs.filter { $0.isUnread }.forEach {
+                $0.isUnread = false
+            }
         }
     }
 
@@ -29,8 +31,11 @@ public class Chatroom: NSManagedObject, @unchecked Sendable {
             return
         }
         message.isUnread = false
-
-        message.richMessageTransactions?.forEach { $0.isUnread = false }
+        
+        
+        message.richMessageTransactions?.forEach {
+            $0.isUnread = false
+        }
 
         if let context = message.managedObjectContext, context.hasChanges {
             try? context.save()

Adamant/Models/CoreData/Chatroom+CoreDataClass.swift

@@ -556,14 +556,13 @@ final class ChatViewModel: NSObject {
                         recipient: partnerAddress
                     )
                 }
+                if let chatroom {
+                    await chatsProvider.markMessageAsRead(chatroom: chatroom, message: messageId)
+                }
 
                 await waitForMessage(withId: messageId)
                 scrollToId = messageId
-                
                 dialog.send(.progress(false))
-                if let chatroom {
-                    await chatsProvider.markMessageAsRead(chatroom: chatroom, message: messageId)
-                }
             } catch {
                 print(error)
                 dialog.send(.progress(false))

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -323,6 +323,7 @@ extension AdamantChatsProvider {
         SecureStore.remove(StoreKey.chatProvider.receivedLastHeight)
         SecureStore.remove(StoreKey.chatProvider.readedLastHeight)
         SecureStore.remove(StoreKey.chatProvider.markedChatsAsUnread)
+        UserDefaultsManager.lastReceivedId = nil
 
         // Set State
         setState(.empty, previous: prevState, notify: notify)
@@ -1922,6 +1923,9 @@ extension AdamantChatsProvider {
             if unreadTransactions.count == 0 {
                 unreadTransactions = newMessageTransactions.filter { $0.height == 0 }
             }
+            unreadTransactions.forEach {
+                UserDefaultsManager.addLastReceivedId($0.transactionId)
+            }
             let chatrooms = Dictionary(grouping: unreadTransactions, by: ({ (t: ChatTransaction) -> Chatroom in t.chatroom! }))
             for (chatroom, trs) in chatrooms {
                 if let address = chatroom.partner?.address {

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -10,4 +10,5 @@ public enum UserDefaultsKey: String {
 
     case leftSplitViewController
     case rightSplitViewController
+    case lastReceivedId
 }

CommonKit/Sources/CommonKit/Core/UserDefaultsKeys.swift

@@ -0,0 +1,29 @@
+//
+//  UserDefaultsManager.swift
+//  CommonKit
+//
+//  Created by Владимир Клевцов on 2. 5. 2025..
+//
+public struct UserDefaultsManager {
+    @UserDefaultsStorage(.needsToShowNoActiveNodesAlert)
+    static var needsToShowNoActiveNodesAlert: Bool?
+
+    @UserDefaultsStorage(.lastReceivedId)
+    public static var lastReceivedId: [String]?
+
+    public static func setInitialUserDefaults() {
+        needsToShowNoActiveNodesAlert = true
+    }
+}
+
+public extension UserDefaultsManager {
+    static func addLastReceivedId(_ id: String) {
+        var ids = lastReceivedId ?? []
+        ids.removeAll { $0 == id }
+        ids.insert(id, at: 0)
+        if ids.count > 100 {
+            ids = Array(ids.prefix(100))
+        }
+        lastReceivedId = ids
+    }
+}

CommonKit/Sources/CommonKit/Core/UserDefaultsManager.swift

@@ -9,7 +9,8 @@ import Foundation
 
 @propertyWrapper
 public struct UserDefaultsStorage<T> {
-    private let defaults = UserDefaults.standard
+    //user group.adamant.adamant-messenger to share UserDefaults Data to NotificationService and another app targets
+    private let defaults = UserDefaults(suiteName: "group.adamant.adamant-messenger") ?? UserDefaults.standard
     private let key: String
 
     public var wrappedValue: T? {

CommonKit/Sources/CommonKit/Core/UserDefaultsWrapper.swift

@@ -43,8 +43,11 @@ class NotificationService: UNNotificationServiceExtension {
     // MARK: - Hanlder
     var contentHandler: ((UNNotificationContent) -> Void)?
     var bestAttemptContent: UNMutableNotificationContent?
+    var shouldIgnoreNotification = false
+    
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
+        shouldIgnoreNotification = false
         AdamantUtilities.consoleLog(
             "Push notification received",
             request.content.userInfo.debugDescription,
@@ -79,6 +82,12 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(bestAttemptContent)
             return
         }
+        let lastReadIds = UserDefaultsManager.lastReceivedId
+        
+        if let lastReadIds,
+           lastReadIds.contains(String(transaction.id)) {
+            shouldIgnoreNotification = true
+        }
 
         // MARK: 3. Working on transaction
         let partnerAddress: String
@@ -107,9 +116,7 @@ class NotificationService: UNNotificationServiceExtension {
             partnerName = partnerAddress.checkAndReplaceSystemWallets()
             bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.partnerNoDislpayNameKey] = AdamantNotificationUserInfoKeys.partnerNoDisplayNameValue
         }
-
-        var shouldIgnoreNotification = false
-
+        
         var isReaction = false
 
         // MARK: 5. Content
@@ -313,11 +320,6 @@ class NotificationService: UNNotificationServiceExtension {
             break
         }
 
-        guard !shouldIgnoreNotification else {
-            contentHandler(UNNotificationContent())
-            return
-        }
-
         bestAttemptContent.sound = getSound(
             SecureStore: SecureStore,
             isReaction: isReaction
@@ -330,21 +332,25 @@ class NotificationService: UNNotificationServiceExtension {
         if let data = try? JSONEncoder().encode(transaction), let transactionRaw = String(data: data, encoding: .utf8) {
             bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.transaction] = transactionRaw
         }
-        bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
 
-        // MARK: 8 Set current budge
-        let storedBadgeString: String? = SecureStore.get(StoreKey.notificationsService.customBadgeNumber)
-        let currentBadge = (Int(storedBadgeString ?? "0") ?? 0) + 1
-        bestAttemptContent.badge = NSNumber(value: currentBadge)
-        SecureStore.set(String(currentBadge), for: StoreKey.notificationsService.customBadgeNumber)
+        // MARK: 8 Set current budge and Message
+        var badgeValue = (Int(SecureStore.get(StoreKey.notificationsService.customBadgeNumber) ?? "0") ?? 0)
+        if !shouldIgnoreNotification {
+            badgeValue += 1
+            bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
+        }
+        
+        bestAttemptContent.badge = NSNumber(value: badgeValue)
+        SecureStore.set(String(badgeValue), for: StoreKey.notificationsService.customBadgeNumber)
 
         contentHandler(bestAttemptContent)
     }
 
     override func serviceExtensionTimeWillExpire() {
         // Called just before the extension will be terminated by the system.
         // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
-        if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
+        if let contentHandler = contentHandler,
+           let bestAttemptContent = bestAttemptContent {
             contentHandler(bestAttemptContent)
         }
     }