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

Finish and remove task

This commit is contained in:
M66B 2022-01-27 21:13:33 +01:00
parent 39d326ccd9
commit 00453147d2
8 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/amazon/AndroidManifest.xml
View File

@ -129,7 +129,6 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -220,7 +219,6 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -246,7 +244,6 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -360,7 +357,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access -->
<activity
android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

4
app/src/fdroid/AndroidManifest.xml
View File

@ -128,7 +128,6 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -219,7 +218,6 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -245,7 +243,6 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -359,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access -->
<activity
android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

4
app/src/github/AndroidManifest.xml
View File

@ -128,7 +128,6 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -219,7 +218,6 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -245,7 +243,6 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -359,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access -->
<activity
android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

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

@ -218,7 +218,6 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -244,7 +243,6 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -358,7 +356,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access -->
<activity
android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

4
app/src/main/java/eu/faircode/email/ActivityAnswer.java
View File

@ -49,7 +49,7 @@ public class ActivityAnswer extends ActivityBase {
Intent intent = getIntent();
if (intent == null) {
finish();
finishAndRemoveTask();
return;
}
@ -96,7 +96,7 @@ public class ActivityAnswer extends ActivityBase {
setResult(RESULT_OK, result);
}
finish();
finishAndRemoveTask();
}
});

2
app/src/main/java/eu/faircode/email/ActivityRationale.java
View File

@ -29,6 +29,6 @@ public class ActivityRationale extends ActivityBase {
// https://developer.android.com/training/permissions/explaining-access
Helper.viewFAQ(this, 1);
finish();
finishAndRemoveTask();
}
}

2
app/src/main/java/eu/faircode/email/ActivitySearch.java
View File

@ -50,6 +50,6 @@ public class ActivitySearch extends ActivityBase {
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(view);
finish();
finishAndRemoveTask();
}
}

4
app/src/play/AndroidManifest.xml
View File

@ -129,7 +129,6 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -220,7 +219,6 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -246,7 +244,6 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -360,7 +357,6 @@
<!-- https://developer.android.com/training/permissions/explaining-access -->
<activity
android:name=".ActivityRationale"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"