From 213004bef6c2abc5b0020c82ed3efe3dcb88e6ee Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:34:26 +0100
Subject: [PATCH] Bounded contact info thread pools

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 +++++-
 app/src/main/java/eu/faircode/email/ContactInfo.java    | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b4f411ce2e..6f9a042655 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -317,8 +317,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private DateFormat TF;
     private DateFormat DTF;
 
+    private static final int processors =
+            Runtime.getRuntime().availableProcessors();
     private static final ExecutorService executor =
             Helper.getBackgroundExecutor(2, "differ");
+    private static final ExecutorService executorContactInfo =
+            Helper.getBackgroundExecutor(Math.max(1, processors / 2), "contact");
 
     private static final int MAX_RECIPIENTS_COMPACT = 3;
     private static final int MAX_RECIPIENTS_NORMAL = 7;
@@ -1486,7 +1490,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     protected void onException(Bundle args, Throwable ex) {
                         Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
-                }.setLog(false);
+                }.setLog(false).setExecutor((executorContactInfo));
                 taskContactInfo.execute(context, owner, aargs, "message:avatar");
             } else
                 bindContactInfo(message, info, addresses);
diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index ce28f29691..7387b90c40 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -100,11 +100,12 @@ public class ContactInfo {
     private static Map<String, Lookup> emailLookup = new ConcurrentHashMap<>();
     private static final Map<String, ContactInfo> emailContactInfo = new HashMap<>();
 
+    private static final int processors =
+            Runtime.getRuntime().availableProcessors();
     private static final ExecutorService executorLookup =
             Helper.getBackgroundExecutor(1, "contact");
-
     private static final ExecutorService executorFavicon =
-            Helper.getBackgroundExecutor(0, "favicon");
+            Helper.getBackgroundExecutor(Math.max(1, processors / 2), "favicon");
 
     private static final int GENERATED_ICON_SIZE = 96; // dp
     private static final int FAVICON_ICON_SIZE = 64; // dp