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

Main: finishAndRemoveTask

This commit is contained in:
M66B 2022-01-26 22:35:17 +01:00
parent 32fe98d533
commit fc398fd05e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,6 @@
<activity <activity
android:name=".ActivityMain" android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent"> 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 @Override
protected void onExecuted(Bundle args, EntityMessage message) { protected void onExecuted(Bundle args, EntityMessage message) {
finish(); finishAndRemoveTask();
if (message == null) if (message == null)
return; return;
@ -139,7 +139,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
Log.e(ex); Log.e(ex);
// https://issuetracker.google.com/issues/181805603 // https://issuetracker.google.com/issues/181805603
finish(); finishAndRemoveTask();
startActivity(getIntent()); startActivity(getIntent());
return; return;
} }
@ -236,7 +236,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
long end = new Date().getTime(); long end = new Date().getTime();
Log.i("Main booted " + (end - start) + " ms"); Log.i("Main booted " + (end - start) + " ms");
finish(); finishAndRemoveTask();
} }
@Override @Override
@ -261,7 +261,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
@Override @Override
public void run() { public void run() {
try { try {
finish(); finishAndRemoveTask();
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.w(ex);
/* /*
@ -336,7 +336,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
public void onBackStackChanged() { public void onBackStackChanged() {
int count = getSupportFragmentManager().getBackStackEntryCount(); int count = getSupportFragmentManager().getBackStackEntryCount();
if (count == 0) if (count == 0)
finish(); finishAndRemoveTask();
} }
@Override @Override