From 4c64edcb0ac57a6fc484e2614ca87ca43c2c4857 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 17 Apr 2021 12:22:27 +0200
Subject: [PATCH] Always unhide on move

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java  | 2 --
 app/src/main/java/eu/faircode/email/Core.java            | 1 -
 app/src/main/java/eu/faircode/email/EntityOperation.java | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e4688c754f..efdc8c4c7c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4530,8 +4530,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         db.message().setMessageSnoozed(message.id, hide ? Long.MAX_VALUE : null);
                         db.message().setMessageUiIgnored(message.id, true);
-                        if (!hide)
-                            db.message().setMessageUiHide(message.id, false);
                         EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null);
 
                         db.setTransactionSuccessful();
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 350ff3ff15..a9b69f9420 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3453,7 +3453,6 @@ class Core {
             }
 
             if (message.ui_hide &&
-                    message.ui_snoozed == null &&
                     (message.ui_busy == null || message.ui_busy < new Date().getTime()) &&
                     db.operation().getOperationCount(folder.id, message.id) == 0 &&
                     db.operation().getOperationCount(folder.id, EntityOperation.PURGE) == 0) {
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 6ff7a5b066..99b9626f8a 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -292,8 +292,7 @@ public class EntityOperation {
                         message.ui_flagged = false;
                         message.color = null;
                     }
-                    if (message.ui_snoozed == null)
-                        message.ui_hide = false;
+                    message.ui_hide = false;
                     message.ui_browsed = false;
                     message.error = null;
                     message.id = db.message().insertMessage(message);