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

Favicon improvements/fixes

This commit is contained in:
M66B 2020-06-30 14:29:50 +02:00
parent 57cf22b119
commit bb5c5c7de8
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ public class ContactInfo {
private static final int GRAVATAR_TIMEOUT = 5 * 1000; // milliseconds private static final int GRAVATAR_TIMEOUT = 5 * 1000; // milliseconds
private static final int FAVICON_CONNECT_TIMEOUT = 5 * 1000; // milliseconds private static final int FAVICON_CONNECT_TIMEOUT = 5 * 1000; // milliseconds
private static final int FAVICON_READ_TIMEOUT = 10 * 1000; // milliseconds private static final int FAVICON_READ_TIMEOUT = 10 * 1000; // milliseconds
private static final int FAVICON_READ_BYTES = 2048;
private static final long CACHE_CONTACT_DURATION = 2 * 60 * 1000L; // milliseconds private static final long CACHE_CONTACT_DURATION = 2 * 60 * 1000L; // milliseconds
private static final long CACHE_GRAVATAR_DURATION = 2 * 60 * 60 * 1000L; // milliseconds private static final long CACHE_GRAVATAR_DURATION = 2 * 60 * 60 * 1000L; // milliseconds
@ -288,7 +289,7 @@ public class ContactInfo {
String domain = (at < 0 ? null : info.email.substring(at + 1).toLowerCase(Locale.ROOT)); String domain = (at < 0 ? null : info.email.substring(at + 1).toLowerCase(Locale.ROOT));
if (domain != null) { if (domain != null) {
if ("gmail.com".equals(domain)) if ("gmail.com".equals(domain) || "googlemail.com".equals(domain))
domain = "google.com"; domain = "google.com";
File dir = new File(context.getCacheDir(), "favicons"); File dir = new File(context.getCacheDir(), "favicons");
@ -308,30 +309,36 @@ public class ContactInfo {
try { try {
info.bitmap = getFavicon(new URL(base, "favicon.ico")); info.bitmap = getFavicon(new URL(base, "favicon.ico"));
} catch (IOException ex) { } catch (IOException ex) {
if (isTransient(ex)) if (ex instanceof SocketTimeoutException)
throw ex;
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
}
try {
info.bitmap = parseFavicon(base);
} catch (IOException ex) {
if (isTransient(ex))
throw ex; throw ex;
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage()); Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
} }
if (info.bitmap == null)
try {
info.bitmap = parseFavicon(base);
} 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); URL www = new URL("https://www." + domain);
try { if (info.bitmap == null)
info.bitmap = getFavicon(new URL(www, "favicon.ico")); try {
} catch (IOException ex) { info.bitmap = getFavicon(new URL(www, "favicon.ico"));
if (isTransient(ex)) } catch (IOException ex) {
throw ex; if (ex instanceof SocketTimeoutException)
Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage()); throw ex;
} Log.i("Favicon ex=" + ex.getClass().getName() + " " + ex.getMessage());
info.bitmap = parseFavicon(www); }
if (info.bitmap == null)
info.bitmap = parseFavicon(www);
// Add to cache // Add to cache
if (info.bitmap != null) if (info.bitmap == null)
throw new FileNotFoundException("decode");
else
try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) { try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
info.bitmap.compress(Bitmap.CompressFormat.PNG, 90, os); info.bitmap.compress(Bitmap.CompressFormat.PNG, 90, os);
} }
@ -397,8 +404,11 @@ public class ContactInfo {
String response; String response;
try { try {
// TODO limit read byte[] buffer = new byte[FAVICON_READ_BYTES];
response = Helper.readStream(connection.getInputStream(), StandardCharsets.UTF_8.name()); int len = connection.getInputStream().read(buffer);
if (len < 0)
throw new IOException("length");
response = new String(buffer, 0, len, StandardCharsets.UTF_8.name());
} finally { } finally {
connection.disconnect(); connection.disconnect();
} }
@ -439,14 +449,11 @@ public class ContactInfo {
} }
} }
private static boolean isTransient(Throwable ex) {
return (ex instanceof UnknownHostException ||
ex instanceof SocketTimeoutException);
}
private static boolean isRecoverable(Throwable ex) { private static boolean isRecoverable(Throwable ex) {
return !(ex instanceof SocketTimeoutException || return !(ex instanceof ConnectException ||
ex instanceof ConnectException || (ex instanceof UnknownHostException &&
ex.getMessage() != null &&
ex.getMessage().contains("No address associated with hostname")) ||
ex instanceof FileNotFoundException || ex instanceof FileNotFoundException ||
ex instanceof SSLPeerUnverifiedException || ex instanceof SSLPeerUnverifiedException ||
(ex instanceof SSLException && (ex instanceof SSLException &&