From a7269a9a5daddb292c2c85e28298ccbbcd26929e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 9 Jun 2017 11:56:37 -0400 Subject: [PATCH] Clean up ahead of PR. // FREEBIE --- Signal/src/ViewControllers/FingerprintViewController.m | 5 +++-- Signal/src/ViewControllers/FingerprintViewScanController.m | 2 ++ Signal/translations/en.lproj/Localizable.strings | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/FingerprintViewController.m b/Signal/src/ViewControllers/FingerprintViewController.m index 65780c052..58152b5a5 100644 --- a/Signal/src/ViewControllers/FingerprintViewController.m +++ b/Signal/src/ViewControllers/FingerprintViewController.m @@ -129,6 +129,8 @@ typedef void (^CustomLayoutBlock)(); OWSRecipientIdentity *_Nullable recipientIdentity = [[OWSIdentityManager sharedManager] recipientIdentityForRecipientId:recipientId]; OWSAssert(recipientIdentity); + // By capturing the identity key when we enter these views, we prevent the edge case + // where the user verifies a key that we learned about while this view was open. self.identityKey = recipientIdentity.identityKey; OWSFingerprintBuilder *builder = @@ -429,8 +431,7 @@ typedef void (^CustomLayoutBlock)(); { if (gestureRecognizer.state == UIGestureRecognizerStateRecognized) { NSString *learnMoreURL = @"https://support.whispersystems.org/hc/en-us/articles/" - @"213134107-How-do-I-verify-the-person-I-m-sending-messages-to-is-who-they-say-they-" - @"are-"; + @"213134107"; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:learnMoreURL]]; } } diff --git a/Signal/src/ViewControllers/FingerprintViewScanController.m b/Signal/src/ViewControllers/FingerprintViewScanController.m index 2db61b18f..310a8a1ac 100644 --- a/Signal/src/ViewControllers/FingerprintViewScanController.m +++ b/Signal/src/ViewControllers/FingerprintViewScanController.m @@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN OWSRecipientIdentity *_Nullable recipientIdentity = [[OWSIdentityManager sharedManager] recipientIdentityForRecipientId:recipientId]; OWSAssert(recipientIdentity); + // By capturing the identity key when we enter these views, we prevent the edge case + // where the user verifies a key that we learned about while this view was open. self.identityKey = recipientIdentity.identityKey; OWSFingerprintBuilder *builder = diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index d99c0ad37..438e5a6f4 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -953,7 +953,7 @@ "PRIVACY_TAP_TO_SCAN" = "Tap to Scan"; /* Button that lets user mark another user's identity as unverified. */ -"PRIVACY_UNVERIFY_BUTTON" = "Mark as Not Verified"; +"PRIVACY_UNVERIFY_BUTTON" = "Mark as not Verified"; /* Alert body when verifying with {{contact name}} */ "PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "This doesn't look like your safety number with %@. Are you verifying the correct contact?";