Merge branch 'mkirk/redundant-sn-changes'

Podfile.lock

@@ -136,7 +136,7 @@ CHECKOUT OPTIONS:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: edc6578b9baca780d1489aeb205f1bb778f37bce
+    :commit: fba94754a6382b7fa55835ac25c7dd9931e594d8
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/ViewControllers/ConversationView/MessagesViewController.m

@@ -79,7 +79,7 @@
 #import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSInvalidIdentityKeySendingErrorMessage.h>
+#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
 #import <SignalServiceKit/TSMessagesManager.h>
 #import <SignalServiceKit/TSNetworkManager.h>
 #import <SignalServiceKit/Threading.h>
@@ -2355,16 +2355,12 @@ typedef enum : NSUInteger {
                   style:UIAlertActionStyleDefault
                 handler:^(UIAlertAction *_Nonnull action) {
                     DDLogInfo(@"%@ Remote Key Changed actions: Accepted new identity key", self.tag);
-                    [errorMessage acceptNewIdentityKey];
-                    if ([errorMessage isKindOfClass:[TSInvalidIdentityKeySendingErrorMessage class]]) {
-                        [self.messageSender
-                            resendMessageFromKeyError:(TSInvalidIdentityKeySendingErrorMessage *)errorMessage
-                            success:^{
-                                DDLogDebug(@"%@ Successfully resent key-error message.", self.tag);
-                            }
-                            failure:^(NSError *_Nonnull error) {
-                                DDLogError(@"%@ Failed to resend key-error message with error:%@", self.tag, error);
-                            }];
+
+                    // DEPRECATED: we're no longer creating these incoming SN error's per message,
+                    // but there will be some legacy ones in the wild, behind which await as-of-yet-undecrypted
+                    // messages
+                    if ([errorMessage isKindOfClass:[TSInvalidIdentityKeyReceivingErrorMessage class]]) {
+                        [errorMessage acceptNewIdentityKey];
                     }
                 }];
     [actionSheetController addAction:acceptSafetyNumberAction];

Signal/translations/en.lproj/Localizable.strings

@@ -254,7 +254,7 @@
 "CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ may have reinstalled or changed devices. Verify your safety number with them to ensure privacy.";
 
 /* Action sheet title presented when a users's SN have recently changed. Embeds {{contact's name or phone number}} */
-"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Safety number with %@ has Changed";
+"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Safety number with %@ has changed";
 
 /* Generic button text to proceed with an action */
 "CONFIRMATION_TITLE" = "Confirm";
@@ -518,7 +518,7 @@
 "FAILED_SENDING_BECAUSE_RATE_LIMIT" = "Too many failures with this contact. Please try again shortly.";
 
 /* action sheet header when re-sending message which failed because of untrusted identity keys */
-"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "You must accept the new safety number before you will be able to send.";
+"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "Your safety number with %@ has recently changed. You may wish to verify before resending.";
 
 /* alert title */
 "FAILED_VERIFICATION_TITLE" = "Failed to Verify Safety Number!";
@@ -704,7 +704,7 @@
 "MESSAGE_STATUS_DELIVERED" = "Delivered";
 
 /* message footer for failed messages */
-"MESSAGE_STATUS_FAILED" = "Sending failed. Tap to retry.";
+"MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info.";
 
 /* message footer for sent messages */
 "MESSAGE_STATUS_SENT" = "Sent";