From 76ce11aa765cbece98aead3628d313cef6c6b139 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Wed, 1 Apr 2020 19:44:51 +0200 Subject: [PATCH] Code dedup in ConversationListActivity by introducing refresh() method --- .../securesms/ConversationListActivity.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index dd5a8c8c0..5468e2d02 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -98,20 +98,19 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit initializeSearchListener(); TooltipCompat.setTooltipText(searchAction, getText(R.string.search_explain)); - if (isRelayingMessageContent(this)) { - title.setText(isForwarding(this) ? R.string.forward_to : R.string.chat_share_with_title); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - if (isDirectSharing(this)) { - openConversation(getDirectSharingChatId(this), -1); - } - } - handleOpenpgp4fpr(); + refresh(); } @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); setIntent(intent); + refresh(); + conversationListFragment.onNewIntent(); + invalidateOptionsMenu(); + } + + private void refresh() { if (isRelayingMessageContent(this)) { title.setText(isForwarding(this) ? R.string.forward_to : R.string.chat_share_with_title); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -122,8 +121,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit title.setText(R.string.app_name); getSupportActionBar().setDisplayHomeAsUpEnabled(false); } - conversationListFragment.onNewIntent(); - invalidateOptionsMenu(); handleOpenpgp4fpr(); }