Browse Source

Merge pull request #1731 from deltachat/fix-cancel-multiedit

fix chatlist's multi-edit 'Cancel' button
cyBerta 2 năm trước cách đây
mục cha
commit
e3eab8da4c

+ 2 - 3
deltachat-ios/Controller/ChatListController.swift

@@ -608,14 +608,13 @@ class ChatListController: UITableViewController, AccountSwitcherHandler {
         } else {
         } else {
             titleView.text = DcUtils.getConnectivityString(dcContext: dcContext, connectedString: String.localized("pref_chats"))
             titleView.text = DcUtils.getConnectivityString(dcContext: dcContext, connectedString: String.localized("pref_chats"))
             if !handleMultiSelectionTitle() {
             if !handleMultiSelectionTitle() {
-                navigationItem.setLeftBarButton(nil, animated: true)
+                navigationItem.setLeftBarButton(accountButton, animated: false)
+                updateAccountButton()
                 navigationItem.setRightBarButton(newButton, animated: true)
                 navigationItem.setRightBarButton(newButton, animated: true)
                 if dcContext.getConnectivity() >= DC_CONNECTIVITY_CONNECTED {
                 if dcContext.getConnectivity() >= DC_CONNECTIVITY_CONNECTED {
                     titleView.accessibilityHint = "\(String.localized("connectivity_connected")): \(String.localized("a11y_connectivity_hint"))"
                     titleView.accessibilityHint = "\(String.localized("connectivity_connected")): \(String.localized("a11y_connectivity_hint"))"
                 }
                 }
             }
             }
-            navigationItem.setLeftBarButton(accountButton, animated: false)
-            updateAccountButton()
         }
         }
         titleView.isUserInteractionEnabled = !tableView.isEditing
         titleView.isUserInteractionEnabled = !tableView.isEditing
         titleView.sizeToFit()
         titleView.sizeToFit()