瀏覽代碼

move loading of msg_ids to FilesViewController

B. Petersen 2 年之前
父節點
當前提交
4a16ebaee8

+ 1 - 2
deltachat-ios/Controller/AllMediaViewController.swift

@@ -71,8 +71,7 @@ class AllMediaViewController: UIPageViewController {
     }
 
     private func makeFilesViewController() -> UIViewController {
-        let allMedia = dcContext.getChatMedia(chatId: 0, messageType: DC_MSG_FILE, messageType2: DC_MSG_AUDIO, messageType3: DC_MSG_WEBXDC)
-        return FilesViewController(context: dcContext, chatId: 0, fileMessageIds: allMedia.reversed(), hasWebxdc: false)
+        return FilesViewController(context: dcContext, chatId: 0, type1: DC_MSG_FILE, type2: DC_MSG_AUDIO, type3: DC_MSG_WEBXDC)
     }
 }
 

+ 2 - 2
deltachat-ios/Controller/ContactDetailViewController.swift

@@ -469,8 +469,8 @@ class ContactDetailViewController: UITableViewController {
     }
 
     private func showDocuments() {
-        let messageIds: [Int] = viewModel.documentItemMessageIds.reversed()
-        let fileGalleryController = FilesViewController(context: viewModel.context, chatId: viewModel.chatId, fileMessageIds: messageIds, hasWebxdc: viewModel.hasWebxdc)
+        let title = String.localized(viewModel.hasWebxdc ? "files_and_webxdx_apps" : "files")
+        let fileGalleryController = FilesViewController(context: viewModel.context, chatId: viewModel.chatId, type1: DC_MSG_FILE, type2: DC_MSG_AUDIO, type3: DC_MSG_WEBXDC, title: title)
         navigationController?.pushViewController(fileGalleryController, animated: true)
     }
 

+ 3 - 3
deltachat-ios/Controller/FilesViewController.swift

@@ -55,12 +55,12 @@ class FilesViewController: UIViewController {
         return menu
     }()
 
-    init(context: DcContext, chatId: Int, fileMessageIds: [Int], hasWebxdc: Bool) {
+    init(context: DcContext, chatId: Int, type1: Int32, type2: Int32, type3: Int32, title: String? = nil) {
         self.dcContext = context
-        self.fileMessageIds = fileMessageIds
+        self.fileMessageIds = dcContext.getChatMedia(chatId: 0, messageType: type1, messageType2: type2, messageType3: type3).reversed()
         self.chatId = chatId
         super.init(nibName: nil, bundle: nil)
-        self.title = String.localized(hasWebxdc ? "files_and_webxdx_apps" : "files")
+        self.title = title
     }
 
     required init?(coder: NSCoder) {

+ 4 - 3
deltachat-ios/Controller/GroupChatDetailViewController.swift

@@ -433,9 +433,10 @@ class GroupChatDetailViewController: UIViewController {
     }
 
     private func showDocuments() {
-        let messageIds: [Int] = documentItemMessageIds.reversed()
-        let fileGalleryController = FilesViewController(context: dcContext, chatId: chatId, fileMessageIds: messageIds, hasWebxdc: hasWebxdc)
-        navigationController?.pushViewController(fileGalleryController, animated: true)    }
+        let title = String.localized(hasWebxdc ? "files_and_webxdx_apps" : "files")
+        let fileGalleryController = FilesViewController(context: dcContext, chatId: chatId, type1: DC_MSG_FILE, type2: DC_MSG_AUDIO, type3: DC_MSG_WEBXDC, title: title)
+        navigationController?.pushViewController(fileGalleryController, animated: true)
+    }
 
     private func showGallery() {
         let messageIds: [Int] = galleryItemMessageIds.reversed()