alertCanNotAccessCameraRoll for check failed of UIImagePickerControll…

…er.isSourceTypeAvailable(.PhotoLibrary)
CatchChat · Feb 2, 2016 · 96c111c · 96c111c
1 parent 8d29745
commit 96c111c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 21 deletions.
diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -430,11 +430,15 @@ class ConversationViewController: BaseViewController {
         view.choosePhotoAction = { [weak self] in
 
             let openCameraRoll: ProposerAction = { [weak self] in
-                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.PhotoLibrary){
-                    if let strongSelf = self {
-                        strongSelf.imagePicker.sourceType = .PhotoLibrary
-                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                    }
+
+                guard UIImagePickerController.isSourceTypeAvailable(.PhotoLibrary) else {
+                    self?.alertCanNotAccessCameraRoll()
+                    return
+                }
+
+                if let strongSelf = self {
+                    strongSelf.imagePicker.sourceType = .PhotoLibrary
+                    strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
                 }
             }
 

diff --git a/Yep/ViewControllers/EditProfile/EditProfileViewController.swift b/Yep/ViewControllers/EditProfile/EditProfileViewController.swift
@@ -111,11 +111,15 @@ class EditProfileViewController: SegueViewController {
         let choosePhotoAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("Choose Photo", comment: ""), style: .Default) { action -> Void in
 
             let openCameraRoll: ProposerAction = { [weak self] in
-                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.SavedPhotosAlbum) {
-                    if let strongSelf = self {
-                        strongSelf.imagePicker.sourceType = .PhotoLibrary
-                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                    }
+
+                guard UIImagePickerController.isSourceTypeAvailable(.PhotoLibrary) else {
+                    self?.alertCanNotAccessCameraRoll()
+                    return
+                }
+
+                if let strongSelf = self {
+                    strongSelf.imagePicker.sourceType = .PhotoLibrary
+                    strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
                 }
             }
 

diff --git a/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift b/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift
@@ -203,14 +203,18 @@ class RegisterPickAvatarViewController: SegueViewController {
     @IBAction private func tryOpenCameraRoll(sender: UIButton) {
 
         let openCameraRoll: ProposerAction = { [weak self] in
-            if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.SavedPhotosAlbum) {
-                let imagePicker = UIImagePickerController()
-                imagePicker.delegate = self
-                imagePicker.sourceType = UIImagePickerControllerSourceType.PhotoLibrary
-                imagePicker.allowsEditing = true
 
-                self?.presentViewController(imagePicker, animated: true, completion: nil)
+            guard UIImagePickerController.isSourceTypeAvailable(.PhotoLibrary) else {
+                self?.alertCanNotAccessCameraRoll()
+                return
             }
+
+            let imagePicker = UIImagePickerController()
+            imagePicker.delegate = self
+            imagePicker.sourceType = .PhotoLibrary
+            imagePicker.allowsEditing = true
+
+            self?.presentViewController(imagePicker, animated: true, completion: nil)
         }
 
         proposeToAccess(.Photos, agreed: openCameraRoll, rejected: {

diff --git a/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift b/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift
@@ -150,11 +150,15 @@ class SkillHomeViewController: BaseViewController {
             let choosePhotoAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("Choose Photo", comment: ""), style: .Default) { action -> Void in
 
                 let openCameraRoll: ProposerAction = { [weak self] in
-                    if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.SavedPhotosAlbum) {
-                        if let strongSelf = self {
-                            strongSelf.imagePicker.sourceType = .PhotoLibrary
-                            strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                        }
+
+                    guard UIImagePickerController.isSourceTypeAvailable(.PhotoLibrary) else {
+                        self?.alertCanNotAccessCameraRoll()
+                        return
+                    }
+
+                    if let strongSelf = self {
+                        strongSelf.imagePicker.sourceType = .PhotoLibrary
+                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
                     }
                 }