TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 21:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct contextual send language.

Browse Source 
1) Use "secure" and "insecure" vs "encrypted" and "unencrypted.

2) Use MMS instead of SMS where appropriate.

Fixes #1602
This commit is contained in:
Moxie Marlinspike 2014-06-13 15:23:44 -07:00
parent a54d20f3ef
commit ba1055df8e
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/menu/conversation_button_context_secure_push.xml → res/menu/conversation_button_context.xml
View File

@ -3,8 +3,13 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/conversation_button_context__send_textsecure_message" <item android:title="@string/conversation_button_context__send_textsecure_message"
android:id="@+id/menu_context_send_push" /> android:id="@+id/menu_context_send_push" />
<item android:title="@string/conversation_button_context__send_encrypted_sms" <item android:title="@string/conversation_button_context__send_secure_sms"
android:id="@+id/menu_context_send_encrypted_sms" /> android:id="@+id/menu_context_send_encrypted_sms" />
<item android:title="@string/conversation_button_context__send_unencrypted_sms" <item android:title="@string/conversation_button_context__send_insecure_sms"
android:id="@+id/menu_context_send_unencrypted_sms" /> android:id="@+id/menu_context_send_unencrypted_sms" />
<item android:title="@string/conversation_button_context__send_secure_mms"
android:id="@+id/menu_context_send_encrypted_mms" />
<item android:title="@string/conversation_button_context__send_insecure_mms"
android:id="@+id/menu_context_send_unencrypted_mms" />
</menu> </menu>

8
res/menu/conversation_button_context_insecure_push.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/conversation_button_context__send_textsecure_message"
android:id="@+id/menu_context_send_push" />
<item android:title="@string/conversation_button_context__send_unencrypted_sms"
android:id="@+id/menu_context_send_unencrypted_sms" />
</menu>

8
res/menu/conversation_button_context_secure_sms.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/conversation_button_context__send_encrypted_sms"
android:id="@+id/menu_context_send_encrypted_sms" />
<item android:title="@string/conversation_button_context__send_unencrypted_sms"
android:id="@+id/menu_context_send_unencrypted_sms" />
</menu>

6
res/values/strings.xml
View File

@ -787,8 +787,10 @@
<!-- conversation_button_context --> <!-- conversation_button_context -->
<string name="conversation_button_context__send_textsecure_message">Send TextSecure message</string> <string name="conversation_button_context__send_textsecure_message">Send TextSecure message</string>
<string name="conversation_button_context__send_unencrypted_sms">Send unencrypted SMS</string> <string name="conversation_button_context__send_secure_sms">Send secure SMS</string>
<string name="conversation_button_context__send_encrypted_sms">Send encrypted SMS</string> <string name="conversation_button_context__send_insecure_sms">Send insecure SMS</string>
<string name="conversation_button_context__send_secure_mms">Send secure MMS</string>
<string name="conversation_button_context__send_insecure_mms">Send insecure MMS</string>
<!-- conversation_callable --> <!-- conversation_callable -->
<string name="conversation_callable__menu_call">Call</string> <string name="conversation_callable__menu_call">Call</string>

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

@ -322,14 +322,24 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
Recipient primaryRecipient = getRecipients() == null ? null : getRecipients().getPrimaryRecipient(); Recipient primaryRecipient = getRecipients() == null ? null : getRecipients().getPrimaryRecipient();
boolean hasSession = Session.hasSession(this, masterSecret, primaryRecipient); boolean hasSession = Session.hasSession(this, masterSecret, primaryRecipient);
int context; getMenuInflater().inflate(R.menu.conversation_button_context, menu);
if (isPushDestination && hasSession) context = R.menu.conversation_button_context_secure_push; if (attachmentManager.isAttachmentPresent()) {
else if (isPushDestination) context = R.menu.conversation_button_context_insecure_push; menu.removeItem(R.id.menu_context_send_encrypted_sms);
else if (hasSession) context = R.menu.conversation_button_context_secure_sms; menu.removeItem(R.id.menu_context_send_unencrypted_sms);
else return; } else {
menu.removeItem(R.id.menu_context_send_encrypted_mms);
menu.removeItem(R.id.menu_context_send_unencrypted_mms);
}
getMenuInflater().inflate(context, menu); if (!isPushDestination) {
menu.removeItem(R.id.menu_context_send_push);
}
if (!hasSession) {
menu.removeItem(R.id.menu_context_send_encrypted_mms);
menu.removeItem(R.id.menu_context_send_encrypted_sms);
}
} }
} }
@ -337,7 +347,9 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
public boolean onContextItemSelected(android.view.MenuItem item) { public boolean onContextItemSelected(android.view.MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_context_send_push: sendMessage(false, false); return true; case R.id.menu_context_send_push: sendMessage(false, false); return true;
case R.id.menu_context_send_encrypted_mms:
case R.id.menu_context_send_encrypted_sms: sendMessage(false, true); return true; case R.id.menu_context_send_encrypted_sms: sendMessage(false, true); return true;
case R.id.menu_context_send_unencrypted_mms:
case R.id.menu_context_send_unencrypted_sms: sendMessage(true, true); return true; case R.id.menu_context_send_unencrypted_sms: sendMessage(true, true); return true;
} }