From 9287b0031765ea33353fe885a4898c060ebb21d5 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Tue, 3 Oct 2017 16:27:12 -0700 Subject: [PATCH] Make conversation settings menu item work Fixes #7023 // FREEBIE --- .../securesms/ConversationActivity.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 6c022e2a29..69a2cbebae 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -613,7 +613,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } private void handleConversationSettings() { - titleView.performClick(); + Intent intent = new Intent(ConversationActivity.this, RecipientPreferenceActivity.class); + intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); + intent.putExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA, + isSecureText && !isSelfConversation()); + + startActivitySceneTransition(intent, titleView.findViewById(R.id.contact_photo_image), "avatar"); } private void handleUnmuteNotifications() { @@ -1200,15 +1205,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } }); - titleView.setOnClickListener(v -> { - Intent intent = new Intent(ConversationActivity.this, RecipientPreferenceActivity.class); - intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); - intent.putExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA, - isSecureText && !isSelfConversation()); - - startActivitySceneTransition(intent, titleView.findViewById(R.id.contact_photo_image), "avatar"); - }); - + titleView.setOnClickListener(v -> handleConversationSettings()); titleView.setOnBackClickedListener(view -> onBackPressed()); unblockButton.setOnClickListener(v -> handleUnblock()); makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());