TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #381 from meskio/add_contact

Browse Source 
New 'add contact info' option on the conversation contextual menu
This commit is contained in:
Moxie Marlinspike
2013-10-20 16:58:58 -07:00
parent 2c2a03e5e2 3d690faff0
commit 891e3aeb97
4 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/conversation.xml
View File

@@ -5,6 +5,10 @@
android:id="@+id/menu_add_attachment"
android:icon="@drawable/ic_menu_attach" />
<item android:title="@string/conversation__menu_add_contact_info"
android:id="@+id/menu_add_contact_info"
android:icon="@drawable/ic_contact_picture" />
<item android:title="@string/conversation__menu_delete_thread"
android:id="@+id/menu_delete_thread"
android:icon="@android:drawable/ic_menu_delete" />

2
res/values/strings.xml
View File

@@ -54,6 +54,7 @@
<string name="ConversationActivity_delete_thread_confirmation">Delete Thread Confirmation</string>
<string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Are you sure that you want to permanently delete this conversation?</string>
<string name="ConversationActivity_add_attachment">Add attachment</string>
<string name="ConversationActivity_select_contact_info">Select contact info</string>
<string name="ConversationActivity_compose_message">Compose Message</string>
<string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, there was an error setting your attachment.</string>
<string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sorry, the selected video exceeds message size restrictions.</string>
@@ -524,6 +525,7 @@
<!-- conversation -->
<string name="conversation__menu_add_attachment">Add attachment</string>
<string name="conversation__menu_add_contact_info">Add contact info</string>
<string name="conversation__menu_delete_thread">Delete thread</string>
<!-- conversation_group_options -->