From a0a6ae26812cddf41bbb98d97ecc814656f1b4cd Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 4 Jan 2022 13:13:08 +0100 Subject: [PATCH] Simplification --- app/src/main/java/eu/faircode/email/EntityOperation.java | 7 ++++--- app/src/main/java/eu/faircode/email/EntityRule.java | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 4ebe100685..6512c2d1c5 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -406,9 +406,10 @@ public class EntityOperation { } else if (DELETE.equals(name)) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean perform_expunge = prefs.getBoolean("perform_expunge", true); - if (perform_expunge) - db.message().setMessageUiHide(message.id, true); - else { + if (perform_expunge) { + message.ui_hide = true; + db.message().setMessageUiHide(message.id, message.ui_hide); + } else { message.ui_deleted = !message.ui_deleted; db.message().setMessageUiDeleted(message.id, message.ui_deleted); } diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java index e9a97bc4f8..f947d9df38 100644 --- a/app/src/main/java/eu/faircode/email/EntityRule.java +++ b/app/src/main/java/eu/faircode/email/EntityRule.java @@ -943,8 +943,6 @@ public class EntityRule { private boolean onActionDelete(Context context, EntityMessage message, JSONObject jargs) { EntityOperation.queue(context, message, EntityOperation.DELETE); - message.ui_hide = true; - return true; }