From 2ac4e0fa0fc4a9d74370b605ff2f0aaedec59683 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Jun 2021 08:47:26 +0200
Subject: [PATCH] Added UI mode to debug info

---
 .../main/java/eu/faircode/email/Helper.java    |  2 +-
 app/src/main/java/eu/faircode/email/Log.java   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 2ff66cac5a..8ae5c31902 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1014,7 +1014,7 @@ 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=" + Integer.toHexString(uiMode));
+        Log.i("UI mode=0x" + Integer.toHexString(uiMode));
         return ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 8266da70b2..13fb8fe32f 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -24,6 +24,7 @@ import android.app.ApplicationExitInfo;
 import android.app.Dialog;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.UiModeManager;
 import android.app.usage.UsageStatsManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -1684,6 +1685,23 @@ public class Log {
                 size.x / density, size.y / density,
                 context.getResources().getConfiguration().isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_NORMAL)));
 
+        int uiMode = context.getResources().getConfiguration().uiMode;
+        sb.append(String.format("UI mode: 0x"))
+                .append(Integer.toHexString(uiMode))
+                .append(" night")
+                .append(" no=").append((uiMode & Configuration.UI_MODE_NIGHT_NO) != 0)
+                .append(" yes=").append((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
+                .append("\r\n");
+
+        UiModeManager uim = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
+        int nightMode = uim.getNightMode();
+        sb.append(String.format("Night mode: 0x"))
+                .append(Integer.toHexString(nightMode))
+                .append(" no=").append((nightMode & UiModeManager.MODE_NIGHT_NO) != 0)
+                .append(" yes=").append((nightMode & UiModeManager.MODE_NIGHT_YES) != 0)
+                .append(" custom=").append((nightMode & UiModeManager.MODE_NIGHT_CUSTOM) != 0)
+                .append("\r\n");
+
         try {
             int maxKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength("AES");
             sb.append(context.getString(R.string.title_advanced_aes_key_size, maxKeySize)).append("\r\n");