Browse Source

passing delegate in showCamera no longer needed

nayooti 5 years ago
parent
commit
231119d4a7

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

@@ -725,7 +725,7 @@ class ChatViewController: MessagesViewController, UINavigationControllerDelegate
     }
     }
 
 
     private func showCameraViewController() {
     private func showCameraViewController() {
-       mediaPicker?.showCamera(delegate: self)
+       mediaPicker?.showCamera()
     }
     }
 
 
     private func showPhotoVideoLibrary(delegate: MediaPickerDelegate) {
     private func showPhotoVideoLibrary(delegate: MediaPickerDelegate) {

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

@@ -13,7 +13,7 @@ class EditGroupViewController: UITableViewController, MediaPickerDelegate {
 
 
     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
     }()
     }()
 
 
@@ -105,7 +105,7 @@ class EditGroupViewController: UITableViewController, MediaPickerDelegate {
     }
     }
 
 
     private func cameraButtonPressed(_ action: UIAlertAction) {
     private func cameraButtonPressed(_ action: UIAlertAction) {
-        mediaPicker?.showCamera(delegate: self, allowCropping: true, supportedMediaTypes: .photo)
+        mediaPicker?.showCamera(allowCropping: true, supportedMediaTypes: .photo)
     }
     }
 
 
     func onImageSelected(image: UIImage) {
     func onImageSelected(image: UIImage) {

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

@@ -129,7 +129,7 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
     }
     }
 
 
     private func cameraButtonPressed(_ action: UIAlertAction) {
     private func cameraButtonPressed(_ action: UIAlertAction) {
-        mediaPicker?.showCamera(delegate: self, allowCropping: true, supportedMediaTypes: .photo)
+        mediaPicker?.showCamera(allowCropping: true, supportedMediaTypes: .photo)
     }
     }
 
 
     private func deleteProfileIconPressed(_ action: UIAlertAction) {
     private func deleteProfileIconPressed(_ action: UIAlertAction) {

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

@@ -350,7 +350,7 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
     }
     }
 
 
     private func showCamera(delegate: MediaPickerDelegate) {
     private func showCamera(delegate: MediaPickerDelegate) {
-        mediaPicker?.showCamera(delegate: self, allowCropping: true, supportedMediaTypes: .photo)
+        mediaPicker?.showCamera(allowCropping: true, supportedMediaTypes: .photo)
     }
     }
 
 
     private func showQrCodeInvite(chatId: Int) {
     private func showQrCodeInvite(chatId: Int) {

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

@@ -133,7 +133,7 @@ class ProfileInfoViewController: UITableViewController {
     }
     }
 
 
     private func cameraButtonPressed(_ action: UIAlertAction) {
     private func cameraButtonPressed(_ action: UIAlertAction) {
-        mediaPicker?.showCamera(delegate: self)
+        mediaPicker?.showCamera()
     }
     }
 }
 }
 
 

+ 3 - 3
deltachat-ios/Helper/MediaPicker.swift

@@ -125,7 +125,7 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, UIImagePickerContro
         navigationController?.present(controller, animated: true, completion: nil)
         navigationController?.present(controller, animated: true, completion: nil)
     }
     }
 
 
-    func showCamera(delegate: MediaPickerDelegate, allowCropping: Bool, supportedMediaTypes: CameraMediaTypes) {
+    func showCamera(allowCropping: Bool, supportedMediaTypes: CameraMediaTypes) {
         if UIImagePickerController.isSourceTypeAvailable(.camera) {
         if UIImagePickerController.isSourceTypeAvailable(.camera) {
             let imagePickerController = UIImagePickerController()
             let imagePickerController = UIImagePickerController()
             imagePickerController.sourceType = .camera
             imagePickerController.sourceType = .camera
@@ -156,8 +156,8 @@ class MediaPicker: NSObject, UINavigationControllerDelegate, UIImagePickerContro
         }
         }
     }
     }
 
 
-    func showCamera(delegate: MediaPickerDelegate) {
-        showCamera(delegate: delegate, allowCropping: false, supportedMediaTypes: .allAvailable)
+    func showCamera() {
+        showCamera(allowCropping: false, supportedMediaTypes: .allAvailable)
     }
     }
 
 
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {