fix(lint): Cleanup code and fix lint

aniyomiorg · Dec 7, 2023 · 7ccd74f · 7ccd74f
1 parent cdfeb16
commit 7ccd74f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
@@ -305,7 +305,7 @@ class PlayerViewModel @JvmOverloads constructor(
     fun isEpisodeOnline(): Boolean? {
         val anime = currentAnime ?: return null
         val episode = currentEpisode ?: return null
-        return currentSource is AnimeHttpSource && !EpisodeLoader.isDownloaded(
+        return currentSource is AnimeHttpSource && !EpisodeLoader.isDownload(
             episode.toDomainEpisode()!!,
             anime,
         )
@@ -379,8 +379,8 @@ class PlayerViewModel @JvmOverloads constructor(
 
         val nextEpisode = this.currentPlaylist[getCurrentEpisodeIndex() + 1]
         val episodesAreDownloaded =
-            EpisodeLoader.isDownloaded(currentEpisode.toDomainEpisode()!!, anime) &&
-                EpisodeLoader.isDownloaded(nextEpisode.toDomainEpisode()!!, anime)
+            EpisodeLoader.isDownload(currentEpisode.toDomainEpisode()!!, anime) &&
+                EpisodeLoader.isDownload(nextEpisode.toDomainEpisode()!!, anime)
 
         viewModelScope.launchIO {
             if (!episodesAreDownloaded) {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt
@@ -29,16 +29,9 @@ class EpisodeLoader {
          * @param source the source of the anime.
          */
         suspend fun getLinks(episode: Episode, anime: Anime, source: AnimeSource): List<Video> {
-            val downloadManager: AnimeDownloadManager = Injekt.get()
-            val isDownloaded = downloadManager.isEpisodeDownloaded(
-                episode.name,
-                episode.scanlator,
-                anime.title,
-                anime.source,
-                skipCache = true,
-            )
+            val isDownloaded = isDownload(episode, anime)
             return when {
-                isDownloaded -> isDownloaded(episode, anime, source, downloadManager)
+                isDownloaded -> isDownload(episode, anime, source)
                 source is AnimeHttpSource -> isHttp(episode, source)
                 source is LocalAnimeSource -> isLocal(episode)
                 else -> error("source not supported")
@@ -51,7 +44,7 @@ class EpisodeLoader {
          * @param episode the episode being parsed.
          * @param anime the anime of the episode.
          */
-        fun isDownloaded(episode: Episode, anime: Anime): Boolean {
+        fun isDownload(episode: Episode, anime: Anime): Boolean {
             val downloadManager: AnimeDownloadManager = Injekt.get()
             return downloadManager.isEpisodeDownloaded(
                 episode.name,
@@ -90,14 +83,13 @@ class EpisodeLoader {
          * @param episode the episode being parsed.
          * @param anime the anime of the episode.
          * @param source the source of the anime.
-         * @param downloadManager the AnimeDownloadManager instance to use.
          */
-        private fun isDownloaded(
+        private fun isDownload(
             episode: Episode,
             anime: Anime,
             source: AnimeSource,
-            downloadManager: AnimeDownloadManager,
         ): List<Video> {
+            val downloadManager: AnimeDownloadManager = Injekt.get()
             return try {
                 val video = downloadManager.buildVideo(source, anime, episode)
                 listOf(video)
@@ -111,7 +103,7 @@ class EpisodeLoader {
          *
          * @param episode the episode being parsed.
          */
-        private suspend fun isLocal(
+        private fun isLocal(
             episode: Episode,
         ): List<Video> {
             return try {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt
@@ -87,7 +87,7 @@ class PictureInPictureHandler(
                             MR.strings.action_previous_episode,
                             PIP_PREVIOUS,
                             PIP_PREVIOUS,
-                            plPos != 0
+                            plPos != 0,
                         )
                     } else {
                         createRemoteAction(
@@ -117,7 +117,7 @@ class PictureInPictureHandler(
                         MR.strings.action_next_episode,
                         PIP_NEXT,
                         PIP_NEXT,
-                        plPos != plCount - 1
+                        plPos != plCount - 1,
                     ),
                 ),
             )