From eb477f6245f8216b77e090bb006904a3834a41e5 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 Jun 2022 17:28:33 +0200 Subject: [PATCH] Revert "Toast for no signature" This reverts commit 291dfaa02eb6fe673a1d307ecc87bd7534eb56ef. --- .../java/eu/faircode/email/FragmentMessages.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 645bbfc2ea..357dc1ec30 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -8104,10 +8104,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. Log.i("PGP signature result=" + sresult); if (sresult == RESULT_NO_SIGNATURE) { - if (!EntityAttachment.PGP_SIGNATURE.equals(encrypt)) { + if (!EntityAttachment.PGP_SIGNATURE.equals(encrypt)) args.putString("sigresult", context.getString(R.string.title_signature_none)); - args.putBoolean("sigtoast", true); - } } else if (sresult == RESULT_VALID_KEY_CONFIRMED || sresult == RESULT_VALID_KEY_UNCONFIRMED) { List users = sigResult.getConfirmedUserIds(); String text; @@ -8158,14 +8156,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. protected void onExecuted(Bundle args, PendingIntent pi) { if (args.containsKey("sigresult")) { String text = args.getString("sigresult"); - if (args.getBoolean("sigtoast")) - ToastEx.makeText(getContext(), text, Toast.LENGTH_LONG).show(); - else { - Snackbar sb = Snackbar.make(view, text, Snackbar.LENGTH_LONG) - .setGestureInsetBottomIgnored(true); - Helper.setSnackbarLines(sb, 7); - sb.show(); - } + Snackbar sb = Snackbar.make(view, text, Snackbar.LENGTH_LONG) + .setGestureInsetBottomIgnored(true); + Helper.setSnackbarLines(sb, 7); + sb.show(); } if (pi != null)