Merge branch 'charlesmchen/inviteFlow' into hotfix/2.25.2

Signal/src/ViewControllers/InviteFlow.swift

@@ -47,6 +47,10 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
         }
     }
 
+    deinit {
+        Logger.verbose("[InviteFlow] deinit")
+    }
+
     // MARK: Twitter
 
     func canTweet() -> Bool {
@@ -88,17 +92,16 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
     func contactsPicker(_: ContactsPicker, didSelectMultipleContacts contacts: [Contact]) {
         Logger.debug("\(TAG) didSelectContacts:\(contacts)")
 
-        self.presentingViewController.dismiss(animated: true)
-
         guard let inviteChannel = channel else {
             Logger.error("\(TAG) unexpected nil channel after returning from contact picker.")
+            self.presentingViewController.dismiss(animated: true)
             return
         }
 
         switch inviteChannel {
         case .message:
             let phoneNumbers: [String] = contacts.map { $0.userTextPhoneNumbers.first }.filter { $0 != nil }.map { $0! }
-            dismissAndSendSMSTo(phoneNumbers: phoneNumbers)
+            sendSMSTo(phoneNumbers: phoneNumbers)
         case .mail:
             let recipients: [String] = contacts.map { $0.emails.first }.filter { $0 != nil }.map { $0! }
             sendMailTo(emails: recipients)
@@ -126,7 +129,9 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
 
     func contactsPicker(_: ContactsPicker, contactFetchDidFail error: NSError) {
         Logger.error("\(self.logTag) in \(#function) with error: \(error)")
-        self.presentingViewController.dismiss(animated: true)
+        self.presentingViewController.dismiss(animated: true) {
+            OWSAlerts.showErrorAlert(message: NSLocalizedString("ERROR_COULD_NOT_FETCH_CONTACTS", comment: "Error indicating that the phone's contacts could not be retrieved."))
+        }
     }
 
     func contactsPickerDidCancel(_: ContactsPicker) {
@@ -159,12 +164,6 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
         }
     }
 
-    public func dismissAndSendSMSTo(phoneNumbers: [String]) {
-        self.presentingViewController.dismiss(animated: true) {
-            self.sendSMSTo(phoneNumbers: phoneNumbers)
-        }
-    }
-
     public func sendSMSTo(phoneNumbers: [String]) {
         if #available(iOS 10.0, *) {
             // iOS10 message compose view doesn't respect some system appearence attributes.
@@ -180,7 +179,9 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
 
         let inviteText = NSLocalizedString("SMS_INVITE_BODY", comment: "body sent to contacts when inviting to Install Signal")
         messageComposeViewController.body = inviteText.appending(" \(self.installUrl)")
-        self.presentingViewController.navigationController?.present(messageComposeViewController, animated: true)
+        self.presentingViewController.dismiss(animated: true) {
+            self.presentingViewController.present(messageComposeViewController, animated: true)
+        }
     }
 
     // MARK: MessageComposeViewControllerDelegate
@@ -188,8 +189,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
     func messageComposeViewController(_ controller: MFMessageComposeViewController, didFinishWith result: MessageComposeResult) {
         // Revert system styling applied to make messaging app legible on iOS10.
         UIUtil.applySignalAppearence()
-        self.presentingViewController.dismiss(animated: true, completion: nil)
+        self.presentingViewController.dismiss(animated: true) {
-
             switch result {
             case .failed:
                 let warning = UIAlertController(title: nil, message: NSLocalizedString("SEND_INVITE_FAILURE", comment: "Alert body after invite failed"), preferredStyle: .alert)
@@ -201,6 +201,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
                 Logger.debug("\(self.TAG) user cancelled message invite")
             }
         }
+    }
 
     // MARK: Mail
 
@@ -226,7 +227,6 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
     func sendMailTo(emails recipientEmails: [String]) {
         let mailComposeViewController = MFMailComposeViewController()
         mailComposeViewController.mailComposeDelegate = self
-
         mailComposeViewController.setBccRecipients(recipientEmails)
 
         let subject = NSLocalizedString("EMAIL_INVITE_SUBJECT", comment: "subject of email sent to contacts when inviting to install Signal")
@@ -236,17 +236,14 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
         mailComposeViewController.setMessageBody(body, isHTML: false)
 
         self.presentingViewController.dismiss(animated: true) {
-            self.presentingViewController.navigationController?.present(mailComposeViewController, animated: true) {
+            self.presentingViewController.present(mailComposeViewController, animated: true)
-                UIUtil.applySignalAppearence()
-            }
         }
     }
 
     // MARK: MailComposeViewControllerDelegate
 
     func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
-        self.presentingViewController.dismiss(animated: true, completion: nil)
+        self.presentingViewController.dismiss(animated: true) {
-
             switch result {
             case .failed:
                 let warning = UIAlertController(title: nil, message: NSLocalizedString("SEND_INVITE_FAILURE", comment: "Alert body after invite failed"), preferredStyle: .alert)
@@ -260,5 +257,6 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
                 Logger.debug("\(self.TAG) user cancelled mail invite.")
             }
         }
+    }
 
 }

Signal/translations/en.lproj/Localizable.strings

@@ -797,6 +797,9 @@
 /* Call setup status label */
 "END_CALL_UNCATEGORIZED_FAILURE" = "Call Failed.";
 
+/* Error indicating that the phone's contacts could not be retrieved. */
+"ERROR_COULD_NOT_FETCH_CONTACTS" = "Could not access contacts.";
+
 /* Generic notice when message failed to send. */
 "ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "Failed to send message.";