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

Skip storing duplicate S/MIME key aliases

This commit is contained in:
M66B 2020-04-18 16:10:35 +02:00
parent 52cfc99355
commit 990d19de36
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4857,8 +4857,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return null;
List<EntityIdentity> duplicates = db.identity().getIdentities(identity.account, identity.email);
if (duplicates == null || duplicates.size() > 1)
if (duplicates != null && duplicates.size() > 1) {
args.putBoolean("duplicate", true);
return null;
}
return identity;
}
@ -5424,6 +5426,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
InputStream is = null;
X509Certificate result = null;
String alias = args.getString("alias");
boolean duplicate = args.getBoolean("duplicate");
if (EntityMessage.SMIME_SIGNONLY.equals(type)) {
// Get content/signature
@ -5745,7 +5748,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false);
if (alias != null && message.identity != null)
if (alias != null && !duplicate && message.identity != null)
db.identity().setIdentitySignKeyAlias(message.identity, alias);
db.setTransactionSuccessful();