oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up ahead of PR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-06-09 11:56:37 -04:00
parent 128e147c1b
commit a7269a9a5d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Signal/src/ViewControllers/FingerprintViewController.m
View File

@ -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]];
}
}

2
Signal/src/ViewControllers/FingerprintViewScanController.m
View File

@ -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 =

2
Signal/translations/en.lproj/Localizable.strings
View File

@ -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?";