mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Suppress "no signature" if signature is embedded

This commit is contained in:
M66B 2021-11-30 15:56:34 +01:00
parent a8eb149cfa
commit 090b94199e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -7114,6 +7114,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR); int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
switch (resultCode) { switch (resultCode) {
case OpenPgpApi.RESULT_CODE_SUCCESS: case OpenPgpApi.RESULT_CODE_SUCCESS:
Integer encrypt = null;
if (out != null) if (out != null)
if (inline) { if (inline) {
try { try {
@ -7203,7 +7204,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
checkPep(message, remotes, context); checkPep(message, remotes, context);
db.message().setMessageEncrypt(message.id, parts.getEncryption()); encrypt = parts.getEncryption();
db.message().setMessageEncrypt(message.id, encrypt);
db.message().setMessageStored(message.id, new Date().getTime()); db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false); db.message().setMessageFts(message.id, false);
@ -7232,9 +7234,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else else
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))
args.putString("sigresult", context.getString(R.string.title_signature_none)); 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;
if (users.size() > 0) if (users.size() > 0)