瀏覽代碼

mediaPicker sets delegate in lazy closure

nayooti 5 年之前
父節點
當前提交
ab34553dc6

+ 1 - 32
deltachat-ios/Controller/ChatViewController.swift

@@ -104,7 +104,7 @@ class ChatViewController: MessagesViewController, UINavigationControllerDelegate
 
 
     private lazy var mediaPicker: MediaPicker? = {
     private lazy var mediaPicker: MediaPicker? = {
         let mediaPicker = MediaPicker(navigationController: navigationController)
         let mediaPicker = MediaPicker(navigationController: navigationController)
-        mediaPicker.delegate = self 
+        mediaPicker.delegate = self
         return mediaPicker
         return mediaPicker
     }()
     }()
 
 
@@ -1512,34 +1512,3 @@ extension MessageCollectionViewCell {
         }
         }
     }
     }
 }
 }
-
-/*
-// MARK: - UIImagePickerControllerDelegate
-extension MediaPicker: UIImagePickerControllerDelegate {
-    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
-
-        enum PickerMediaType: String {
-            case image = "public.image"
-            case video = "public.movie"
-         }
-
-        if let type = info[.mediaType] as? String, let mediaType = PickerMediaType(rawValue: type) {
-
-            switch mediaType {
-            case .video:
-                if let mediaUrl = info[.mediaURL] as? NSURL {
-                    sendVideo(url: mediaUrl)
-                }
-            case .image:
-                if let image = info[.editedImage] as? UIImage {
-                    sendImage(image)
-                } else if let image = info[.originalImage] as? UIImage {
-                    sendImage(image)
-                }
-            }
-        }
-        picker.dismiss(animated: true, completion: nil)
-    }
-
-}
-*/

+ 3 - 1
deltachat-ios/Controller/EditSettingsController.swift

@@ -21,7 +21,9 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
     private let tagAccountSettingsCell = 1
     private let tagAccountSettingsCell = 1
 
 
     private lazy var mediaPicker: MediaPicker? = {
     private lazy var mediaPicker: MediaPicker? = {
-        return MediaPicker(navigationController: navigationController)
+        let mediaPicker = MediaPicker(navigationController: navigationController)
+        mediaPicker.delegate = self
+        return mediaPicker
     }()
     }()
 
 
     private lazy var statusCell: MultilineTextFieldCell = {
     private lazy var statusCell: MultilineTextFieldCell = {

+ 3 - 1
deltachat-ios/Controller/NewGroupController.swift

@@ -26,7 +26,9 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
     private let sectionGroupMembers = 2
     private let sectionGroupMembers = 2
 
 
     private lazy var mediaPicker: MediaPicker? = {
     private lazy var mediaPicker: MediaPicker? = {
-        return MediaPicker(navigationController: navigationController)
+        let mediaPicker = MediaPicker(navigationController: navigationController)
+        mediaPicker.delegate = self
+        return mediaPicker
     }()
     }()
 
 
     lazy var groupNameCell: TextFieldCell = {
     lazy var groupNameCell: TextFieldCell = {

+ 3 - 1
deltachat-ios/Controller/ProfileInfoViewController.swift

@@ -7,7 +7,9 @@ class ProfileInfoViewController: UITableViewController {
     private var displayName: String?
     private var displayName: String?
 
 
     private lazy var mediaPicker: MediaPicker? = {
     private lazy var mediaPicker: MediaPicker? = {
-        return MediaPicker(navigationController: navigationController)
+        let mediaPicker = MediaPicker(navigationController: navigationController)
+        mediaPicker.delegate = self
+        return mediaPicker
     }()
     }()
 
 
     private lazy var doneButtonItem: UIBarButtonItem = {
     private lazy var doneButtonItem: UIBarButtonItem = {