Cache synchronizing identities

This commit is contained in:
M66B
2021-04-25 12:59:11 +02:00
parent 344d826325
commit c1f104b3ed
3 changed files with 21 additions and 18 deletions

View File

@@ -94,7 +94,6 @@ public class ContactInfo {
private static Map<String, Lookup> emailLookup = new ConcurrentHashMap<>();
private static final Map<String, ContactInfo> emailContactInfo = new HashMap<>();
private static final Map<String, Avatar> emailGravatar = new HashMap<>();
private static final Map<Long, List<EntityIdentity>> accountIdentities = new HashMap<>();
private static final ExecutorService executorLookup =
Helper.getBackgroundExecutor(1, "contact");
@@ -194,12 +193,6 @@ public class ContactInfo {
});
}
static void clearIdentities() {
synchronized (accountIdentities) {
accountIdentities.clear();
}
}
@NonNull
static ContactInfo[] get(Context context, long account, String folderType, Address[] addresses) {
return get(context, account, folderType, addresses, false);
@@ -757,14 +750,7 @@ public class ContactInfo {
// Check if from self
if (type == EntityContact.TYPE_FROM) {
if (message.from != null) {
List<EntityIdentity> identities;
synchronized (accountIdentities) {
if (!accountIdentities.containsKey(folder.account))
accountIdentities.put(folder.account,
db.identity().getSynchronizingIdentities(folder.account));
identities = accountIdentities.get(folder.account);
}
List<EntityIdentity> identities = Core.getIdentities(folder.account, context);
if (identities != null) {
for (Address sender : message.from) {
for (EntityIdentity identity : identities)