TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 07:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add correct contextual menu options on 'Send' button.

Browse Source 
[Send TextSecure message | Send unencrypted SMS | Send encrypted SMS]

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2014-06-11 15:31:59 -07:00
parent 7c9282f306
commit 68747142d6
13 changed files with 107 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/menu/conversation_button_context.xml
View File

@@ -1,5 +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__menu_send_unencrypted"
android:id="@+id/menu_context_send_unencrypted" />
</menu>

8
res/menu/conversation_button_context_insecure_push.xml Normal file
View File

@@ -0,0 +1,8 @@
<?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>

10
res/menu/conversation_button_context_secure_push.xml Normal file
View File

@@ -0,0 +1,10 @@
<?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_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>

8
res/menu/conversation_button_context_secure_sms.xml Normal file
View File

@@ -0,0 +1,8 @@
<?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>

5
res/values/strings.xml
View File

@@ -781,7 +781,9 @@
<string name="push_directory__menu_refresh">Refresh contact list</string>
<!-- conversation_button_context -->
<string name="conversation_button_context__menu_send_unencrypted">Send unencrypted</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_encrypted_sms">Send encrypted SMS</string>
<!-- conversation_callable -->
<string name="conversation_callable__menu_call">Call</string>
@@ -841,6 +843,7 @@
<!-- verify_keys -->
<string name="verify_keys__menu_verified">Verified</string>
<!-- EOF -->
</resources>