Revert "Toast for no signature"

This reverts commit 291dfaa02e.
pull/208/head
M66B 3 years ago
parent a737083c9e
commit eb477f6245

@ -8104,10 +8104,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Log.i("PGP signature result=" + sresult); Log.i("PGP signature result=" + sresult);
if (sresult == RESULT_NO_SIGNATURE) { 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.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) { } else if (sresult == RESULT_VALID_KEY_CONFIRMED || sresult == RESULT_VALID_KEY_UNCONFIRMED) {
List<String> users = sigResult.getConfirmedUserIds(); List<String> users = sigResult.getConfirmedUserIds();
String text; String text;
@ -8158,15 +8156,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
protected void onExecuted(Bundle args, PendingIntent pi) { protected void onExecuted(Bundle args, PendingIntent pi) {
if (args.containsKey("sigresult")) { if (args.containsKey("sigresult")) {
String text = args.getString("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) Snackbar sb = Snackbar.make(view, text, Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
Helper.setSnackbarLines(sb, 7); Helper.setSnackbarLines(sb, 7);
sb.show(); sb.show();
} }
}
if (pi != null) if (pi != null)
try { try {

Loading…
Cancel
Save