diff --git a/res/menu/conversation_secure_identity.xml b/res/menu/conversation_secure_identity.xml index 3b1c61c22..7d0ec143a 100644 --- a/res/menu/conversation_secure_identity.xml +++ b/res/menu/conversation_secure_identity.xml @@ -5,8 +5,8 @@ android:icon="?menu_lock_icon" android:showAsAction="ifRoom"> - + - \ No newline at end of file + diff --git a/res/values/strings.xml b/res/values/strings.xml index 9098ce86b..dc793a9c2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -753,7 +753,7 @@ Security No Identity Available - Verify Recipient + Verify Identity End Secure Session diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index ea497c222..0d265e6b9 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -310,7 +310,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi case R.id.menu_add_attachment: handleAddAttachment(); return true; case R.id.menu_start_secure_session: handleStartSecureSession(); return true; case R.id.menu_abort_session: handleAbortSecureSession(); return true; - case R.id.menu_verify_recipient: handleVerifyRecipient(); return true; + case R.id.menu_verify_identity: handleVerifyIdentity(); return true; case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true; @@ -359,7 +359,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi finish(); } - private void handleVerifyRecipient() { + private void handleVerifyIdentity() { Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class); verifyIdentityIntent.putExtra("recipient", getRecipients().getPrimaryRecipient()); verifyIdentityIntent.putExtra("master_secret", masterSecret);