Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Download executor

Browse Source
This commit is contained in:
M66B
2022-12-28 10:32:41 +01:00
parent fe42eba34d
commit c8fe17b296
5 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/eu/faircode/email/ContactInfo.java
View File

@@ -100,8 +100,6 @@ public class ContactInfo {
private static Map<String, Lookup> emailLookup = new ConcurrentHashMap<>();
private static final Map<String, ContactInfo> emailContactInfo = new HashMap<>();
private static final ExecutorService executor = Helper.getBackgroundExecutor(0, "contact");
private static final ExecutorService favicons = Helper.getBackgroundExecutor(0, "favicons");
private static final int GENERATED_ICON_SIZE = 48; // dp
private static final int FAVICON_ICON_SIZE = 64; // dp
@@ -377,7 +375,7 @@ public class ContactInfo {
List<Future<Favicon>> futures = new ArrayList<>();
if (bimi)
futures.add(executor.submit(new Callable<Favicon>() {
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
Pair<Bitmap, Boolean> bimi =
@@ -387,9 +385,9 @@ public class ContactInfo {
}));
if (gravatars)
futures.add(executor.submit(Avatar.getGravatar(email, scaleToPixels, context)));
futures.add(Helper.getDownloadTaskExecutor().submit(Avatar.getGravatar(email, scaleToPixels, context)));
if (libravatars)
futures.add(executor.submit(Avatar.getLibravatar(email, scaleToPixels, context)));
futures.add(Helper.getDownloadTaskExecutor().submit(Avatar.getLibravatar(email, scaleToPixels, context)));
if (favicons) {
String host = domain;
@@ -398,7 +396,7 @@ public class ContactInfo {
while (host.indexOf('.') > 0) {
final URL base = new URL("https://" + host);
futures.add(executor.submit(new Callable<Favicon>() {
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return parseFavicon(base, scaleToPixels, context);
@@ -416,7 +414,7 @@ public class ContactInfo {
final URL base = new URL("https://" + host);
for (String name : FIXED_FAVICONS)
futures.add(executor.submit(new Callable<Favicon>() {
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return getFavicon(new URL(base, name), null, scaleToPixels, context);
@@ -735,7 +733,6 @@ public class ContactInfo {
for (int i = 0; i < imgs.size(); i++)
Log.i("Favicon #" + getOrder(host, imgs.get(i)) + " " + i + "=" + imgs.get(i) + " @" + base);
List<Future<Pair<Favicon, URL>>> futures = new ArrayList<>();
for (Element img : imgs) {
String rel = img.attr("rel").trim().toLowerCase(Locale.ROOT);
if (REL_EXCLUDE.contains(rel)) // dns-prefetch: gmx.net
@@ -747,20 +744,11 @@ public class ContactInfo {
if (TextUtils.isEmpty(favicon))
continue;
final URL url = new URL(base, favicon);
futures.add(favicons.submit(new Callable<Pair<Favicon, URL>>() {
@Override
public Pair<Favicon, URL> call() throws Exception {
return new Pair(getFavicon(url, img.attr("type"), scaleToPixels, context), url);
}
}));
}
for (Future<Pair<Favicon, URL>> future : futures)
try {
Pair<Favicon, URL> result = future.get();
Log.i("Using favicon=" + result.second);
return result.first;
URL url = new URL(base, favicon);
Favicon f = getFavicon(url, img.attr("type"), scaleToPixels, context);
Log.i("Using favicon=" + url);
return f;
} catch (Throwable ex) {
if (ex.getCause() instanceof FileNotFoundException ||
ex.getCause() instanceof CertPathValidatorException)
@@ -768,6 +756,7 @@ public class ContactInfo {
else
Log.e(ex);
}
}
return null;
}