Added signature failure result code, refactoring

pull/174/head
M66B 6 years ago
parent 7fbfdfd21e
commit 2ffbcd3500

@ -4813,8 +4813,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Log.w("PGP signature result missing"); Log.w("PGP signature result missing");
else else
Log.i("PGP signature result=" + sresult); Log.i("PGP signature result=" + sresult);
if (sresult == RESULT_NO_SIGNATURE) if (sresult == RESULT_NO_SIGNATURE)
Snackbar.make(view, R.string.title_signature_none, Snackbar.LENGTH_LONG).show(); args.putString("sigresult", context.getString(R.string.title_signature_none));
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;
@ -4827,11 +4828,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
text = getString(sresult == RESULT_VALID_KEY_UNCONFIRMED text = getString(sresult == RESULT_VALID_KEY_UNCONFIRMED
? R.string.title_signature_unconfirmed ? R.string.title_signature_unconfirmed
: R.string.title_signature_valid); : R.string.title_signature_valid);
Snackbar.make(view, text, Snackbar.LENGTH_LONG).show(); args.putString("sigresult", text);
} else if (sresult == RESULT_KEY_MISSING) } else if (sresult == RESULT_KEY_MISSING)
Snackbar.make(view, R.string.title_signature_key_missing, Snackbar.LENGTH_LONG).show(); args.putString("sigresult", context.getString(R.string.title_signature_key_missing));
else else {
Snackbar.make(view, R.string.title_signature_invalid, Snackbar.LENGTH_LONG).show(); String text = getString(R.string.title_signature_invalid_reason, Integer.toString(sresult));
args.putString("sigresult", text);
}
break; break;
@ -4859,6 +4862,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override @Override
protected void onExecuted(Bundle args, PendingIntent pi) { protected void onExecuted(Bundle args, PendingIntent pi) {
if (args.containsKey("sigresult")) {
String text = args.getString("sigresult");
Snackbar.make(view, text, Snackbar.LENGTH_LONG).show();
}
if (pi != null) if (pi != null)
try { try {
Log.i("Executing pi=" + pi); Log.i("Executing pi=" + pi);

Loading…
Cancel
Save