Merge pull request #1354 from deltachat/badge_counter_archived_chat

fix app badge counter taking archived messages into account

deltachat-ios/Chat/ChatViewController.swift

@@ -526,12 +526,11 @@ class ChatViewController: UITableViewController {
     }
     
     func handleUserVisibility(isVisible: Bool) {
+        isVisibleToUser = isVisible
         if isVisible {
-            isVisibleToUser = true
             startTimer()
             markSeenMessagesInVisibleArea()
         } else {
-            isVisibleToUser = false
             stopTimer()
             draft.save(context: dcContext)
         }

deltachat-ios/ViewModel/ChatListViewModel.swift

@@ -183,10 +183,10 @@ class ChatListViewModel: NSObject {
     func archiveChatToggle(chatId: Int) {
         let chat = dcContext.getChat(chatId: chatId)
         let isArchivedBefore = chat.isArchived
+        dcContext.archiveChat(chatId: chatId, archive: !isArchivedBefore)
         if !isArchivedBefore {
             NotificationManager.removeNotificationsForChat(dcContext: dcContext, chatId: chatId)
         }
-        dcContext.archiveChat(chatId: chatId, archive: !isArchivedBefore)
         updateChatList(notifyListener: false)
     }