Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved favicon scanner

Browse Source
This commit is contained in:
M66B
2022-08-12 17:48:20 +02:00
parent 45ef761b5d
commit 137edb1874
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,6 +117,13 @@ public class ContactInfo {
private static final long CACHE_FAVICON_DURATION = 2 * 7 * 24 * 60 * 60 * 1000L; // milliseconds
private static final float MIN_FAVICON_LUMINANCE = 0.2f;
// https://realfavicongenerator.net/faq
private static final String[] FIXED_FAVICONS = new String[]{
"apple-touch-icon.png", // 57x57
"apple-touch-icon-precomposed.png", // 57x57
"favicon.ico"
};
// https://css-tricks.com/prefetching-preloading-prebrowsing/
// https://developer.mozilla.org/en-US/docs/Web/Performance/dns-prefetch
private static final List<String> REL_EXCLUDE = Collections.unmodifiableList(Arrays.asList(
@@ -390,9 +397,10 @@ public class ContactInfo {
if (favicons) {
String host = domain;
if (!host.startsWith("www."))
host = "www." + host;
while (host.indexOf('.') > 0) {
final URL base = new URL("https://" + host);
final URL www = new URL("https://www." + host);
futures.add(executorFavicon.submit(new Callable<Favicon>() {
@Override
@@ -401,35 +409,23 @@ public class ContactInfo {
}
}));
futures.add(executorFavicon.submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return parseFavicon(www, scaleToPixels, context);
}
}));
int dot = host.indexOf('.');
host = host.substring(dot + 1);
}
host = domain;
if (!host.startsWith("www."))
host = "www." + host;
while (host.indexOf('.') > 0) {
final URL base = new URL("https://" + host);
final URL www = new URL("https://www." + host);
futures.add(executorFavicon.submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return getFavicon(new URL(base, "favicon.ico"), null, scaleToPixels, context);
}
}));
futures.add(executorFavicon.submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return getFavicon(new URL(www, "favicon.ico"), null, scaleToPixels, context);
}
}));
for (String name : FIXED_FAVICONS)
futures.add(executorFavicon.submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return getFavicon(new URL(base, name), null, scaleToPixels, context);
}
}));
int dot = host.indexOf('.');
host = host.substring(dot + 1);