From 69e1252f7fe8a77955b142303ef40433a6738db3 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 8 Jul 2015 12:22:51 -0700
Subject: [PATCH] Add "conversation settings" menu option in conversation
 activity.

Closes #3399
Fixes #3399
// FREEBIE
---
 res/menu/conversation.xml                                | 3 +++
 res/values/strings.xml                                   | 1 +
 src/org/thoughtcrime/securesms/ConversationActivity.java | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index 0c369f39d7..d57a0beaf5 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -10,4 +10,7 @@
     <item android:title="@string/conversation__menu_delete_thread"
           android:id="@+id/menu_delete_thread" />
 
+    <item android:title="@string/conversation__menu_conversation_settings"
+          android:id="@+id/menu_conversation_settings"/>
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2ba3199955..4363536aa1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -926,6 +926,7 @@
     <string name="conversation__menu_leave_group">Leave group</string>
     <string name="conversation__menu_delete_thread">Delete thread</string>
     <string name="conversation__menu_view_media">All images</string>
+    <string name="conversation__menu_conversation_settings">Conversation settings</string>
 
     <!-- conversation_popup -->
     <string name="conversation_popup__menu_expand_popup">Expand popup</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index a6c5a18571..121af277b4 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -355,6 +355,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case R.id.menu_invite:                    handleInviteLink();                                return true;
     case R.id.menu_mute_notifications:        handleMuteNotifications();                         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;
     }
 
@@ -403,6 +404,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     });
   }
 
+  private void handleConversationSettings() {
+    titleView.performClick();
+  }
+
   private void handleUnmuteNotifications() {
     recipients.setMuted(0);