Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent efbda70764
commit 0855faabb4

@ -201,7 +201,7 @@ NS_ASSUME_NONNULL_BEGIN
customRowHeight:[ContactTableViewCell rowHeight] customRowHeight:[ContactTableViewCell rowHeight]
actionBlock:^{ actionBlock:^{
if (useVerifyAction) { if (useVerifyAction) {
[weakSelf verifySafetyNumber:recipientId]; [weakSelf showSafetyNumberView:recipientId];
} else { } else {
[weakSelf didSelectRecipientId:recipientId]; [weakSelf didSelectRecipientId:recipientId];
} }
@ -386,7 +386,7 @@ NS_ASSUME_NONNULL_BEGIN
@"safety number of another user.") @"safety number of another user.")
style:UIAlertActionStyleDefault style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self verifySafetyNumber:recipientId]; [self showSafetyNumberView:recipientId];
}]]; }]];
} }
@ -419,7 +419,7 @@ NS_ASSUME_NONNULL_BEGIN
[Environment callUserWithIdentifier:recipientId]; [Environment callUserWithIdentifier:recipientId];
} }
- (void)verifySafetyNumber:(NSString *)recipientId - (void)showSafetyNumberView:(NSString *)recipientId
{ {
OWSAssert(recipientId.length > 0); OWSAssert(recipientId.length > 0);

@ -581,10 +581,10 @@
"GROUP_MEMBERS_CALL" = "Call"; "GROUP_MEMBERS_CALL" = "Call";
/* Label for the button that clears all verification errors in the 'group members' view. */ /* Label for the button that clears all verification errors in the 'group members' view. */
"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Mark All As Not Verified"; "GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Clear Verification For All";
/* Label for the 'reset all no-longer-verified group members' confirmation alert. */ /* Label for the 'reset all no-longer-verified group members' confirmation alert. */
"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE" = "This will mark all of the group members whose safety numbers have changed since they were last verified as not verified."; "GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE" = "This will clear the verification of all group members whose safety numbers have changed since they were last verified.";
/* Title for the 'members' section of the 'group members' view. */ /* Title for the 'members' section of the 'group members' view. */
"GROUP_MEMBERS_SECTION_TITLE_MEMBERS" = "Members"; "GROUP_MEMBERS_SECTION_TITLE_MEMBERS" = "Members";
@ -989,7 +989,7 @@
"PRIVACY_TAP_TO_SCAN" = "Tap to Scan"; "PRIVACY_TAP_TO_SCAN" = "Tap to Scan";
/* Button that lets user mark another user's identity as unverified. */ /* Button that lets user mark another user's identity as unverified. */
"PRIVACY_UNVERIFY_BUTTON" = "Mark as not Verified"; "PRIVACY_UNVERIFY_BUTTON" = "Clear Verification";
/* Alert body when verifying with {{contact name}} */ /* 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?"; "PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "This doesn't look like your safety number with %@. Are you verifying the correct contact?";

Loading…
Cancel
Save