From 7244858a2ceab1644319bf6a5c6918ea309070ab Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:45:58 +0200
Subject: [PATCH] Improved PIN handling

---
 app/src/main/java/eu/faircode/email/Helper.java | 2 ++
 app/src/main/res/layout/dialog_pin_ask.xml      | 2 +-
 2 files changed, 3 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 8ea5462e06..41970b9f88 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2986,12 +2986,14 @@ public class Helper {
                         if (wait > PIN_FAILURE_DELAY_MAX)
                             wait = PIN_FAILURE_DELAY_MAX;
                         long delay = pin_failure_at + wait - new Date().getTime();
+                        etPin.setHint(getDateTimeInstance(activity).format(pin_failure_at + wait));
                         Log.i("PIN wait=" + wait + " delay=" + delay);
                         dview.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 try {
                                     etPin.setCompoundDrawables(null, null, null, null);
+                                    etPin.setHint(R.string.title_advanced_pin);
                                     etPin.setEnabled(true);
                                     etPin.requestFocus();
                                     showKeyboard(etPin);
diff --git a/app/src/main/res/layout/dialog_pin_ask.xml b/app/src/main/res/layout/dialog_pin_ask.xml
index 71c048d132..f3276d0d0e 100644
--- a/app/src/main/res/layout/dialog_pin_ask.xml
+++ b/app/src/main/res/layout/dialog_pin_ask.xml
@@ -24,7 +24,7 @@
         android:layout_marginTop="24dp"
         android:drawableStart="@drawable/twotone_hourglass_top_24"
         android:drawablePadding="6dp"
-        android:hint="@string/title_advanced_pin"
+        android:drawableTint="?android:attr/textColorPrimaryNoDisable"
         android:imeOptions="actionDone"
         android:inputType="numberPassword"
         android:maxLines="1"