msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Finish and remove task"

Browse Source 
This reverts commit 00453147d2.
pull/194/merge
M66B 3 years ago
parent ebd2d24a6b
commit a4decf8215
8 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -129,6 +129,7 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -219,6 +220,7 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -244,6 +246,7 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -357,6 +360,7 @@
<!-- 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
Unescape 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">
@ -218,6 +219,7 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -243,6 +245,7 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -356,6 +359,7 @@
<!-- 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
Unescape 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">
@ -218,6 +219,7 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -243,6 +245,7 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -356,6 +359,7 @@
<!-- 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
Unescape View File

@ -218,6 +218,7 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -243,6 +244,7 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -356,6 +358,7 @@
<!-- 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
Unescape View File

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

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

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

2
app/src/main/java/eu/faircode/email/ActivitySearch.java
Unescape 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);
finishAndRemoveTask();
finish();
}
}

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

@ -129,6 +129,7 @@
<activity
android:name=".ActivityMain"
android:excludeFromRecents="true"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Translucent">
@ -219,6 +220,7 @@
<activity
android:name=".ActivitySearch"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_search"
@ -244,6 +246,7 @@
<activity
android:name=".ActivityAnswer"
android:enabled="false"
android:excludeFromRecents="true"
android:exported="true"
android:icon="@drawable/twotone_reply_24"
android:label="@string/app_answer"
@ -357,6 +360,7 @@
<!-- 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"

Write Preview
Loading…
Cancel
Save