From 20179505262c43d1571a3dd959d80a263ef709a4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 7 Jan 2023 12:25:34 +0100
Subject: [PATCH] Show time when using fixed date header

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b021b06035..dd456b3e31 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -260,7 +260,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private float textSize;
 
     private boolean date;
-    private boolean week;
+    private boolean date_week;
+    private boolean date_fixed;
     private boolean cards;
     private boolean shadow_unread;
     private boolean shadow_border;
@@ -1409,7 +1410,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     message.totalSize != null && ("size".equals(sort) || "attachments".equals(sort))
                             ? View.VISIBLE : View.GONE);
             SpannableStringBuilder time = new SpannableStringBuilderEx(
-                    (date && !week) && FragmentMessages.SORT_DATE_HEADER.contains(sort)
+                    ((date || date_fixed) && !date_week) && FragmentMessages.SORT_DATE_HEADER.contains(sort)
                             ? TF.format(message.received)
                             : Helper.getRelativeTimeSpanString(context, message.received));
             if (show_recent && message.recent)
@@ -7328,7 +7329,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         boolean generated = prefs.getBoolean("generated_icons", true);
 
         this.date = prefs.getBoolean("date", true);
-        this.week = prefs.getBoolean("date_week", false);
+        this.date_week = prefs.getBoolean("date_week", false);
+        this.date_fixed = (!date && prefs.getBoolean("date_fixed", false));
         this.cards = prefs.getBoolean("cards", true);
         this.shadow_unread = prefs.getBoolean("shadow_unread", false);
         this.shadow_border = prefs.getBoolean("shadow_border", true);