From 8f64b0c72dc3874f3764e397fcb6a1ae1917e077 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 3 Mar 2021 19:24:02 +0100
Subject: [PATCH] Show sender/subject on permanent delete

---
 .../main/java/eu/faircode/email/AdapterMessage.java   |  2 ++
 .../main/java/eu/faircode/email/FragmentMessages.java |  1 +
 .../main/java/eu/faircode/email/TupleMessageEx.java   | 11 +++++++++++
 3 files changed, 14 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 15298d0bf9..36368adc5f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4041,6 +4041,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void onActionDelete(TupleMessageEx message) {
             Bundle aargs = new Bundle();
             aargs.putString("question", context.getString(R.string.title_ask_delete));
+            aargs.putString("remark", message.getRemark());
             aargs.putLong("id", message.id);
             aargs.putBoolean("warning", true);
 
@@ -4559,6 +4560,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void onMenuDelete(final TupleMessageEx message) {
             Bundle aargs = new Bundle();
             aargs.putString("question", context.getString(R.string.title_ask_delete));
+            aargs.putString("remark", message.getRemark());
             aargs.putLong("id", message.id);
             aargs.putBoolean("warning", true);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6cd3a2e490..1715640c97 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2267,6 +2267,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         private void onSwipeDelete(@NonNull TupleMessageEx message) {
             Bundle args = new Bundle();
             args.putString("question", getString(R.string.title_ask_delete));
+            args.putString("remark", message.getRemark());
             args.putLong("id", message.id);
             args.putBoolean("warning", true);
 
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index 5aab5364d9..96c2fd9817 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -22,6 +22,7 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.text.TextUtils;
 
 import androidx.preference.PreferenceManager;
 import androidx.room.Ignore;
@@ -88,6 +89,16 @@ public class TupleMessageEx extends EntityMessage {
         this.keyword_colors = color.toArray(new Integer[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) {