浏览代码

remove unused delegates from MediaPicker, closes #860

B. Petersen 5 年之前
父节点
当前提交
1e7d60db47
共有 2 个文件被更改,包括 8 次插入10 次删除
  1. 6 6
      deltachat-ios/Controller/ChatViewController.swift
  2. 2 4
      deltachat-ios/Helper/MediaPicker.swift

+ 6 - 6
deltachat-ios/Controller/ChatViewController.swift

@@ -743,12 +743,12 @@ class ChatViewController: MessagesViewController {
         }
     }
 
-    private func showDocumentLibrary(delegate: MediaPickerDelegate) {
-        mediaPicker?.showDocumentLibrary(delegate: delegate)
+    private func showDocumentLibrary() {
+        mediaPicker?.showDocumentLibrary()
     }
 
-    private func showVoiceMessageRecorder(delegate: MediaPickerDelegate) {
-        mediaPicker?.showVoiceRecorder(delegate: delegate)
+    private func showVoiceMessageRecorder() {
+        mediaPicker?.showVoiceRecorder()
     }
 
     private func showCameraViewController() {
@@ -1265,11 +1265,11 @@ extension ChatViewController: MessagesLayoutDelegate {
     }
 
     private func documentActionPressed(_ action: UIAlertAction) {
-        showDocumentLibrary(delegate: self)
+        showDocumentLibrary()
     }
 
     private func voiceMessageButtonPressed(_ action: UIAlertAction) {
-        showVoiceMessageRecorder(delegate: self)
+        showVoiceMessageRecorder()
     }
 
     private func cameraButtonPressed(_ action: UIAlertAction) {

+ 2 - 4
deltachat-ios/Helper/MediaPicker.swift

@@ -45,8 +45,7 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, AudioRecorderContro
         self.navigationController = navigationController
     }
 
-    func showVoiceRecorder(delegate: MediaPickerDelegate) {
-        self.delegate = delegate
+    func showVoiceRecorder() {
         let audioRecorderController = AudioRecorderController()
         audioRecorderController.delegate = self
         //audioRecorderController.maximumRecordDuration = 1200
@@ -73,13 +72,12 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, AudioRecorderContro
         }
     }
 
-    func showDocumentLibrary(delegate: MediaPickerDelegate) {
+    func showDocumentLibrary() {
         let types = [kUTTypePDF, kUTTypeText, kUTTypeRTF, kUTTypeSpreadsheet, kUTTypeVCard, kUTTypeZipArchive, kUTTypeImage]
         let documentPicker = UIDocumentPickerViewController(documentTypes: types as [String], in: .import)
         documentPicker.delegate = self
         documentPicker.allowsMultipleSelection = false
         documentPicker.modalPresentationStyle = .formSheet
-        self.delegate = delegate
         navigationController?.present(documentPicker, animated: true, completion: nil)
     }