TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-06 15:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "conversation settings" menu option in conversation activity.

Browse Source 
Closes #3399
Fixes #3399
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-07-08 12:22:51 -07:00
parent ed8f617c81
commit 69e1252f7f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/menu/conversation.xml
View File

@ -10,4 +10,7 @@
<item android:title="@string/conversation__menu_delete_thread" <item android:title="@string/conversation__menu_delete_thread"
android:id="@+id/menu_delete_thread" /> android:id="@+id/menu_delete_thread" />
<item android:title="@string/conversation__menu_conversation_settings"
android:id="@+id/menu_conversation_settings"/>
</menu> </menu>

1
res/values/strings.xml
View File

@ -926,6 +926,7 @@
<string name="conversation__menu_leave_group">Leave group</string> <string name="conversation__menu_leave_group">Leave group</string>
<string name="conversation__menu_delete_thread">Delete thread</string> <string name="conversation__menu_delete_thread">Delete thread</string>
<string name="conversation__menu_view_media">All images</string> <string name="conversation__menu_view_media">All images</string>
<string name="conversation__menu_conversation_settings">Conversation settings</string>
<!-- conversation_popup --> <!-- conversation_popup -->
<string name="conversation_popup__menu_expand_popup">Expand popup</string> <string name="conversation_popup__menu_expand_popup">Expand popup</string>

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

@ -355,6 +355,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
case R.id.menu_invite: handleInviteLink(); return true; case R.id.menu_invite: handleInviteLink(); return true;
case R.id.menu_mute_notifications: handleMuteNotifications(); return true; case R.id.menu_mute_notifications: handleMuteNotifications(); return true;
case R.id.menu_unmute_notifications: handleUnmuteNotifications(); return true; case R.id.menu_unmute_notifications: handleUnmuteNotifications(); return true;
case R.id.menu_conversation_settings: handleConversationSettings(); return true;
case android.R.id.home: handleReturnToConversationList(); return true; case android.R.id.home: handleReturnToConversationList(); return true;
} }
@ -403,6 +404,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}); });
} }
private void handleConversationSettings() {
titleView.performClick();
}
private void handleUnmuteNotifications() { private void handleUnmuteNotifications() {
recipients.setMuted(0); recipients.setMuted(0);