From e28ddd4002c696315aea3e12562b80c70a8fe2e5 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 27 Mar 2021 12:11:58 +0100 Subject: [PATCH] Explicitly disable force dark --- app/src/fdroid/AndroidManifest.xml | 1 + app/src/github/AndroidManifest.xml | 1 + app/src/main/AndroidManifest.xml | 1 + app/src/main/java/eu/faircode/email/Helper.java | 4 ++-- app/src/play/AndroidManifest.xml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml index 170f1dbc98..0f84608bc8 100644 --- a/app/src/fdroid/AndroidManifest.xml +++ b/app/src/fdroid/AndroidManifest.xml @@ -101,6 +101,7 @@ android:name=".ApplicationEx" android:allowBackup="false" android:appCategory="productivity" + android:forceDarkAllowed="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index 170f1dbc98..0f84608bc8 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -101,6 +101,7 @@ android:name=".ApplicationEx" android:allowBackup="false" android:appCategory="productivity" + android:forceDarkAllowed="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 12851ed2c9..41dc7029d3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -101,6 +101,7 @@ android:name=".ApplicationEx" android:allowBackup="false" android:appCategory="productivity" + android:forceDarkAllowed="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 7eb5aa99b7..89e90b5a59 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -868,8 +868,8 @@ public class Helper { static boolean isNight(Context context) { // https://developer.android.com/guide/topics/ui/look-and-feel/darktheme#configuration_changes int uiMode = context.getResources().getConfiguration().uiMode; - Log.i("UI mode=" + uiMode); - return ((uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES); + Log.i("UI mode=" + Integer.toHexString(uiMode)); + return ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0); } static boolean isDarkTheme(Context context) { diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml index 6aaf7ac1db..4674a19ce4 100644 --- a/app/src/play/AndroidManifest.xml +++ b/app/src/play/AndroidManifest.xml @@ -101,6 +101,7 @@ android:name=".ApplicationEx" android:allowBackup="false" android:appCategory="productivity" + android:forceDarkAllowed="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config"