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

Favicon improvements

This commit is contained in:
M66B 2023-03-11 09:36:21 +01:00
parent 27d613810b
commit 0496bdb167
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,11 +419,8 @@ 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);
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
@ -431,16 +428,23 @@ public class ContactInfo {
}
}));
if (!host.startsWith("www.")) {
final URL www = new URL("https://www." + host);
futures.add(Helper.getDownloadTaskExecutor().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);
for (String name : FIXED_FAVICONS)
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
@ -449,6 +453,17 @@ public class ContactInfo {
}
}));
if (!host.startsWith("www.")) {
final URL www = new URL("https://www." + host);
for (String name : FIXED_FAVICONS)
futures.add(Helper.getDownloadTaskExecutor().submit(new Callable<Favicon>() {
@Override
public Favicon call() throws Exception {
return getFavicon(new URL(www, name), null, scaleToPixels, context);
}
}));
}
int dot = host.indexOf('.');
host = host.substring(dot + 1);
}
@ -906,6 +921,8 @@ public class ContactInfo {
Bitmap bitmap = ImageHelper.getScaledBitmap(connection.getInputStream(), url.toString(), mimeType, scaleToPixels);
if (bitmap == null)
throw new FileNotFoundException("decodeStream");
if (bitmap.getWidth() <= 1 || bitmap.getHeight() <= 1)
throw new IOException("Too small");
return new Favicon(bitmap, url.toString());
} finally {
connection.disconnect();