also in archive, allow to select which chats to mark as read; still d…

…efaults to 'mark all archive read'
deltachat · Jul 2, 2024 · cc30a1f · cc30a1f
1 parent 4daec1c
commit cc30a1f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/deltachat-ios/Controller/ChatListViewController.swift b/deltachat-ios/Controller/ChatListViewController.swift
@@ -388,11 +388,11 @@ class ChatListViewController: UITableViewController {
     }
 
     @objc func markReadPressed() {
-        if isArchive {
-            dcContext.marknoticedChat(chatId: Int(DC_CHAT_ID_ARCHIVED_LINK))
-        } else if isEditing {
+        if isEditing {
             viewModel?.markUnreadSelectedChats(in: tableView.indexPathsForSelectedRows)
             setLongTapEditing(false)
+        } else if isArchive {
+            dcContext.marknoticedChat(chatId: Int(DC_CHAT_ID_ARCHIVED_LINK))
         }
     }
 
@@ -716,10 +716,10 @@ class ChatListViewController: UITableViewController {
     }
 
     func updateMarkReadButton() {
-        if isArchive {
-            self.markReadButton.isEnabled = dcContext.getUnreadMessages(chatId: Int(DC_CHAT_ID_ARCHIVED_LINK)) != 0
-        } else if tableView.isEditing {
+        if tableView.isEditing {
             self.markReadButton.isEnabled = viewModel?.hasAnyUnreadChatSelected(in: tableView.indexPathsForSelectedRows) ?? false
+        } else if isArchive {
+            self.markReadButton.isEnabled = dcContext.getUnreadMessages(chatId: Int(DC_CHAT_ID_ARCHIVED_LINK)) != 0
         }
     }