TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

s/Verify Recipient/Verify Identity/

Browse Source
This commit is contained in:
Sam Whited 2014-03-04 09:55:45 -05:00
parent a3e900ecbe
commit fa423e4432
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/conversation_secure_identity.xml
View File

@ -5,8 +5,8 @@
android:icon="?menu_lock_icon" android:icon="?menu_lock_icon"
android:showAsAction="ifRoom"> android:showAsAction="ifRoom">
<menu> <menu>
<item android:title="@string/conversation_secure_verified__menu_verify_recipient" <item android:title="@string/conversation_secure_verified__menu_verify_identity"
android:id="@+id/menu_verify_recipient"/> android:id="@+id/menu_verify_identity"/>
</menu> </menu>
</item> </item>
</menu> </menu>

2
res/values/strings.xml
View File

@ -753,7 +753,7 @@
<!-- conversation_secure_verified --> <!-- conversation_secure_verified -->
<string name="conversation_secure_verified__menu_security">Security</string> <string name="conversation_secure_verified__menu_security">Security</string>
<string name="conversation_secure_verified__menu_no_identity">No Identity Available</string> <string name="conversation_secure_verified__menu_no_identity">No Identity Available</string>
<string name="conversation_secure_verified__menu_verify_recipient">Verify Recipient</string> <string name="conversation_secure_verified__menu_verify_identity">Verify Identity</string>
<string name="conversation_secure_verified__menu_abort_secure_session">End Secure Session</string> <string name="conversation_secure_verified__menu_abort_secure_session">End Secure Session</string>
<!-- conversation --> <!-- conversation -->

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -310,7 +310,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
case R.id.menu_add_attachment: handleAddAttachment(); return true; case R.id.menu_add_attachment: handleAddAttachment(); return true;
case R.id.menu_start_secure_session: handleStartSecureSession(); 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_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_group_recipients: handleDisplayGroupRecipients(); return true;
case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true;
case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true;
@ -359,7 +359,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
finish(); finish();
} }
private void handleVerifyRecipient() { private void handleVerifyIdentity() {
Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class); Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class);
verifyIdentityIntent.putExtra("recipient", getRecipients().getPrimaryRecipient()); verifyIdentityIntent.putExtra("recipient", getRecipients().getPrimaryRecipient());
verifyIdentityIntent.putExtra("master_secret", masterSecret); verifyIdentityIntent.putExtra("master_secret", masterSecret);