Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-04 16:16:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optional favicon white background

Browse Source
This commit is contained in:
M66B
2022-02-18 13:40:32 +01:00
parent 4708d86204
commit b95225fc2e
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,6 +115,7 @@ public class ContactInfo {
private static final int FAVICON_READ_TIMEOUT = 10 * 1000; // milliseconds
private static final long CACHE_CONTACT_DURATION = 2 * 60 * 1000L; // milliseconds
private static final long CACHE_FAVICON_DURATION = 2 * 7 * 24 * 60 * 60 * 1000L; // milliseconds
private static final float MIN_FAVICON_LUMINANCE = 0.2f;
// https://css-tricks.com/prefetching-preloading-prebrowsing/
// https://developer.mozilla.org/en-US/docs/Web/Performance/dns-prefetch
@@ -447,6 +448,19 @@ public class ContactInfo {
try {
Favicon favicon = future.get();
if (favicon != null) {
float lum = ImageHelper.getLuminance(favicon.bitmap);
if (lum < MIN_FAVICON_LUMINANCE) {
Bitmap bitmap = Bitmap.createBitmap(
favicon.bitmap.getWidth(),
favicon.bitmap.getHeight(),
favicon.bitmap.getConfig());
bitmap.eraseColor(Color.WHITE);
Canvas canvas = new Canvas(bitmap);
canvas.drawBitmap(favicon.bitmap, 0, 0, null);
favicon.bitmap.recycle();
favicon.bitmap = bitmap;
}
info.bitmap = favicon.bitmap;
info.type = favicon.type;
info.verified = favicon.verified;
@@ -777,14 +791,7 @@ public class ContactInfo {
Bitmap bitmap = ImageHelper.getScaledBitmap(connection.getInputStream(), url.toString(), mimeType, scaleToPixels);
if (bitmap == null)
throw new FileNotFoundException("decodeStream");
else {
Bitmap favicon = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig());
favicon.eraseColor(Color.WHITE);
Canvas canvas = new Canvas(favicon);
canvas.drawBitmap(bitmap, 0, 0, null);
bitmap.recycle();
return new Favicon(favicon);
}
return new Favicon(bitmap);
} finally {
connection.disconnect();
}