Commit 471cc2e2 authored by Hussein's avatar Hussein

Merge branch 'bug/P4A-910' into develop

parents 2a19a0d3 0b4953ba
......@@ -2370,7 +2370,13 @@ public class MessageList extends PepActivity implements MessageListFragmentListe
@Override
public void goBack() {
if (Intent.ACTION_SEARCH.equals(getIntent().getAction())) {
if (mDisplayMode == DisplayMode.MESSAGE_VIEW && mMessageListWasDisplayed) {
if(!isThreadDisplayed) {
updateToolbarColorToOriginal();
}
showMessageList();
}
else if (Intent.ACTION_SEARCH.equals(getIntent().getAction())) {
if(isBackstackClear()) {
if (mAccount != null) {
Router.onOpenAccount(this, mAccount);
......@@ -2381,11 +2387,6 @@ public class MessageList extends PepActivity implements MessageListFragmentListe
finish();
}
} else if (mDisplayMode == DisplayMode.MESSAGE_VIEW && mMessageListWasDisplayed) {
if(!isThreadDisplayed) {
updateToolbarColorToOriginal();
}
showMessageList();
} else if (isThreadDisplayed) {
actionDisplaySearch(this, mSearch, false, false);
} else if (getIntent().getBooleanExtra(EXTRA_FOLDER, false)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment