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

Debug favicons

This commit is contained in:
M66B 2022-02-17 08:45:51 +01:00
parent 92f60636d0
commit 50687d5da9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,7 +666,7 @@ public class ContactInfo {
for (int i = 0; i < imgs.size(); i++)
Log.i("Favicon " + i + "=" + imgs.get(i) + " @" + base);
List<Future<Favicon>> futures = new ArrayList<>();
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
@ -679,17 +679,19 @@ public class ContactInfo {
continue;
final URL url = new URL(base, favicon);
futures.add(executorFavicon.submit(new Callable<Favicon>() {
futures.add(executorFavicon.submit(new Callable<Pair<Favicon, URL>>() {
@Override
public Favicon call() throws Exception {
return getFavicon(url, img.attr("type"), scaleToPixels, context);
public Pair<Favicon, URL> call() throws Exception {
return new Pair(getFavicon(url, img.attr("type"), scaleToPixels, context), url);
}
}));
}
for (Future<Favicon> future : futures)
for (Future<Pair<Favicon, URL>> future : futures)
try {
return future.get();
Pair<Favicon, URL> result = future.get();
Log.i("Using favicon=" + result.second);
return result.first;
} catch (Throwable ex) {
if (ex.getCause() instanceof FileNotFoundException ||
ex.getCause() instanceof CertPathValidatorException)