From 3c17e91ca8e5b33189ac9d84c71d165bd877922e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=A3o=20Mata?= Date: Thu, 30 Apr 2020 16:25:11 +0200 Subject: [PATCH] Use settings from preferences for readTimeout --- .../net/nullsum/audinaut/service/RESTMusicService.java | 2 +- app/src/main/java/net/nullsum/audinaut/util/Util.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java index e66e6dd..0e33764 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java @@ -592,7 +592,7 @@ public class RESTMusicService implements MusicService { public Response getDownloadInputStream(Context context, MusicDirectory.Entry song, long offset, int maxBitrate, SilentBackgroundTask task) throws Exception { OkHttpClient eagerClient = client.newBuilder() - .readTimeout(30, TimeUnit.SECONDS) + .readTimeout(Util.getNetworkTimeoutMs(context), TimeUnit.MILLISECONDS) .build(); Map parameters = new HashMap<>(); diff --git a/app/src/main/java/net/nullsum/audinaut/util/Util.java b/app/src/main/java/net/nullsum/audinaut/util/Util.java index eee7449..c4a0d5c 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/Util.java +++ b/app/src/main/java/net/nullsum/audinaut/util/Util.java @@ -72,6 +72,9 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.SecureRandom; import java.text.DecimalFormat; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -122,6 +125,11 @@ public final class Util { editor.apply(); } + public static int getNetworkTimeoutMs(Context context) { + SharedPreferences prefs = getPreferences(context); + return prefs.getInt(Constants.PREFERENCES_KEY_NETWORK_TIMEOUT, 30000); + } + public static boolean isScreenLitOnDownload(Context context) { SharedPreferences prefs = getPreferences(context); return prefs.getBoolean(Constants.PREFERENCES_KEY_SCREEN_LIT_ON_DOWNLOAD, false);