From 73957ec262bc1427edc9fdbb6e09f956b599f3ae Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 1 May 2022 20:34:37 +0200
Subject: [PATCH] Show last sync date / nav menu

---
 .../email/AdapterNavAccountFolder.java        | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
index 490540611d..f5ac958e57 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
@@ -46,6 +46,7 @@ import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -76,6 +77,7 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
 
     private NumberFormat NF = NumberFormat.getNumberInstance();
     private DateFormat TF;
+    private DateFormat DF;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
         private View view;
@@ -166,8 +168,19 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
             tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE);
 
             if (account.folderName == null) {
-                tvItemExtra.setText(account.last_connected == null ? null : TF.format(account.last_connected));
-                tvItemExtra.setVisibility(account.last_connected != null && expanded ? View.VISIBLE : View.GONE);
+                if (account.last_connected != null && expanded) {
+                    Calendar cal = Calendar.getInstance();
+                    cal.set(Calendar.HOUR_OF_DAY, 0);
+                    cal.set(Calendar.MINUTE, 0);
+                    cal.set(Calendar.SECOND, 0);
+                    cal.set(Calendar.MILLISECOND, 0);
+                    if (account.last_connected < cal.getTimeInMillis())
+                        tvItemExtra.setText(DF.format(account.last_connected));
+                    else
+                        tvItemExtra.setText(TF.format(account.last_connected));
+                    tvItemExtra.setVisibility(View.VISIBLE);
+                } else
+                    tvItemExtra.setVisibility(View.GONE);
             } else {
                 tvItemExtra.setText(NF.format(account.messages));
                 tvItemExtra.setVisibility(nav_count && expanded ? View.VISIBLE : View.GONE);
@@ -286,6 +299,9 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
         this.colorWarning = ColorUtils.setAlphaComponent(Helper.resolveColor(context, R.attr.colorWarning), 128);
 
         this.TF = Helper.getTimeInstance(context, SimpleDateFormat.SHORT);
+        this.DF = new SimpleDateFormat(
+                android.text.format.DateFormat.getBestDateTimePattern(Locale.getDefault(), "dd-MM"),
+                Locale.getDefault());
 
         setHasStableIds(false);
     }