From 94f9eafb322a1b1e62d039076f2348516357ac40 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 9 Apr 2022 19:59:07 +0200 Subject: [PATCH] Gravatar/Libravatar connect/read timeout --- .../main/java/eu/faircode/email/ContactInfo.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java index 2f300d2580..11acabd87d 100644 --- a/app/src/main/java/eu/faircode/email/ContactInfo.java +++ b/app/src/main/java/eu/faircode/email/ContactInfo.java @@ -110,7 +110,10 @@ public class ContactInfo { private static final int GENERATED_ICON_SIZE = 48; // dp private static final int FAVICON_ICON_SIZE = 64; // dp - private static final int GRAVATAR_TIMEOUT = 5 * 1000; // milliseconds + private static final int GRAVATAR_CONNECT_TIMEOUT = 5 * 1000; // milliseconds + private static final int GRAVATAR_READ_TIMEOUT = 10 * 1000; // milliseconds + private static final int LIBRAVATAR_CONNECT_TIMEOUT = 5 * 1000; // milliseconds + private static final int LIBRAVATAR_READ_TIMEOUT = 10 * 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 long CACHE_CONTACT_DURATION = 2 * 60 * 1000L; // milliseconds @@ -391,8 +394,8 @@ public class ContactInfo { HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); urlConnection.setRequestMethod("GET"); - urlConnection.setReadTimeout(GRAVATAR_TIMEOUT); - urlConnection.setConnectTimeout(GRAVATAR_TIMEOUT); + urlConnection.setReadTimeout(GRAVATAR_READ_TIMEOUT); + urlConnection.setConnectTimeout(GRAVATAR_CONNECT_TIMEOUT); urlConnection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context)); urlConnection.connect(); @@ -434,8 +437,8 @@ public class ContactInfo { HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); urlConnection.setRequestMethod("GET"); - urlConnection.setReadTimeout(GRAVATAR_TIMEOUT); - urlConnection.setConnectTimeout(GRAVATAR_TIMEOUT); + urlConnection.setReadTimeout(LIBRAVATAR_READ_TIMEOUT); + urlConnection.setConnectTimeout(LIBRAVATAR_CONNECT_TIMEOUT); urlConnection.setRequestProperty("User-Agent", WebViewEx.getUserAgent(context)); urlConnection.connect();