Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Link image download timeout to connection timeout

Browse Source
This commit is contained in:
M66B
2021-02-22 10:27:16 +01:00
parent 3f6b1be23d
commit 941cdbc393
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ImageHelper.java
View File

@@ -82,7 +82,7 @@ class ImageHelper {
private static final ExecutorService executor_n =
Helper.getBackgroundExecutor(0, "image_n");
private static final int DOWNLOAD_TIMEOUT = 15 * 1000; // milliseconds
static final int DOWNLOAD_TIMEOUT = 15; // seconds
private static final int MAX_REDIRECTS = 5; // https://www.freesoft.org/CIE/RFC/1945/46.htm
private static final int MAX_PROBE = 64 * 1024; // bytes
private static final int SLOW_CONNECTION = 2 * 1024; // Kbps
@@ -601,6 +601,9 @@ class ImageHelper {
Resources res = context.getResources();
DisplayMetrics dm = res.getDisplayMetrics();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int timeout = prefs.getInt("timeout", ImageHelper.DOWNLOAD_TIMEOUT) * 1000;
Bitmap bm;
HttpURLConnection urlConnection = null;
try {
@@ -616,8 +619,8 @@ class ImageHelper {
urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setRequestMethod("GET");
urlConnection.setDoOutput(false);
urlConnection.setReadTimeout(DOWNLOAD_TIMEOUT);
urlConnection.setConnectTimeout(DOWNLOAD_TIMEOUT);
urlConnection.setReadTimeout(timeout);
urlConnection.setConnectTimeout(timeout);
urlConnection.setInstanceFollowRedirects(true);
if (BuildConfig.DEBUG)
urlConnection.setRequestProperty("User-Agent", ua);