remove GroupChatDetailCoordinator

deltachat-ios/Controller/GroupChatDetailViewController.swift

@@ -18,19 +18,19 @@ class GroupChatDetailViewController: UIViewController {
     private let chatActionsRowLeaveGroup = 1
     private let chatActionsRowDeleteChat = 2
 
-    private let context: DcContext
-    weak var coordinator: GroupChatDetailCoordinator?
+    private let dcContext: DcContext
 
     private let sections: [ProfileSections] = [.attachments, .members, .chatActions]
 
     private var currentUser: DcContact? {
-        let myId = groupMemberIds.filter { DcContact(id: $0).email == context.addr }.first
+        let myId = groupMemberIds.filter { DcContact(id: $0).email == dcContext.addr }.first
         guard let currentUserId = myId else {
             return nil
         }
         return DcContact(id: currentUserId)
     }
 
+    private var chatId: Int
     fileprivate var chat: DcChat
 
     // stores contactIds
@@ -106,9 +106,10 @@ class GroupChatDetailViewController: UIViewController {
         return cell
     }()
 
-    init(chatId: Int, context: DcContext) {
-        self.context = context
-        chat = context.getChat(chatId: chatId)
+    init(chatId: Int, dcContext: DcContext) {
+        self.dcContext = dcContext
+        self.chatId = chatId
+        chat = dcContext.getChat(chatId: chatId)
         super.init(nibName: nil, bundle: nil)
         setupSubviews()
     }
@@ -138,7 +139,7 @@ class GroupChatDetailViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         //update chat object, maybe chat name was edited
-        chat = context.getChat(chatId: chat.id)
+        chat = dcContext.getChat(chatId: chat.id)
         updateGroupMembers()
         tableView.reloadData() // to display updates
         editBarButtonItem.isEnabled = currentUser != nil
@@ -166,18 +167,18 @@ class GroupChatDetailViewController: UIViewController {
 
     // MARK: - actions
     @objc func editButtonPressed() {
-        coordinator?.showGroupChatEdit(chat: chat)
+        showGroupChatEdit(chat: chat)
     }
 
     private func toggleArchiveChat() {
         let archivedBefore = chat.isArchived
-        context.archiveChat(chatId: chat.id, archive: !archivedBefore)
+        dcContext.archiveChat(chatId: chat.id, archive: !archivedBefore)
         if archivedBefore {
             archiveChatCell.actionTitle = String.localized("menu_archive_chat")
         } else {
             self.navigationController?.popToRootViewController(animated: false)
         }
-        self.chat = context.getChat(chatId: chat.id)
+        self.chat = dcContext.getChat(chatId: chat.id)
      }
 
     private func getGroupMemberIdFor(_ row: Int) -> Int {
@@ -187,6 +188,98 @@ class GroupChatDetailViewController: UIViewController {
     private func isMemberManagementRow(row: Int) -> Bool {
         return row < memberManagementRows
     }
+
+    // MARK: - coordinator
+    func showSingleChatEdit(contactId: Int) {
+        if let navigationController = self.parent as? UINavigationController {
+            let editContactController = EditContactController(dcContext: dcContext, contactIdForUpdate: contactId)
+            navigationController.pushViewController(editContactController, animated: true)
+        }
+    }
+
+    func showAddGroupMember(chatId: Int) {
+        if let navigationController = self.parent as? UINavigationController {
+            let groupMemberViewController = AddGroupMembersViewController(chatId: chatId)
+            navigationController.pushViewController(groupMemberViewController, animated: true)
+        }
+    }
+
+    func showQrCodeInvite(chatId: Int) {
+        if let navigationController = self.parent as? UINavigationController {
+            let qrInviteCodeController = QrInviteViewController(dcContext: dcContext, chatId: chatId)
+            navigationController.pushViewController(qrInviteCodeController, animated: true)
+        }
+    }
+
+    func showGroupChatEdit(chat: DcChat) {
+        if let navigationController = self.parent as? UINavigationController {
+            let editGroupViewController = EditGroupViewController(dcContext: dcContext, chat: chat)
+            navigationController.pushViewController(editGroupViewController, animated: true)
+        }
+    }
+
+    func showContactDetail(of contactId: Int) {
+        if let navigationController = self.parent as? UINavigationController {
+            let viewModel = ContactDetailViewModel(contactId: contactId, chatId: nil, context: dcContext)
+            let contactDetailController = ContactDetailViewController(viewModel: viewModel)
+            navigationController.pushViewController(contactDetailController, animated: true)
+        }
+    }
+
+    func showDocuments() {
+        presentPreview(for: DC_MSG_FILE, messageType2: DC_MSG_AUDIO, messageType3: 0)
+    }
+
+    func showGallery() {
+        presentPreview(for: DC_MSG_IMAGE, messageType2: DC_MSG_GIF, messageType3: DC_MSG_VIDEO)
+    }
+
+    private func presentPreview(for messageType: Int32, messageType2: Int32, messageType3: Int32) {
+        if let navigationController = self.parent as? UINavigationController {
+            let messageIds = dcContext.getChatMedia(chatId: chatId, messageType: messageType, messageType2: messageType2, messageType3: messageType3)
+            var mediaUrls: [URL] = []
+            for messageId in messageIds {
+                let message = DcMsg.init(id: messageId)
+                if let url = message.fileURL {
+                    mediaUrls.insert(url, at: 0)
+                }
+            }
+            let previewController = PreviewController(currentIndex: 0, urls: mediaUrls)
+            navigationController.pushViewController(previewController, animated: true)
+        }
+    }
+
+    func deleteChat() {
+        if let navigationController = self.parent as? UINavigationController {
+            /*
+            app will navigate to chatlist or archive and delete the chat there
+            notify chatList/archiveList to delete chat AFTER is is visible
+            */
+            func notifyToDeleteChat() {
+                NotificationCenter.default.post(name: dcNotificationChatDeletedInChatDetail, object: nil, userInfo: ["chat_id": self.chatId])
+            }
+
+            func showArchive() {
+                navigationController.popToRootViewController(animated: false) // in main ChatList now
+                let viewModel = ChatListViewModel(dcContext: dcContext, isArchive: true)
+                let controller = ChatListController(dcContext: dcContext, viewModel: viewModel)
+                let coordinator = ChatListCoordinator(dcContext: dcContext, navigationController: navigationController)
+                controller.coordinator = coordinator
+                navigationController.pushViewController(controller, animated: false)
+            }
+
+            CATransaction.begin()
+            CATransaction.setCompletionBlock(notifyToDeleteChat)
+
+            let chat = dcContext.getChat(chatId: chatId)
+            if chat.isArchived {
+                showArchive()
+            } else {
+                navigationController.popToRootViewController(animated: true) // in main ChatList now
+            }
+            CATransaction.commit()
+        }
+    }
 }
 
 // MARK: - UITableViewDelegate, UITableViewDataSource
@@ -257,7 +350,7 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
             let contactId: Int = getGroupMemberIdFor(row)
             let cellData = ContactCellData(
                 contactId: contactId,
-                chatId: context.getChatIdByContactId(contactId)
+                chatId: dcContext.getChatIdByContactId(contactId)
             )
             let cellViewModel = ContactCellViewModel(contactData: cellData)
             contactCell.updateCell(cellViewModel: cellViewModel)
@@ -282,18 +375,18 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
         switch sectionType {
         case .attachments:
             if row == attachmentsRowGallery {
-                coordinator?.showGallery()
+                showGallery()
             } else if row == attachmentsRowDocuments {
-                coordinator?.showDocuments()
+                showDocuments()
             }
         case .members:
             if row == membersRowAddMembers {
-                coordinator?.showAddGroupMember(chatId: chat.id)
+                showAddGroupMember(chatId: chat.id)
             } else if row == membersRowQrInvite {
-                coordinator?.showQrCodeInvite(chatId: chat.id)
+                showQrCodeInvite(chatId: chat.id)
             } else {
                 let member = getGroupMember(at: row)
-                coordinator?.showContactDetail(of: member.id)
+                showContactDetail(of: member.id)
             }
         case .chatActions:
             if row == chatActionsRowArchiveChat {
@@ -347,7 +440,7 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
                 let title = String.localizedStringWithFormat(String.localized("ask_remove_members"), contact.nameNAddr)
                 let alert = UIAlertController(title: title, message: nil, preferredStyle: .safeActionSheet)
                 alert.addAction(UIAlertAction(title: String.localized("remove_desktop"), style: .destructive, handler: { _ in
-                    let success = self.context.removeContactFromChat(chatId: self.chat.id, contactId: contact.id)
+                    let success = self.dcContext.removeContactFromChat(chatId: self.chat.id, contactId: contact.id)
                     if success {
                         self.removeGroupMemberFromTableAt(indexPath)
                     }
@@ -382,7 +475,7 @@ extension GroupChatDetailViewController {
             preferredStyle: .safeActionSheet
         )
         alert.addAction(UIAlertAction(title: String.localized("menu_delete_chat"), style: .destructive, handler: { _ in
-            self.coordinator?.deleteChat()
+            self.deleteChat()
         }))
         alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
         self.present(alert, animated: true, completion: nil)
@@ -392,7 +485,7 @@ extension GroupChatDetailViewController {
         if let userId = currentUser?.id {
             let alert = UIAlertController(title: String.localized("ask_leave_group"), message: nil, preferredStyle: .safeActionSheet)
             alert.addAction(UIAlertAction(title: String.localized("menu_leave_group"), style: .destructive, handler: { _ in
-                _ = self.context.removeContactFromChat(chatId: self.chat.id, contactId: userId)
+                _ = self.dcContext.removeContactFromChat(chatId: self.chat.id, contactId: userId)
                 self.editBarButtonItem.isEnabled = false
                 self.updateGroupMembers()
             }))

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -445,102 +445,6 @@ class NewChatCoordinator: Coordinator {
     
 }
 
-// MARK: - GroupChatDetailCoordinator
-class GroupChatDetailCoordinator: Coordinator {
-    var dcContext: DcContext
-    let navigationController: UINavigationController
-    let chatId: Int
-
-    private var childCoordinators: [Coordinator] = []
-    private var previewController: PreviewController?
-
-    init(dcContext: DcContext, chatId: Int, navigationController: UINavigationController) {
-        self.dcContext = dcContext
-        self.chatId = chatId
-        self.navigationController = navigationController
-    }
-
-    func showSingleChatEdit(contactId: Int) {
-        let editContactController = EditContactController(dcContext: dcContext, contactIdForUpdate: contactId)
-        navigationController.pushViewController(editContactController, animated: true)
-    }
-
-    func showAddGroupMember(chatId: Int) {
-        let groupMemberViewController = AddGroupMembersViewController(chatId: chatId)
-        navigationController.pushViewController(groupMemberViewController, animated: true)
-    }
-
-    func showQrCodeInvite(chatId: Int) {
-        let qrInviteCodeController = QrInviteViewController(dcContext: dcContext, chatId: chatId)
-        navigationController.pushViewController(qrInviteCodeController, animated: true)
-    }
-
-    func showGroupChatEdit(chat: DcChat) {
-        let editGroupViewController = EditGroupViewController(dcContext: dcContext, chat: chat)
-        navigationController.pushViewController(editGroupViewController, animated: true)
-    }
-
-    func showContactDetail(of contactId: Int) {
-        let viewModel = ContactDetailViewModel(contactId: contactId, chatId: nil, context: dcContext)
-        let contactDetailController = ContactDetailViewController(viewModel: viewModel)
-        navigationController.pushViewController(contactDetailController, animated: true)
-    }
-
-    func showDocuments() {
-        presentPreview(for: DC_MSG_FILE, messageType2: DC_MSG_AUDIO, messageType3: 0)
-    }
-
-    func showGallery() {
-        presentPreview(for: DC_MSG_IMAGE, messageType2: DC_MSG_GIF, messageType3: DC_MSG_VIDEO)
-    }
-
-    private func presentPreview(for messageType: Int32, messageType2: Int32, messageType3: Int32) {
-        let messageIds = dcContext.getChatMedia(chatId: chatId, messageType: messageType, messageType2: messageType2, messageType3: messageType3)
-        var mediaUrls: [URL] = []
-        for messageId in messageIds {
-            let message = DcMsg.init(id: messageId)
-            if let url = message.fileURL {
-                mediaUrls.insert(url, at: 0)
-            }
-        }
-        previewController = PreviewController(currentIndex: 0, urls: mediaUrls)
-        if let previewController = previewController {
-            navigationController.pushViewController(previewController, animated: true)
-        }
-    }
-
-    func deleteChat() {
-        /*
-        app will navigate to chatlist or archive and delete the chat there
-        notify chatList/archiveList to delete chat AFTER is is visible
-        */
-        func notifyToDeleteChat() {
-            NotificationCenter.default.post(name: dcNotificationChatDeletedInChatDetail, object: nil, userInfo: ["chat_id": self.chatId])
-        }
-
-        func showArchive() {
-            self.navigationController.popToRootViewController(animated: false) // in main ChatList now
-            let viewModel = ChatListViewModel(dcContext: dcContext, isArchive: true)
-            let controller = ChatListController(dcContext: dcContext, viewModel: viewModel)
-            let coordinator = ChatListCoordinator(dcContext: dcContext, navigationController: navigationController)
-            childCoordinators.append(coordinator)
-            controller.coordinator = coordinator
-            navigationController.pushViewController(controller, animated: false)
-        }
-
-        CATransaction.begin()
-        CATransaction.setCompletionBlock(notifyToDeleteChat)
-
-        let chat = dcContext.getChat(chatId: chatId)
-        if chat.isArchived {
-            showArchive()
-        } else {
-            self.navigationController.popToRootViewController(animated: true) // in main ChatList now
-        }
-        CATransaction.commit()
-    }
-}
-
 // MARK: - ChatViewCoordinator
 class ChatViewCoordinator: NSObject, Coordinator {
     var dcContext: DcContext
@@ -572,10 +476,7 @@ class ChatViewCoordinator: NSObject, Coordinator {
                 navigationController.pushViewController(contactDetailController, animated: true)
             }
         case .GROUP, .VERIFIEDGROUP:
-            let groupChatDetailViewController = GroupChatDetailViewController(chatId: chatId, context: dcContext) // inherits from ChatDetailViewController
-            let coordinator = GroupChatDetailCoordinator(dcContext: dcContext, chatId: chatId, navigationController: navigationController)
-            childCoordinators.append(coordinator)
-            groupChatDetailViewController.coordinator = coordinator
+            let groupChatDetailViewController = GroupChatDetailViewController(chatId: chatId, dcContext: dcContext)
             navigationController.pushViewController(groupChatDetailViewController, animated: true)
         }
     }