Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 05:44:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Navigate to unified messages

Browse Source
This commit is contained in:
M66B
2022-11-06 21:32:40 +01:00
parent dc47faf66e
commit 7461994310
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -2144,8 +2144,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
private void onViewMessages(Intent intent) {
boolean unified = intent.getBooleanExtra("unified", false);
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack("messages", FragmentManager.POP_BACK_STACK_INCLUSIVE);
if (unified && "unified".equals(startup)) {
getSupportFragmentManager().popBackStack("unified", 0);
return;
} else
getSupportFragmentManager().popBackStack("messages", FragmentManager.POP_BACK_STACK_INCLUSIVE);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean foldernav = prefs.getBoolean("foldernav", false);
@@ -2167,7 +2172,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragment.setArguments(args);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("messages");
fragmentTransaction.replace(R.id.content_frame, fragment)
.addToBackStack(unified ? "unified" : "messages");
fragmentTransaction.commit();
}