From b0be9f3e194ead956bced3d5ad271e273a96f9f5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 20 Dec 2024 07:10:48 +0100
Subject: [PATCH] Added long click signature info

---
 .../java/eu/faircode/email/AdapterMessage.java   | 16 +++++++++++-----
 .../java/eu/faircode/email/FragmentMessages.java |  5 ++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b70d906f58..7f5cd6b86b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1105,6 +1105,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibAmp.setOnClickListener(this);
                 ibDecrypt.setOnClickListener(this);
                 ibVerify.setOnClickListener(this);
+                ibVerify.setOnLongClickListener(this);
                 ibUndo.setOnClickListener(this);
                 ibAnswer.setOnClickListener(this);
                 ibRule.setOnClickListener(this);
@@ -1230,6 +1231,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibAmp.setOnClickListener(null);
                 ibDecrypt.setOnClickListener(null);
                 ibVerify.setOnClickListener(null);
+                ibVerify.setOnLongClickListener(null);
                 ibUndo.setOnClickListener(null);
                 ibAnswer.setOnClickListener(null);
                 ibRule.setOnClickListener(null);
@@ -3574,12 +3576,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             (EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
                                     EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt))) {
                         properties.setValue("auto_decrypted", message.id, true);
-                        onActionVerifyDecrypt(message, true);
+                        onActionVerifyDecrypt(message, true, false);
                     } else if (auto_verify && !auto_verified && !message.verified &&
                             (EntityMessage.PGP_SIGNONLY.equals(message.encrypt) ||
                                     EntityMessage.SMIME_SIGNONLY.equals(message.encrypt))) {
                         properties.setValue("auto_verified", message.id, true);
-                        onActionVerifyDecrypt(message, true);
+                        onActionVerifyDecrypt(message, true, false);
                     }
                 }
 
@@ -4598,9 +4600,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         properties.setExpanded(message, false, false);
                         properties.setHeight(message.id, null);
                     } else
-                        onActionVerifyDecrypt(message, false);
+                        onActionVerifyDecrypt(message, false, false);
                 } else if (id == R.id.ibVerify) {
-                    onActionVerifyDecrypt(message, false);
+                    onActionVerifyDecrypt(message, false, false);
                 } else if (id == R.id.ibUndo) {
                     ActivityCompose.undoSend(message.id, context, owner, parentFragment.getParentFragmentManager());
                 } else if (id == R.id.ibAnswer) {
@@ -4896,6 +4898,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 popupMenu.show();
                 return true;
+            } else if (id == R.id.ibVerify) {
+                onActionVerifyDecrypt(message, false, true);
+                return true;
             } else if (id == R.id.ibMove) {
                 if (message.folderReadOnly)
                     return false;
@@ -6112,7 +6117,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
         }
 
-        private void onActionVerifyDecrypt(TupleMessageEx message, boolean auto) {
+        private void onActionVerifyDecrypt(TupleMessageEx message, boolean auto, boolean info) {
             boolean inline = properties.getValue("inline_encrypted", message.id);
             int encrypt = (message.encrypt == null || inline ? EntityMessage.PGP_SIGNENCRYPT /* Inline */ : message.encrypt);
 
@@ -6121,6 +6126,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     new Intent(FragmentMessages.ACTION_VERIFYDECRYPT)
                             .putExtra("id", message.id)
                             .putExtra("auto", auto)
+                            .putExtra("info", info)
                             .putExtra("type", encrypt));
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 253951d4eb..8c63a9b6a4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -9323,12 +9323,14 @@ public class FragmentMessages extends FragmentBase
     private void onVerifyDecrypt(Intent intent) {
         long id = intent.getLongExtra("id", -1);
         boolean auto = intent.getBooleanExtra("auto", false);
+        boolean info = intent.getBooleanExtra("info", false);
         int type = intent.getIntExtra("type", EntityMessage.ENCRYPT_NONE);
 
         final Bundle args = new Bundle();
         args.putLong("id", id);
         args.putInt("type", type);
         args.putBoolean("auto", auto);
+        args.putBoolean("info", info);
 
         if (EntityMessage.SMIME_SIGNONLY.equals(type))
             onSmime(args);
@@ -10398,6 +10400,7 @@ public class FragmentMessages extends FragmentBase
                     } else
                         try {
                             boolean auto = args.getBoolean("auto");
+                            boolean info = args.getBoolean("info");
                             String sender = args.getString("sender");
                             Date time = (Date) args.getSerializable("time");
                             boolean known = args.getBoolean("known");
@@ -10418,7 +10421,7 @@ public class FragmentMessages extends FragmentBase
                                     break;
                                 }
 
-                            if (known && !record.isExpired(time) && match && valid)
+                            if (!info && known && !record.isExpired(time) && match && valid)
                                 Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_signature_valid, Snackbar.LENGTH_LONG))
                                         .show();
                             else if (!auto) {