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

Prioritize hires favicon

This commit is contained in:
M66B 2020-07-01 09:59:48 +02:00
parent c5b2d0c258
commit 674d60243a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,8 +306,10 @@ public class ContactInfo {
info.bitmap = BitmapFactory.decodeFile(file.getAbsolutePath());
else {
URL base = new URL("https://" + domain);
URL www = new URL("https://www." + domain);
try {
info.bitmap = getFavicon(new URL(base, "favicon.ico"));
info.bitmap = parseFavicon(base);
} catch (IOException ex) {
if (ex instanceof SocketTimeoutException)
throw ex;
@ -316,14 +318,22 @@ public class ContactInfo {
if (info.bitmap == null)
try {
info.bitmap = parseFavicon(base);
info.bitmap = parseFavicon(www);
} catch (IOException ex) {
if (ex instanceof SocketTimeoutException)
throw ex;
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
}
if (info.bitmap == null)
try {
info.bitmap = getFavicon(new URL(base, "favicon.ico"));
} catch (IOException ex) {
if (ex instanceof SocketTimeoutException)
throw ex;
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
}
URL www = new URL("https://www." + domain);
if (info.bitmap == null)
try {
info.bitmap = getFavicon(new URL(www, "favicon.ico"));
@ -332,8 +342,6 @@ public class ContactInfo {
throw ex;
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
}
if (info.bitmap == null)
info.bitmap = parseFavicon(www);
// Add to cache
if (info.bitmap == null)