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

Support install link

Browse Source 
Closes #2001
Fixes #1722
This commit is contained in:
Moxie Marlinspike
2014-12-12 18:31:20 -08:00
parent 642334da1f
commit 426c56c77d
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/menu/conversation_insecure.xml
View File

@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="Security"
android:id="@+id/menu_security"
android:icon="?menu_unlock_icon"
app:showAsAction="ifRoom">
<menu>
<item android:title="@string/conversation_insecure__menu_start_secure_session"
android:id="@+id/menu_start_secure_session" />
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="Invite"
android:id="@+id/menu_invite"/>
</menu>
</item>
</menu>

13
res/menu/conversation_insecure_no_push.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="Security"
android:id="@+id/menu_security"
android:icon="?menu_unlock_icon"
app:showAsAction="ifRoom">
<menu>
<item android:title="@string/conversation_insecure__menu_start_secure_session"
android:id="@+id/menu_start_secure_session" />
</menu>
</item>
</menu>

4
res/values/strings.xml
View File

@@ -109,6 +109,8 @@
<string name="ConversationActivity_transport_secure_sms">Secure SMS</string>
<string name="ConversationActivity_transport_secure_mms">Secure MMS</string>
<string name="ConversationActivity_transport_textsecure">TextSecure</string>
<string name="ConversationActivity_get_with_it">Get with it: %s</string>
<string name="ConversationActivity_install_textsecure">Install TextSecure: %s</string>
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
@@ -750,7 +752,7 @@
<!-- conversation_context_image -->
<string name="conversation_context_image__save_attachment">Save attachment</string>
<!-- conversation_insecure -->
<!-- conversation_insecure_no_push -->
<string name="conversation_insecure__menu_start_secure_session">Start secure session</string>
<!-- conversation_list_batch -->