Explicitly disable force dark

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"

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"

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"

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);
+        Log.i("UI mode=" + Integer.toHexString(uiMode));
-        return ((uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES);
+        return ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0);
     }
 
     static boolean isDarkTheme(Context context) {

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"