From 7f4d3e6a3fa6b591783393841e1e72f5c1d294d0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:01:09 +0100
Subject: [PATCH] Enable tabular unread background for new installations

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java        | 2 +-
 app/src/main/java/eu/faircode/email/ApplicationEx.java         | 3 +++
 .../main/java/eu/faircode/email/FragmentOptionsDisplay.java    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index fc6804c418..217e0ad5ce 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -8041,7 +8041,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.shadow_unread = prefs.getBoolean("shadow_unread", false);
         this.shadow_border = prefs.getBoolean("shadow_border", true);
         this.shadow_highlight = prefs.getBoolean("shadow_highlight", false);
-        this.tabular_unread_bg = prefs.getBoolean("tabular_unread_bg", false);
+        this.tabular_unread_bg = prefs.getBoolean("tabular_unread_bg", true);
         this.threading = prefs.getBoolean("threading", true);
         this.threading_unread = threading && prefs.getBoolean("threading_unread", false);
         this.indentation = prefs.getBoolean("indentation", false);
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index c9cc4cf14e..248f00bb97 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -851,6 +851,9 @@ public class ApplicationEx extends Application
             // https://support.google.com/faqs/answer/6346016
             if (!prefs.contains("cert_strict"))
                 editor.putBoolean("cert_strict", !BuildConfig.PLAY_STORE_RELEASE);
+        } else if (version < 2162) {
+            if (!BuildConfig.DEBUG)
+                editor.putBoolean("tabular_unread_bg", false);
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 639620d1ad..d4a2d1a44b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -1552,7 +1552,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             swShadowHighlight.setEnabled(swShadow.isEnabled() && swShadow.isChecked());
             swTabularDividers.setChecked(prefs.getBoolean("dividers", true));
             swTabularDividers.setEnabled(!swCards.isChecked());
-            swTabularUnreadBg.setChecked(prefs.getBoolean("tabular_unread_bg", false));
+            swTabularUnreadBg.setChecked(prefs.getBoolean("tabular_unread_bg", true));
             swTabularUnreadBg.setEnabled(!swCards.isChecked());
             swPortrait2.setChecked(prefs.getBoolean("portrait2", false));
             swPortrait2c.setChecked(prefs.getBoolean("portrait2c", false) && !swPortrait2.isChecked());