From 8e486f0e4f2332d512dca07b34074f854fe7a824 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 11 Mar 2024 13:27:12 +0100
Subject: [PATCH] Show sender/subject when permanently deleting one message

---
 .../main/java/eu/faircode/email/EntityMessage.java   | 11 +++++++++++
 .../java/eu/faircode/email/FragmentMessages.java     | 12 ++++++++++++
 .../main/java/eu/faircode/email/TupleMessageEx.java  | 11 -----------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 23dc891587..7ed18073c9 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -360,6 +360,17 @@ public class EntityMessage implements Serializable {
         return recipients;
     }
 
+    String getRemark() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(MessageHelper.formatAddresses(from));
+        if (!TextUtils.isEmpty(subject)) {
+            if (sb.length() > 0)
+                sb.append('\n');
+            sb.append(subject);
+        }
+        return sb.toString();
+    }
+
     boolean hasKeyword(@NonNull String value) {
         // https://tools.ietf.org/html/rfc5788
         if (keywords == null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c70c138ed3..6be8bd0169 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4700,6 +4700,11 @@ public class FragmentMessages extends FragmentBase
                                 ids.add(threaded.id);
                     }
 
+                    if (ids.size() == 1) {
+                        EntityMessage message = db.message().getMessage(ids.get(0));
+                        args.putString("remark", message == null ? null : message.getRemark());
+                    }
+
                     db.setTransactionSuccessful();
                 } finally {
                     db.endTransaction();
@@ -4713,6 +4718,7 @@ public class FragmentMessages extends FragmentBase
                 Bundle aargs = new Bundle();
                 aargs.putString("question", getResources()
                         .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size()));
+                aargs.putString("remark", args.getString("remark"));
                 aargs.putString("accept", getString(R.string.title_ask_delete_accept));
                 aargs.putInt("faq", 160);
                 aargs.putLongArray("ids", Helper.toLongArray(ids));
@@ -5052,6 +5058,11 @@ public class FragmentMessages extends FragmentBase
                             result.add(threaded.id);
                     }
 
+                    if (result.size() == 1) {
+                        EntityMessage message = db.message().getMessage(result.get(0));
+                        args.putString("remark", message == null ? null : message.getRemark());
+                    }
+
                     db.setTransactionSuccessful();
                 } finally {
                     db.endTransaction();
@@ -5072,6 +5083,7 @@ public class FragmentMessages extends FragmentBase
                 } else {
                     aargs.putString("question", getResources()
                             .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size()));
+                    aargs.putString("remark", args.getString("remark"));
                     aargs.putString("accept", getString(R.string.title_ask_delete_accept));
                 }
                 aargs.putInt("faq", 160);
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index a788c9647e..859e21e080 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -126,17 +126,6 @@ public class TupleMessageEx extends EntityMessage {
         this.keyword_titles = titles.toArray(new String[0]);
     }
 
-    String getRemark() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(MessageHelper.formatAddresses(from));
-        if (!TextUtils.isEmpty(subject)) {
-            if (sb.length() > 0)
-                sb.append('\n');
-            sb.append(subject);
-        }
-        return sb.toString();
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof TupleMessageEx) {