Merge tag '2.25.2.4'

7 years ago · ad8a713566
parent 2230f01d47 382c7333e7
commit ad8a713566
4 changed files with 78 additions and 66 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
    activesupport (4.2.10)
      i18n (~> 0.7)
      minitest (~> 5.1)
@ -47,39 +47,41 @@ GEM
    cocoapods-try (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
-    commander-fastlane (4.4.5)
+    commander-fastlane (4.4.6)
      highline (~> 1.7.2)
    concurrent-ruby (1.0.5)
    declarative (0.0.10)
    declarative-option (0.1.0)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
+    dotenv (2.4.0)
+    emoji_regex (0.1.1)
    escape (0.0.4)
-    excon (0.59.0)
-    faraday (0.13.1)
+    excon (0.62.0)
+    faraday (0.15.2)
      multipart-post (>= 1.2, < 3)
    faraday-cookie_jar (0.0.6)
      faraday (>= 0.7.4)
      http-cookie (~> 1.0.0)
    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.0)
-    fastlane (2.60.1)
-      CFPropertyList (>= 2.3, < 3.0.0)
+    fastimage (2.1.3)
+    fastlane (2.96.1)
+      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.3, < 3.0.0)
      babosa (>= 1.0.2, < 2.0.0)
      bundler (>= 1.12.0, < 2.0.0)
      colored
-      commander-fastlane (>= 4.4.5, < 5.0.0)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
      excon (>= 0.45.0, < 1.0.0)
      faraday (~> 0.9)
      faraday-cookie_jar (~> 0.0.6)
      faraday_middleware (~> 0.9)
      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.13.1, < 0.14.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.22.0)
      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
      mini_magick (~> 4.5.1)
@ -90,40 +92,42 @@ GEM
      public_suffix (~> 2.0.0)
      rubyzip (>= 1.1.0, < 2.0.0)
      security (= 0.1.3)
-      slack-notifier (>= 1.3, < 2.0.0)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
      terminal-notifier (>= 1.6.2, < 2.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.5.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.0, < 2.0.0)
+      xcodeproj (>= 1.5.7, < 2.0.0)
      xcpretty (>= 0.2.4, < 1.0.0)
      xcpretty-travis-formatter (>= 0.0.3)
    fourflusher (2.0.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
-    google-api-client (0.13.6)
+    google-api-client (0.21.2)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
      httpclient (>= 2.8.1, < 3.0)
      mime-types (~> 3.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
-    googleauth (0.5.3)
+    googleauth (0.6.2)
      faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
      logging (~> 2.0)
      memoist (~> 0.12)
      multi_json (~> 1.11)
      os (~> 0.9)
      signet (~> 0.7)
-    highline (1.7.8)
+    highline (1.7.10)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
    little-plugger (1.1.4)
    logging (2.2.2)
      little-plugger (~> 1.1)
@ -135,14 +139,15 @@ GEM
    mini_magick (4.5.1)
    minitest (5.11.3)
    molinillo (0.6.5)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
    multi_xml (0.6.0)
    multipart-post (2.0.0)
    nanaimo (0.2.5)
    nap (1.1.0)
+    naturally (2.1.0)
    netrc (0.11.0)
    os (0.9.6)
-    plist (3.3.0)
+    plist (3.4.0)
    public_suffix (2.0.5)
    representable (3.0.4)
      declarative (< 0.1.0)
@ -153,24 +158,30 @@ GEM
    ruby-macho (1.1.0)
    rubyzip (1.2.1)
    security (0.1.3)
-    signet (0.7.3)
+    signet (0.8.1)
      addressable (~> 2.3)
      faraday (~> 0.9)
-      jwt (~> 1.5)
+      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    slack-notifier (1.5.1)
+    simctl (1.6.4)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
    terminal-notifier (1.8.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
    thread_safe (0.3.6)
-    tty-screen (0.5.0)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.4)
-    unicode-display_width (1.3.0)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.3.2)
    word_wrap (1.0.0)
    xcodeproj (1.5.9)
      CFPropertyList (>= 2.3.3, < 4.0)
@ -180,7 +191,7 @@ GEM
      nanaimo (~> 0.2.5)
    xcpretty (0.2.8)
      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty-travis-formatter (1.0.0)
      xcpretty (~> 0.2, >= 0.0.7)

 PLATFORMS
--- a/Podfile.lock
+++ b/Podfile.lock
@ -145,7 +145,7 @@ DEPENDENCIES:
  - YYImage

 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
    - AFNetworking
    - ATAppUpdater
    - CocoaLumberjack
@ -239,4 +239,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 6a1bafb7c5bedfa4e577580ff12e487cc7111f38

-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3
--- a/Signal/src/ViewControllers/InviteFlow.swift
+++ b/Signal/src/ViewControllers/InviteFlow.swift
@ -50,6 +50,10 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
        }
    }

+    deinit {
+        Logger.verbose("[InviteFlow] deinit")
+    }
+
    // MARK: Twitter

    func canTweet() -> Bool {
@ -91,10 +95,9 @@ 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
        }

@ -129,7 +132,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) {
@ -184,7 +189,7 @@ 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.present(messageComposeViewController, animated: true)
    }

    // MARK: MessageComposeViewControllerDelegate
@ -192,17 +197,17 @@ 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)
-
-        switch result {
-        case .failed:
-            let warning = UIAlertController(title: nil, message: NSLocalizedString("SEND_INVITE_FAILURE", comment: "Alert body after invite failed"), preferredStyle: .alert)
-            warning.addAction(UIAlertAction(title: CommonStrings.dismissButton, style: .default, handler: nil))
-            self.presentingViewController.present(warning, animated: true, completion: nil)
-        case .sent:
-            Logger.debug("\(self.TAG) user successfully invited their friends via SMS.")
-        case .cancelled:
-            Logger.debug("\(self.TAG) user cancelled message invite")
+        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)
+                warning.addAction(UIAlertAction(title: CommonStrings.dismissButton, style: .default, handler: nil))
+                self.presentingViewController.present(warning, animated: true, completion: nil)
+            case .sent:
+                Logger.debug("\(self.TAG) user successfully invited their friends via SMS.")
+            case .cancelled:
+                Logger.debug("\(self.TAG) user cancelled message invite")
+            }
        }
    }

@ -230,7 +235,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")
@ -240,28 +244,26 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
        mailComposeViewController.setMessageBody(body, isHTML: false)

        self.presentingViewController.dismiss(animated: true) {
-            self.presentingViewController.navigationController?.present(mailComposeViewController, animated: true) {
-                UIUtil.applySignalAppearence()
-            }
+            self.presentingViewController.present(mailComposeViewController, animated: true)
        }
    }

    // MARK: MailComposeViewControllerDelegate

    func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
-        self.presentingViewController.dismiss(animated: true, completion: nil)
-
-        switch result {
-        case .failed:
-            let warning = UIAlertController(title: nil, message: NSLocalizedString("SEND_INVITE_FAILURE", comment: "Alert body after invite failed"), preferredStyle: .alert)
-            warning.addAction(UIAlertAction(title: CommonStrings.dismissButton, style: .default, handler: nil))
-            self.presentingViewController.present(warning, animated: true, completion: nil)
-        case .sent:
-            Logger.debug("\(self.TAG) user successfully invited their friends via mail.")
-        case .saved:
-            Logger.debug("\(self.TAG) user saved mail invite.")
-        case .cancelled:
-            Logger.debug("\(self.TAG) user cancelled mail invite.")
+        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)
+                warning.addAction(UIAlertAction(title: CommonStrings.dismissButton, style: .default, handler: nil))
+                self.presentingViewController.present(warning, animated: true, completion: nil)
+            case .sent:
+                Logger.debug("\(self.TAG) user successfully invited their friends via mail.")
+            case .saved:
+                Logger.debug("\(self.TAG) user saved mail invite.")
+            case .cancelled:
+                Logger.debug("\(self.TAG) user cancelled mail invite.")
+            }
        }
    }

--- a/SignalServiceKit/src/TSConstants.h
+++ b/SignalServiceKit/src/TSConstants.h
@ -17,8 +17,7 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {

 #define textSecureHTTPTimeOut 10

-// FIXME this is likely to change
-#define kLegalTermsUrlString @"https://signal.org/signal/privacy/"
+#define kLegalTermsUrlString @"https://signal.org/legal/"

 //#ifndef DEBUG