From 39ff821aee31806e469774bc306b9b6396c18b7d Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sat, 4 Sep 2021 15:48:39 +0200 Subject: [PATCH] Code cleanup --- .../subsonic/api/albumsonglist/AlbumSongListClient.java | 4 +--- .../play/subsonic/api/browsing/BrowsingClient.java | 7 +++---- .../api/mediaannotation/MediaAnnotationClient.java | 7 +++---- .../medialibraryscanning/MediaLibraryScanningClient.java | 8 +++----- .../subsonic/api/mediaretrieval/MediaRetrievalClient.java | 7 +++---- .../play/subsonic/api/playlist/PlaylistClient.java | 7 +++---- .../play/subsonic/api/searching/SearchingClient.java | 4 +--- .../play/subsonic/api/system/SystemClient.java | 4 +--- 8 files changed, 18 insertions(+), 30 deletions(-) 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 4c933cc8..aa217615 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.albumsonglist; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class AlbumSongListClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final AlbumSongListService albumSongListService; public AlbumSongListClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) 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 0d2b95bc..f3c2b94f 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.browsing; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class BrowsingClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final BrowsingService browsingService; public BrowsingClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) @@ -141,5 +139,6 @@ public class BrowsingClient { private Cache getCache() { int cacheSize = 10 * 1024 * 1024; - return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; } + return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; + } } 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 c21bbb2e..c069ab86 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.mediaannotation; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class MediaAnnotationClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final MediaAnnotationService mediaAnnotationService; public MediaAnnotationClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) @@ -76,5 +74,6 @@ public class MediaAnnotationClient { private Cache getCache() { int cacheSize = 10 * 1024 * 1024; - return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; } + return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; + } } 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 acf15194..b4585343 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 @@ -3,9 +3,7 @@ package com.cappielloantonio.play.subsonic.api.medialibraryscanning; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; -import com.cappielloantonio.play.subsonic.api.system.SystemService; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; @@ -21,14 +19,13 @@ public class MediaLibraryScanningClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final MediaLibraryScanningService mediaLibraryScanningService; public MediaLibraryScanningClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) @@ -67,5 +64,6 @@ public class MediaLibraryScanningClient { private Cache getCache() { int cacheSize = 10 * 1024 * 1024; - return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; } + return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; + } } 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 d5758da2..6a16c4c9 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.mediaretrieval; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class MediaRetrievalClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final MediaRetrievalService mediaRetrievalService; public MediaRetrievalClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) @@ -66,5 +64,6 @@ public class MediaRetrievalClient { private Cache getCache() { int cacheSize = 10 * 1024 * 1024; - return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; } + return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; + } } 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 b89bfcb6..6238c8fa 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.playlist; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -22,14 +21,13 @@ public class PlaylistClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final PlaylistService playlistService; public PlaylistClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) @@ -83,5 +81,6 @@ public class PlaylistClient { private Cache getCache() { int cacheSize = 10 * 1024 * 1024; - return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; } + return context != null ? new Cache(context.getCacheDir(), cacheSize) : null; + } } 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 7083944f..4271b30c 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.searching; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class SearchingClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final SearchingService searchingService; public SearchingClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) 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 ae9cdb5e..bd621ab5 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 @@ -3,7 +3,6 @@ package com.cappielloantonio.play.subsonic.api.system; import android.content.Context; import android.util.Log; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.subsonic.utils.CacheUtil; @@ -20,14 +19,13 @@ public class SystemClient { private final Context context; private final Subsonic subsonic; - private Retrofit retrofit; private final SystemService systemService; public SystemClient(Context context, Subsonic subsonic) { this.context = context; this.subsonic = subsonic; - this.retrofit = new Retrofit.Builder() + Retrofit retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient())