From 4989d646bee31ce9aa465dea460259d9d5ec8515 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 11 Feb 2022 12:56:07 +0100
Subject: [PATCH] Revert "Bounded contact info thread pools"

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2d972f8304..fe6feb4cba 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -311,12 +311,8 @@ 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 +1482,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     protected void onException(Bundle args, Throwable ex) {
                         Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
-                }.setLog(false).setExecutor((executorContactInfo));
+                }.setLog(false);
                 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 7387b90c40..ce28f29691 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -100,12 +100,11 @@ 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(Math.max(1, processors / 2), "favicon");
+            Helper.getBackgroundExecutor(0, "favicon");
 
     private static final int GENERATED_ICON_SIZE = 96; // dp
     private static final int FAVICON_ICON_SIZE = 64; // dp