mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-26 07:53:12 +00:00
Code Issues Releases Wiki Activity

Show why signature was not valid, if possible

Browse source
This commit is contained in:
M66B 2020-01-29 16:09:33 +01:00
parent 273c058f4c
commit 0bcc57f36d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -4850,6 +4850,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
} catch (CMSException ex) { } catch (CMSException ex) {
Log.w(ex); Log.w(ex);
args.putString("reason", ex.getMessage());
} }
} }
if (result != null) if (result != null)
@ -4984,9 +4985,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
boolean valid = args.getBoolean("valid"); boolean valid = args.getBoolean("valid");
final ArrayList<String> trace = args.getStringArrayList("trace"); final ArrayList<String> trace = args.getStringArrayList("trace");
if (cert == null) if (cert == null) {
Snackbar.make(view, R.string.title_signature_invalid, Snackbar.LENGTH_LONG).show(); String message;
else String reason = args.getString("reason");
if (TextUtils.isEmpty(reason))
message = getString(R.string.title_signature_invalid);
else
message = getString(R.string.title_signature_invalid_reason, reason);
Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();
} else
try { try {
EntityCertificate record = EntityCertificate.from(cert, null); EntityCertificate record = EntityCertificate.from(cert, null);

1
app/src/main/res/values/strings.xml
View file

@ -789,6 +789,7 @@
<string name="title_signature_valid">Message signature valid</string> <string name="title_signature_valid">Message signature valid</string>
<string name="title_signature_unconfirmed">Message signature valid but not confirmed</string> <string name="title_signature_unconfirmed">Message signature valid but not confirmed</string>
<string name="title_signature_invalid">Message signature invalid</string> <string name="title_signature_invalid">Message signature invalid</string>
<string name="title_signature_invalid_reason">Message signature invalid: %1$s</string>
<string name="title_signature_certificate_invalid">Certificate chain invalid</string> <string name="title_signature_certificate_invalid">Certificate chain invalid</string>
<string name="title_signature_sender">Sender\'s address</string> <string name="title_signature_sender">Sender\'s address</string>
<string name="title_signature_email">Signature\'s address</string> <string name="title_signature_email">Signature\'s address</string>