From de17cac5dc19199e457f10f1ddda25caed6e19e2 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sun, 6 Feb 2022 00:41:32 +0100 Subject: [PATCH] Test: handled connection timeout exception --- .../api/albumsonglist/AlbumSongListClient.java | 10 ++++++++++ .../play/subsonic/api/browsing/BrowsingClient.java | 6 ++++++ .../api/mediaannotation/MediaAnnotationClient.java | 6 ++++++ .../MediaLibraryScanningClient.java | 6 ++++++ .../api/mediaretrieval/MediaRetrievalClient.java | 6 ++++++ .../play/subsonic/api/playlist/PlaylistClient.java | 5 +++++ .../play/subsonic/api/podcast/PodcastClient.java | 6 ++++++ .../play/subsonic/api/searching/SearchingClient.java | 6 ++++++ .../play/subsonic/api/system/SystemClient.java | 6 ++++++ 9 files changed, 57 insertions(+) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java index 54d6f997..c0c56346 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -73,6 +75,14 @@ public class AlbumSongListClient { CacheUtil cacheUtil = new CacheUtil(context, 10, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java index 081df60b..d95dc425 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -123,6 +125,10 @@ public class BrowsingClient { CacheUtil cacheUtil = new CacheUtil(context, 10, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java index e8cf0082..fa7c4014 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -58,6 +60,10 @@ public class MediaAnnotationClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .cache(getCache()) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java index aa2d0c2f..fcb10e74 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -48,6 +50,10 @@ public class MediaLibraryScanningClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .cache(getCache()) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java index a19fa5e4..00c6f255 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -53,6 +55,10 @@ public class MediaRetrievalClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java index 4dd9f0c6..d2594de8 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java @@ -9,6 +9,7 @@ import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import java.util.ArrayList; +import java.util.concurrent.TimeUnit; import okhttp3.Cache; import okhttp3.OkHttpClient; @@ -65,6 +66,10 @@ public class PlaylistClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .cache(getCache()) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/podcast/PodcastClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/podcast/PodcastClient.java index 9a3610f7..906e36a1 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/podcast/PodcastClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/podcast/PodcastClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -52,6 +54,10 @@ public class PodcastClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java index 6bf47bb9..b4696283 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -48,6 +50,10 @@ public class SearchingClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor) diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java index 6c185823..b8113006 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java @@ -8,6 +8,8 @@ import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; +import java.util.concurrent.TimeUnit; + import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -48,6 +50,10 @@ public class SystemClient { CacheUtil cacheUtil = new CacheUtil(context, 0, 60 * 60 * 24 * 30); return new OkHttpClient.Builder() + .callTimeout(2, TimeUnit.MINUTES) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(30, TimeUnit.SECONDS) .addInterceptor(getHttpLoggingInterceptor()) .addInterceptor(cacheUtil.offlineInterceptor) .addNetworkInterceptor(cacheUtil.onlineInterceptor)