Merge pull request #751 from Adamant-im/trello.com/c/hG3JTo2a

 [trello.com/c/hG3JTo2a] Updating chats drops current chat highlighting on macOS

Author: vovameister

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -190,9 +190,7 @@ final class ChatViewController: MessagesViewController {
 
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-        viewModel.preserveFiles()
         viewModel.preserveMessage(inputBar.text)
-        viewModel.preserveReplayMessage()
         viewModel.saveChatOffset(
             isScrollPositionNearlyTheBottom
             ? nil

Adamant/Modules/Chat/ViewModel/ChatPreservationProtocol.swift

@@ -10,13 +10,10 @@ import CommonKit
 
 protocol ChatPreservationProtocol: AnyObject, Sendable {
     var updateNotifier: ObservableSender<Void> { get }
-    func preserveMessage(_ message: String, forAddress address: String)
-    func getPreservedMessageFor(address: String, thenRemoveIt: Bool) -> String?
-    func setReplyMessage(_ message: MessageModel?, forAddress address: String)
-    func getReplyMessage(address: String, thenRemoveIt: Bool) -> MessageModel?
-    func preserveFiles(_ files: [FileResult]?, forAddress address: String)
+    func getPreservedMessageFor(address: String) -> String?
+    func getReplyMessage(address: String) -> MessageModel?
+    func preserveChatState(message: String?, replyMessage: MessageModel?, files: [FileResult]?, forAddress address: String)
     func getPreservedFiles(
-        for address: String,
-        thenRemoveIt: Bool
+        for address: String
     ) -> [FileResult]?
 }

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -246,20 +246,16 @@ final class ChatViewModel: NSObject {
 
         if let partnerAddress = chatroom.partner?.address {
             chatPreservation.getPreservedMessageFor(
-                address: partnerAddress,
-                thenRemoveIt: true
+                address: partnerAddress
             ).map { inputText = $0 }
 
             let cachedMessages = chatCacheService.getMessages(address: partnerAddress)
             messages = cachedMessages ?? []
             fullscreenLoading = cachedMessages == nil
 
-            replyMessage = chatPreservation.getReplyMessage(address: partnerAddress, thenRemoveIt: true)
+            replyMessage = chatPreservation.getReplyMessage(address: partnerAddress)
 
-            filesPicked = chatPreservation.getPreservedFiles(
-                for: partnerAddress,
-                thenRemoveIt: true
-            )
+            filesPicked = chatPreservation.getPreservedFiles(for: partnerAddress)
         }
         if isNewChat && !(accountService.account?.isEnoughMoneyForTransaction ?? false) {
             dialog.send(.freeTokenAlert)
@@ -385,17 +381,7 @@ final class ChatViewModel: NSObject {
 
     func preserveMessage(_ message: String) {
         guard let partnerAddress = chatroom?.partner?.address else { return }
-        chatPreservation.preserveMessage(message, forAddress: partnerAddress)
-    }
-    
-    func preserveFiles() {
-        guard let partnerAddress = chatroom?.partner?.address else { return }
-        chatPreservation.preserveFiles(filesPicked, forAddress: partnerAddress)
-    }
-    
-    func preserveReplayMessage() {
-        guard let partnerAddress = chatroom?.partner?.address else { return }
-        chatPreservation.setReplyMessage(replyMessage, forAddress: partnerAddress)
+        chatPreservation.preserveChatState(message: message, replyMessage: replyMessage, files: filesPicked, forAddress: partnerAddress)
     }
 
     func blockChat() {

Adamant/Modules/ChatsList/ChatListViewController.swift

@@ -76,6 +76,7 @@ final class ChatListViewController: KeyboardObservingViewController {
             setBadgeValue(unreadController?.fetchedObjects?.count)
         }
     }
+    private var chatDeselectedIndex: IndexPath?
 
     let defaultAvatar = UIImage.asset(named: "avatar-chat-placeholder") ?? .init()
 
@@ -197,8 +198,11 @@ final class ChatListViewController: KeyboardObservingViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        if let indexPath = tableView.indexPathForSelectedRow {
-            tableView.deselectRow(at: indexPath, animated: animated)
+        
+        if UIDevice.current.userInterfaceIdiom == .phone {
+            if let indexPath = tableView.indexPathForSelectedRow {
+                tableView.deselectRow(at: indexPath, animated: animated)
+            }
         }
     }
     override func viewDidLayoutSubviews() {
@@ -342,7 +346,10 @@ final class ChatListViewController: KeyboardObservingViewController {
         chatPreservation.updateNotifier
             .receive(on: DispatchQueue.main)
             .sink { [weak self] in
-                self?.tableView.reloadData()
+                guard let deselectedIndex = self?.chatDeselectedIndex,
+                      let cell = self?.tableView.cellForRow(at: deselectedIndex) as? ChatTableViewCell,
+                      let chatroom = self?.chatsController?.fetchedObjects?[safe: deselectedIndex.row] else { return }
+                self?.configureCell(cell, for: chatroom)
             }
             .store(in: &subscriptions)
     }
@@ -357,7 +364,7 @@ final class ChatListViewController: KeyboardObservingViewController {
 
     private func updateUITitles() {
         updatingIndicatorView.updateTitle(title:  String.adamant.chatList.title)
-        tableView.reloadData()
+        tableView.reloadDataPreservingSelection()
         searchController?.searchBar.placeholder = String.adamant.chatList.searchPlaceholder
     }
 
@@ -408,7 +415,7 @@ final class ChatListViewController: KeyboardObservingViewController {
         areMessagesLoaded = true
         performOnMessagesLoadedActions()
         setIsBusy(!synced)
-        tableView.reloadData()
+        tableView.reloadDataPreservingSelection()
     }
 
     // MARK: IB Actions
@@ -479,7 +486,7 @@ final class ChatListViewController: KeyboardObservingViewController {
 
         switch result {
         case .success:
-            tableView.reloadData()
+            tableView.reloadDataPreservingSelection()
         case .failure(let error):
             dialogService.showRichError(error: error)
         }
@@ -564,6 +571,10 @@ extension ChatListViewController: UITableViewDelegate, UITableViewDataSource {
         return UIView()
     }
 
+    func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) {
+        chatDeselectedIndex = indexPath
+    }
+    
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if isBusy,
            indexPath.row == lastSystemChatPositionRow,
@@ -719,15 +730,15 @@ extension ChatListViewController {
 
     private func insertReloadRow() {
         lastSystemChatPositionRow = getBottomSystemChatIndex()
-        tableView.reloadData()
+        tableView.reloadDataPreservingSelection()
     }
 
     @MainActor
     private func loadNewChats(offset: Int) {
         loadNewChatTask = Task {
             await chatsProvider.getChatRooms(offset: offset)
             isBusy = false
-            tableView.reloadData()
+            tableView.reloadDataPreservingSelection()
         }
     }
 }
@@ -1065,14 +1076,14 @@ extension ChatListViewController {
     private func shortDescription(for address: String) -> NSAttributedString? {
         var descriptionParts: [NSAttributedString] = []
 
-        if chatPreservation.getReplyMessage(address: address, thenRemoveIt: false) != nil {
+        if chatPreservation.getReplyMessage(address: address) != nil {
                 let replyImageAttachment = NSTextAttachment()
                 replyImageAttachment.image = UIImage(systemName: "arrowshape.turn.up.left")?.withTintColor(.adamant.primary)
                 replyImageAttachment.bounds = CGRect(x: .zero, y: -3, width: 23, height: 20)
 
                 descriptionParts.append(NSAttributedString(attachment: replyImageAttachment))
             }
-        if let files = chatPreservation.getPreservedFiles(for: address, thenRemoveIt: false), !files.isEmpty {
+        if let files = chatPreservation.getPreservedFiles(for: address), !files.isEmpty {
                 let mediaCount = files.count(where: { $0.type.isMedia })
                 let otherCount = files.count(where: { !$0.type.isMedia })
 
@@ -1093,7 +1104,7 @@ extension ChatListViewController {
                 }
             }
 
-        if let preservedMessage = chatPreservation.getPreservedMessageFor(address: address, thenRemoveIt: false) {
+        if let preservedMessage = chatPreservation.getPreservedMessageFor(address: address) {
             let processedMessage = MessageProcessHelper.process(preservedMessage)
             descriptionParts.append(NSAttributedString(string: processedMessage))
         }
@@ -1595,5 +1606,13 @@ private extension UITableView {
         reloadRows(at: indexPaths, with: .none)
         selectRow(at: selectedRowIndexPath, animated: false, scrollPosition: .none)
     }
+    
+    func reloadDataPreservingSelection() {
+        let selectedRow = indexPathForSelectedRow
+        reloadData()
+        if let selectedRow = selectedRow {
+            selectRow(at: selectedRow, animated: false, scrollPosition: .none)
+        }
+    }
 }
 

Adamant/ServiceProtocols/ChatPreservation.swift

@@ -32,63 +32,69 @@ final class ChatPreservation: ChatPreservationProtocol, @unchecked Sendable {
         preservedMessages = [:]
         preservedReplayMessage = [:]
         preservedFiles = [:]
+        
         updateNotifier.send()
     }
 
-    func preserveMessage(_ message: String, forAddress address: String) {
-        preservedMessages[address] = message
-        updateNotifier.send()
+    func preserveChatState(
+        message: String?,
+        replyMessage: MessageModel?,
+        files: [FileResult]?,
+        forAddress address: String
+    ) {
+        var shouldNotify = false
+        
+        if let message = message, !message.isEmpty {
+            preservedMessages[address] = message
+            shouldNotify = true
+        } else if preservedMessages[address] != nil {
+            preservedMessages.removeValue(forKey: address)
+            shouldNotify = true
+        }
+        
+        if let replyMessage = replyMessage {
+            preservedReplayMessage[address] = replyMessage
+            shouldNotify = true
+        } else if preservedReplayMessage[address] != nil {
+            preservedReplayMessage.removeValue(forKey: address)
+            shouldNotify = true
+        }
+        
+        if let files = files {
+            preservedFiles[address] = files
+            shouldNotify = true
+            
+        } else if preservedFiles[address] != nil {
+            preservedFiles.removeValue(forKey: address)
+            shouldNotify = true
+        }
+        
+        if shouldNotify {
+            updateNotifier.send()
+        }
     }
 
-    func getPreservedMessageFor(address: String, thenRemoveIt: Bool) -> String? {
+    func getPreservedMessageFor(address: String) -> String? {
         guard let message = preservedMessages[address] else {
             return nil
         }
-
-        if thenRemoveIt {
-            preservedMessages.removeValue(forKey: address)
-            updateNotifier.send()
-        }
-
+        
         return message
     }
 
-    func setReplyMessage(_ message: MessageModel?, forAddress address: String) {
-        preservedReplayMessage[address] = message
-        updateNotifier.send()
-    }
-    
-    func getReplyMessage(address: String, thenRemoveIt: Bool) -> MessageModel? {
-        guard let replayMessage = preservedReplayMessage[address] else {
+    func getReplyMessage(address: String) -> MessageModel? {
+        guard let replyMessage = preservedReplayMessage[address] else {
             return nil
         }
 
-        if thenRemoveIt {
-            preservedMessages.removeValue(forKey: address)
-            updateNotifier.send()
-        }
-        
-        return replayMessage
+        return replyMessage
     }
 
-    func preserveFiles(_ files: [FileResult]?, forAddress address: String) {
-        preservedFiles[address] = files
-        updateNotifier.send()
-    }
-    
-    func getPreservedFiles(
-        for address: String,
-        thenRemoveIt: Bool
-    ) -> [FileResult]? {
+    func getPreservedFiles(for address: String) -> [FileResult]? {
         guard let files = preservedFiles[address] else {
             return nil
         }
-
-        if thenRemoveIt {
-            preservedFiles.removeValue(forKey: address)
-            updateNotifier.send()
-        }
-
+        
         return files
     }
 }