From 8d517ae3e04bd55ebae388b0163c0e8a8b4fbe3f Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sun, 1 Aug 2021 11:29:55 +0200 Subject: [PATCH] Removed the now unused tikxml:converter-htmlescape --- app/build.gradle | 4 +--- .../subsonic/api/albumsonglist/AlbumSongListClient.java | 9 +-------- .../play/subsonic/api/browsing/BrowsingClient.java | 9 +-------- .../api/mediaannotation/MediaAnnotationClient.java | 9 +-------- .../api/mediaretrieval/MediaRetrievalClient.java | 9 +-------- .../play/subsonic/api/playlist/PlaylistClient.java | 9 +-------- .../play/subsonic/api/searching/SearchingClient.java | 9 +-------- .../play/subsonic/api/system/SystemClient.java | 9 +-------- 8 files changed, 8 insertions(+), 59 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a745a1b..8abf9053 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ dependencies { // AndroidX implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0" implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' @@ -84,8 +84,6 @@ dependencies { implementation 'com.tickaroo.tikxml:core:0.9.0_11-SNAPSHOT' annotationProcessor 'com.tickaroo.tikxml:processor:0.9.0_11-SNAPSHOT' implementation 'com.tickaroo.tikxml:converter-date-rfc3339:0.9.0_11-SNAPSHOT' - implementation 'com.tickaroo.tikxml:converter-htmlescape:0.9.0_11-SNAPSHOT' - // Database debugger via adb // debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' 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 42856a72..7a0ccd57 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class AlbumSongListClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -67,12 +66,6 @@ public class AlbumSongListClient { return albumSongListService.getStarred2(subsonic.getParams()); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 88fe20d2..fcdad6bb 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class BrowsingClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -117,12 +116,6 @@ public class BrowsingClient { return browsingService.getTopSongs(subsonic.getParams(), id, count); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 0ba51c2d..ae883ff9 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class MediaAnnotationClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -52,12 +51,6 @@ public class MediaAnnotationClient { return mediaAnnotationService.scrobble(subsonic.getParams(), id); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 809a5148..211f1b7e 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class MediaRetrievalClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -42,12 +41,6 @@ public class MediaRetrievalClient { return mediaRetrievalService.download(subsonic.getParams(), id); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 a685217d..7e560571 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class PlaylistClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -42,12 +41,6 @@ public class PlaylistClient { return playlistService.getPlaylist(subsonic.getParams(), id); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 e589faa3..e196e023 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class SearchingClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -42,12 +41,6 @@ public class SearchingClient { return searchingService.search3(subsonic.getParams(), query, songCount, albumCount, artistCount); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor()) 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 63ae1630..dca32f03 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 @@ -5,7 +5,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.tickaroo.tikxml.TikXml; -import com.tickaroo.tikxml.converter.htmlescape.HtmlEscapeStringConverter; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; @@ -25,7 +24,7 @@ public class SystemClient { this.retrofit = new Retrofit.Builder() .baseUrl(subsonic.getUrl()) - .addConverterFactory(TikXmlConverterFactory.create(getParser())) + .addConverterFactory(TikXmlConverterFactory.create()) .client(getOkHttpClient()) .build(); @@ -42,12 +41,6 @@ public class SystemClient { return systemService.getLicense(subsonic.getParams()); } - private TikXml getParser() { - return new TikXml.Builder() - .addTypeConverter(String.class, new HtmlEscapeStringConverter()) // HtmlEscapeStringConverter encode / decode html characters. This class ships as optional dependency - .build(); - } - private OkHttpClient getOkHttpClient() { return new OkHttpClient.Builder() .addInterceptor(getHttpLoggingInterceptor())