refactor camera option chat attach menu

deltachat-ios/Controller/ChatViewController.swift

@@ -14,7 +14,14 @@ extension ChatViewController: MediaSendHandler {
     }
 }
 
+extension ChatViewController: MediaPickerDelegate {
+    func onImageSelected(image: UIImage) {
+        sendImage(image)
+    }
+}
+
 class ChatViewController: MessagesViewController {
+
     var dcContext: DcContext
     weak var coordinator: ChatViewCoordinator?
 
@@ -729,6 +736,24 @@ extension ChatViewController: MessagesDataSource {
         })
     }
 
+    private func sendImage(_ image: UIImage) {
+        DispatchQueue.global().async {
+            if let compressedImage = image.dcCompress() {
+                // at this point image is compressed by 85% by default
+                let pixelSize = compressedImage.imageSizeInPixel()
+                let width = Int32(exactly: pixelSize.width)!
+                let height =  Int32(exactly: pixelSize.height)!
+                let path = Utils.saveImage(image: compressedImage)
+                let msg = dc_msg_new(mailboxPointer, DC_MSG_IMAGE)
+                dc_msg_set_file(msg, path, "image/jpeg")
+                dc_msg_set_dimension(msg, width, height)
+                dc_send_msg(mailboxPointer, UInt32(self.chatId), msg)
+                // cleanup
+                dc_msg_unref(msg)
+            }
+        }
+    }
+
     func isLastSectionVisible() -> Bool {
         guard !messageList.isEmpty else { return false }
 
@@ -877,7 +902,7 @@ extension ChatViewController: MessagesLayoutDelegate {
     }
 
     private func photoButtonPressed(_ action: UIAlertAction) {
-        coordinator?.showCameraViewController()
+        coordinator?.showCameraViewController(delegate: self)
     }
 
     private func videoButtonPressed(_ action: UIAlertAction) {

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -129,7 +129,7 @@ class MailboxCoordinator: ChatViewCoordinator {
         // ignore for now
     }
 
-    override func showCameraViewController() {
+    override func showCameraViewController(delegate: MediaPickerDelegate) {
         // ignore
     }
 
@@ -389,11 +389,13 @@ class ChatViewCoordinator: NSObject, Coordinator {
     var chatViewController: ChatViewController!
 
     var childCoordinators: [Coordinator] = []
+    let mediaPicker: MediaPicker
 
     init(dcContext: DcContext, navigationController: UINavigationController, chatId: Int) {
         self.dcContext = dcContext
         self.navigationController = navigationController
         self.chatId = chatId
+        self.mediaPicker = MediaPicker(navigationController: self.navigationController)
     }
 
     func showChatDetail(chatId: Int) {
@@ -437,24 +439,6 @@ class ChatViewCoordinator: NSObject, Coordinator {
         navigationController.pushViewController(chatViewController, animated: true)
     }
 
-    private func sendImage(_ image: UIImage) {
-        DispatchQueue.global().async {
-            if let compressedImage = image.dcCompress() {
-                // at this point image is compressed by 85% by default
-                let pixelSize = compressedImage.imageSizeInPixel()
-                let width = Int32(exactly: pixelSize.width)!
-                let height =  Int32(exactly: pixelSize.height)!
-                let path = Utils.saveImage(image: compressedImage)
-                let msg = dc_msg_new(mailboxPointer, DC_MSG_IMAGE)
-                dc_msg_set_file(msg, path, "image/jpeg")
-                dc_msg_set_dimension(msg, width, height)
-                dc_send_msg(mailboxPointer, UInt32(self.chatId), msg)
-                // cleanup
-                dc_msg_unref(msg)
-            }
-        }
-    }
-
     private func sendVideo(url: NSURL) {
         let msg = dc_msg_new(mailboxPointer, DC_MSG_VIDEO)
         if let path = url.relativePath?.cString(using: .utf8) { //absoluteString?.cString(using: .utf8) {
@@ -472,27 +456,10 @@ class ChatViewCoordinator: NSObject, Coordinator {
         }
     }
 
-    func showCameraViewController() {
-        if UIImagePickerController.isSourceTypeAvailable(.camera) {
-            let cameraViewController = CameraViewController { [weak self] image, _ in
-                self?.navigationController.dismiss(animated: true, completion: {
-                    self?.handleMediaMessageSuccess()
-                })
-                if let image = image {
-                    self?.sendImage(image)
-                }
-            }
-
-            navigationController.present(cameraViewController, animated: true, completion: nil)
-        } else {
-            let alert = UIAlertController(title: String.localized("chat_camera_unavailable"), message: nil, preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: String.localized("ok"), style: .cancel, handler: { _ in
-                self.navigationController.dismiss(animated: true, completion: nil)
-            }))
-            navigationController.present(alert, animated: true, completion: nil)
-        }
-
+    func showCameraViewController(delegate: MediaPickerDelegate) {
+        mediaPicker.showCamera(delegate: delegate, allowCropping: false)
     }
+
     func showVideoLibrary() {
         if PHPhotoLibrary.authorizationStatus() != .authorized {
             PHPhotoLibrary.requestAuthorization { status in

deltachat-ios/Helper/MediaPicker.swift

@@ -31,12 +31,16 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, UIImagePickerContro
         navigationController.present(controller, animated: true, completion: nil)
     }
 
-    func showCamera(delegate: MediaPickerDelegate) {
+    func showCamera(delegate: MediaPickerDelegate, allowCropping: Bool) {
         if UIImagePickerController.isSourceTypeAvailable(.camera) {
-            let croppingParameters = CroppingParameters(isEnabled: true,
-            allowResizing: true,
-            allowMoving: true,
-            minimumSize: CGSize(width: 70, height: 70))
+            var croppingParameters: CroppingParameters = CroppingParameters()
+            if allowCropping {
+                croppingParameters = CroppingParameters(isEnabled: true,
+                allowResizing: true,
+                allowMoving: true,
+                minimumSize: CGSize(width: 70, height: 70))
+            }
+
             let cameraViewController = CameraViewController(croppingParameters: croppingParameters,
                                                             allowsLibraryAccess: false,
                                                             allowsSwapCameraOrientation: true,
@@ -57,4 +61,8 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, UIImagePickerContro
         }
     }
 
+    func showCamera(delegate: MediaPickerDelegate) {
+        showCamera(delegate: delegate, allowCropping: true)
+    }
+
 }