From f4c4a9f67557d237d1741d686bd25575eb663ebe Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 1 Apr 2022 13:17:05 +0200 Subject: [PATCH] Changed launch mode of EML/DSN/AMP/DMARC viewers --- app/src/amazon/AndroidManifest.xml | 8 ++++---- app/src/fdroid/AndroidManifest.xml | 8 ++++---- app/src/github/AndroidManifest.xml | 8 ++++---- app/src/main/AndroidManifest.xml | 8 ++++---- app/src/main/java/eu/faircode/email/Helper.java | 8 -------- app/src/play/AndroidManifest.xml | 8 ++++---- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml index bd38fbeefb..f7c83b3e0a 100644 --- a/app/src/amazon/AndroidManifest.xml +++ b/app/src/amazon/AndroidManifest.xml @@ -310,7 +310,7 @@ android:name=".ActivityEML" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -344,7 +344,7 @@ android:name=".ActivityDSN" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -364,7 +364,7 @@ android:name=".ActivityAMP" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -383,7 +383,7 @@ android:enabled="false" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml index d379e49c09..49c23705e5 100644 --- a/app/src/fdroid/AndroidManifest.xml +++ b/app/src/fdroid/AndroidManifest.xml @@ -309,7 +309,7 @@ android:name=".ActivityEML" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -343,7 +343,7 @@ android:name=".ActivityDSN" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -363,7 +363,7 @@ android:name=".ActivityAMP" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -382,7 +382,7 @@ android:enabled="true" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index d379e49c09..49c23705e5 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -309,7 +309,7 @@ android:name=".ActivityEML" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -343,7 +343,7 @@ android:name=".ActivityDSN" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -363,7 +363,7 @@ android:name=".ActivityAMP" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -382,7 +382,7 @@ android:enabled="true" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index caef361bd9..7fd1b79f95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -309,7 +309,7 @@ android:name=".ActivityEML" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -343,7 +343,7 @@ android:name=".ActivityDSN" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -363,7 +363,7 @@ android:name=".ActivityAMP" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -381,7 +381,7 @@ android:name=".ActivityDmarc" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 1baa23a596..e297dd814b 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -690,14 +690,6 @@ public class Helper { intent.setDataAndTypeAndNormalize(uri, type); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - if (!("message/rfc822".equals(type) || - "message/delivery-status".equals(type) || - "message/disposition-notification".equals(type) || - "text/rfc822-headers".equals(type) || - "text/x-amp-html".equals(type) || - "text/xml".equals(type) /* DMARC */)) - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - if (!TextUtils.isEmpty(name)) intent.putExtra(Intent.EXTRA_TITLE, Helper.sanitizeFilename(name)); Log.i("Intent=" + intent + " type=" + type); diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml index e6a4e4cb2f..f2ef361c35 100644 --- a/app/src/play/AndroidManifest.xml +++ b/app/src/play/AndroidManifest.xml @@ -310,7 +310,7 @@ android:name=".ActivityEML" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -344,7 +344,7 @@ android:name=".ActivityDSN" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -364,7 +364,7 @@ android:name=".ActivityAMP" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance"> @@ -383,7 +383,7 @@ android:enabled="false" android:exported="true" android:icon="@mipmap/ic_launcher" - android:launchMode="singleTask"> + android:launchMode="singleInstance">