From 4f9b2a17bc163ca6ec4fb91a4f4b85a79d197dd3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Mar 2021 19:41:11 +0100
Subject: [PATCH] Fixed blinking text

---
 app/src/main/java/eu/faircode/email/EntityRule.java      | 8 +++++++-
 app/src/main/java/eu/faircode/email/ViewTextDelayed.java | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index d13635c036..81f6786201 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -542,11 +542,16 @@ public class EntityRule {
         }
 
         Address[] from = new InternetAddress[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())};
+        EntityLog.log(context, "Answer loop check" +
+                " identity=" + MessageHelper.formatAddresses(from));
 
         // Prevent loop
         List<EntityMessage> messages = db.message().getMessagesByThread(
                 message.account, message.thread, null, message.folder);
-        for (EntityMessage threaded : messages)
+        for (EntityMessage threaded : messages) {
+            EntityLog.log(context, "Answer loop check" +
+                    " message=" + MessageHelper.formatAddresses(threaded.from) +
+                    " self=" + (threaded.id.equals(message.id)));
             if (!threaded.id.equals(message.id) &&
                     MessageHelper.equal(threaded.from, from)) {
                 EntityLog.log(context, "Answer loop" +
@@ -554,6 +559,7 @@ public class EntityRule {
                         " from=" + MessageHelper.formatAddresses(from));
                 return;
             }
+        }
 
         EntityMessage reply = new EntityMessage();
         reply.account = message.account;
diff --git a/app/src/main/java/eu/faircode/email/ViewTextDelayed.java b/app/src/main/java/eu/faircode/email/ViewTextDelayed.java
index 4ea59f1618..749a7c817a 100644
--- a/app/src/main/java/eu/faircode/email/ViewTextDelayed.java
+++ b/app/src/main/java/eu/faircode/email/ViewTextDelayed.java
@@ -49,7 +49,7 @@ public class ViewTextDelayed extends AppCompatTextView {
         this.visibility = visibility;
 
         if (visibility == VISIBLE) {
-            if (delaying)
+            if (delaying || super.getVisibility() == VISIBLE)
                 return;
             delaying = true;
             super.setVisibility(INVISIBLE);