mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Main: finishAndRemoveTask" 

This reverts commit fc398fd05e.
This commit is contained in:
M66B 2022-01-28 10:38:49 +01:00
parent a4decf8215
commit 0ee761d47b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -128,6 +128,7 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">

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

@ -101,7 +101,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
@Override
protected void onExecuted(Bundle args, EntityMessage message) {
finishAndRemoveTask();
finish();
if (message == null)
return;
@ -139,7 +139,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
} catch (RuntimeException ex) {
Log.e(ex);
// https://issuetracker.google.com/issues/181805603
finishAndRemoveTask();
finish();
startActivity(getIntent());
return;
}
@ -236,7 +236,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
long end = new Date().getTime();
Log.i("Main booted " + (end - start) + " ms");
finishAndRemoveTask();
finish();
}
@Override
@ -261,7 +261,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
@Override
public void run() {
try {
finishAndRemoveTask();
finish();
} catch (Throwable ex) {
Log.w(ex);
/*
@ -336,7 +336,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
public void onBackStackChanged() {
int count = getSupportFragmentManager().getBackStackEntryCount();
if (count == 0)
finishAndRemoveTask();
finish();
}
@Override