Code dedup in ConversationListActivity by introducing refresh() method

This commit is contained in:
Hocuri
2020-04-01 19:44:51 +02:00
parent 676d0bcd15
commit 76ce11aa76
@@ -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();
}