From 6fd3515d2c8ef16090db5fb6c0084094f0e3a3aa Mon Sep 17 00:00:00 2001
From: Sadwhy <99601717+Sadwhy@users.noreply.github.com>
Date: Fri, 17 Jan 2025 13:33:01 +0600
Subject: [PATCH 01/12] stuff (#567)

* Add blur to dialog for devices that support it

* More adjustable seek time

* Bump exo player
---
 app/build.gradle                                       |  4 ++--
 .../main/java/ani/dantotsu/util/AlertDialogBuilder.kt  | 10 +++++++++-
 app/src/main/res/layout/activity_player_settings.xml   |  8 ++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f7aab7ca..bcda959a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
 
 //  Exoplayer
-    ext.exo_version = '1.5.0'
+    ext.exo_version = '1.5.1'
     implementation "androidx.media3:media3-exoplayer:$exo_version"
     implementation "androidx.media3:media3-ui:$exo_version"
     implementation "androidx.media3:media3-exoplayer-hls:$exo_version"
@@ -124,7 +124,7 @@ dependencies {
     implementation "androidx.media3:media3-cast:$exo_version"
     implementation "androidx.mediarouter:mediarouter:1.7.0"
 // Media3 extension
-    implementation "com.github.anilbeesetti.nextlib:nextlib-media3ext:0.8.3"
+    implementation "com.github.anilbeesetti.nextlib:nextlib-media3ext:0.8.4"
 
 //  UI
     implementation 'com.google.android.material:material:1.12.0'
diff --git a/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt b/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt
index 74683ab1..036dd1b4 100644
--- a/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt
+++ b/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt
@@ -3,6 +3,8 @@ package ani.dantotsu.util
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
+import android.os.Build
+import android.view.WindowManager
 import android.view.View
 import ani.dantotsu.R
 
@@ -205,8 +207,14 @@ class AlertDialogBuilder(private val context: Context) {
             onShow?.invoke()
         }
         dialog.window?.apply {
-            setDimAmount(0.8f)
+            setDimAmount(0.5f)
             attributes.windowAnimations = android.R.style.Animation_Dialog
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                val params = attributes
+                params.flags = params.flags or WindowManager.LayoutParams.FLAG_BLUR_BEHIND
+                params.setBlurBehindRadius(20)
+                attributes = params
+            }
         }
         dialog.show()
     }
diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml
index 04244f03..e376c2f6 100644
--- a/app/src/main/res/layout/activity_player_settings.xml
+++ b/app/src/main/res/layout/activity_player_settings.xml
@@ -1102,10 +1102,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="32dp"
-                    android:stepSize="5.0"
-                    android:value="15.0"
-                    android:valueFrom="5.0"
-                    android:valueTo="45.0"
+                    android:stepSize="1.0"
+                    android:value="10.0"
+                    android:valueFrom="1.0"
+                    android:valueTo="50.0"
                     app:labelBehavior="floating"
                     app:labelStyle="@style/fontTooltip"
                     app:thumbColor="?attr/colorSecondary"

From e4630df3e0f77fe5928984ef943cb83cdd093e29 Mon Sep 17 00:00:00 2001
From: aayush262 <99584765+aayush2622@users.noreply.github.com>
Date: Wed, 2 Apr 2025 10:52:58 +0530
Subject: [PATCH 02/12] move stuff to dev (#587)

* Update README.md

* Fixed missing manga pages when downloading (#586)

* To install multiple mangas (#582)

users can enter the value required to install as there is an EditText field instead of the Text View

---------

Co-authored-by: rebel onion <87634197+rebelonion@users.noreply.github.com>
Co-authored-by: Daniele Santoru <30676094+danyev3@users.noreply.github.com>
Co-authored-by: Rishvaish <68911202+rishabpuranika@users.noreply.github.com>
---
 README.md                                     |  2 +-
 .../download/manga/MangaDownloaderService.kt  | 10 ++++++--
 .../dantotsu/media/manga/MangaReadAdapter.kt  | 24 ++++++++++++-------
 .../dantotsu/media/manga/MangaReadFragment.kt |  2 +-
 app/src/main/res/layout/dialog_layout.xml     | 23 ++++++++++++------
 5 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 76bece4b..6b713a2a 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Dantotsu is an [Anilist](https://anilist.co/) only client.
 
 > **Dantotsu (断トツ; Dan-totsu)** literally means "the best of the best" in Japanese. Try it out for yourself and be the judge!
 
-<a href="https://www.buymeacoffee.com/rebelonion"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=rebelonion&button_colour=FFDD00&font_colour=030201&font_family=Poppins&outline_colour=000000&coffee_colour=ffffff" /></a>
+<a href="https://www.buymeacoffee.com/rebelonion"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=rebelonion&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
 
 ## Terms of Use
 By downloading, installing, or using this application, you agree to:
diff --git a/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt b/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt
index 58e7de38..2ea82108 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt
@@ -232,12 +232,18 @@ class MangaDownloaderService : Service() {
                                 image.page,
                                 image.source
                             )
+                            if (bitmap == null) {
+                                snackString("${task.chapter} - Retrying to download page ${index.ofLength(3)}, attempt ${retryCount + 1}.")
+                            }
                             retryCount++
                         }
 
-                        if (bitmap != null) {
-                            saveToDisk("${index.ofLength(3)}.jpg", outputDir, bitmap)
+                        if (bitmap == null) {
+                            outputDir.deleteRecursively(this@MangaDownloaderService, false)
+                            throw Exception("${task.chapter} - Unable to download all pages after $retryCount attempts. Try again.")
                         }
+
+                        saveToDisk("${index.ofLength(3)}.jpg", outputDir, bitmap)
                         farthest++
 
                         builder.setProgress(task.imageData.size, farthest, false)
diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
index a76d44a4..ddf98974 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadAdapter.kt
@@ -7,9 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.CheckBox
+import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.NumberPicker
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getString
 import androidx.core.content.ContextCompat.startActivity
@@ -265,19 +267,22 @@ class MangaReadAdapter(
                 }
 
                 // Multi download
-                downloadNo.text = "0"
+                //downloadNo.text = "0"
                 mediaDownloadTop.setOnClickListener {
-                    // Alert dialog asking for the number of chapters to download
                     fragment.requireContext().customAlertDialog().apply {
                         setTitle("Multi Chapter Downloader")
                         setMessage("Enter the number of chapters to download")
-                        val input = NumberPicker(currContext())
-                        input.minValue = 1
-                        input.maxValue = 20
-                        input.value = 1
+                        val input = View.inflate(currContext(), R.layout.dialog_layout, null)
+                        val editText = input.findViewById<EditText>(R.id.downloadNo)
                         setCustomView(input)
                         setPosButton(R.string.ok) {
-                            downloadNo.text = "${input.value}"
+                            val value = editText.text.toString().toIntOrNull()
+                            if (value != null && value > 0) {
+                                downloadNo.setText(value.toString(), TextView.BufferType.EDITABLE)
+                                fragment.multiDownload(value)
+                            } else {
+                                toast("Please enter a valid number")
+                            }
                         }
                         setNegButton(R.string.cancel)
                         show()
@@ -382,8 +387,9 @@ class MangaReadAdapter(
                     setCustomView(root)
                     setPosButton("OK") {
                         if (run) fragment.onIconPressed(style, reversed)
-                        if (downloadNo.text != "0") {
-                            fragment.multiDownload(downloadNo.text.toString().toInt())
+                        val value = downloadNo.text.toString().toIntOrNull()
+                        if (value != null && value > 0) {
+                            fragment.multiDownload(value)
                         }
                         if (refresh) fragment.loadChapters(source, true)
                     }
diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
index 6b7eb6bc..63ef7408 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
@@ -474,7 +474,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
                                 scanlator = chapter.scanlator ?: "Unknown",
                                 imageData = images,
                                 sourceMedia = media,
-                                retries = 2,
+                                retries = 25,
                                 simultaneousDownloads = 2
                             )
 
diff --git a/app/src/main/res/layout/dialog_layout.xml b/app/src/main/res/layout/dialog_layout.xml
index 3db06395..3c9df3b8 100644
--- a/app/src/main/res/layout/dialog_layout.xml
+++ b/app/src/main/res/layout/dialog_layout.xml
@@ -8,7 +8,7 @@
     android:padding="16dp">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="326dp"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
@@ -160,8 +160,8 @@
             android:orientation="horizontal">
 
             <LinearLayout
-                android:layout_width="265dp"
-                android:layout_height="match_parent"
+                android:layout_width="263dp"
+                android:layout_height="60dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -171,14 +171,23 @@
                     android:fontFamily="@font/poppins_bold"
                     android:text="@string/download" />
 
-                <TextView
+                <EditText
                     android:id="@+id/downloadNo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/poppins_bold"
                     android:textColor="?attr/colorSecondary"
+                    android:textSize="12dp"
                     tools:ignore="TextContrastCheck"
-                    tools:text="number" />
+                    tools:text="Number" />
+                <!--                <TextView-->
+                <!--                    android:id="@+id/downloadNo"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:fontFamily="@font/poppins_bold"-->
+                <!--                    android:textColor="?attr/colorSecondary"-->
+                <!--                    tools:ignore="TextContrastCheck"-->
+                <!--                    tools:text="number" />-->
             </LinearLayout>
 
             <androidx.cardview.widget.CardView
@@ -191,7 +200,7 @@
                 <ImageButton
                     android:id="@+id/mediaDownloadTop"
                     android:layout_width="48dp"
-                    android:layout_height="48dp"
+                    android:layout_height="60dp"
                     android:background="?android:attr/selectableItemBackground"
                     app:srcCompat="@drawable/ic_download_24"
                     app:tint="?attr/colorOnBackground"
@@ -313,9 +322,9 @@
                     android:text="@string/reset" />
 
                 <TextView
+                    android:id="@+id/reset_progress_def"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/reset_progress_def"
                     android:fontFamily="@font/poppins_bold"
                     android:text=""
                     android:textColor="?attr/colorSecondary"

From dec2ed795944d8101965a02a4dff535b9577d720 Mon Sep 17 00:00:00 2001
From: Rishvaish <68911202+rishabpuranika@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:58:42 +0530
Subject: [PATCH 03/12] hope for the best

* Update README.md

* To install multiple mangas

users can enter the value required to install as there is an EditText field instead of the Text View

* Issues

1)Installation of many mangas at same time now made to one to increase the installation efficiency
2)Installation order from the latest progresses chapter to the limit index
3)Tried to resolve the app crash bug

* Issues

1)Installation of many mangas at same time now made to one to increase the installation efficiency
2)Installation order from the latest progresses chapter to the limit index
3)Tried to resolve the app crash bug

---------

Co-authored-by: rebel onion <87634197+rebelonion@users.noreply.github.com>
---
 .../ani/dantotsu/media/manga/MangaCache.kt    | 13 ++++-
 .../dantotsu/media/manga/MangaReadFragment.kt | 47 ++++++++++++-------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt
index 359c64a5..f47f416f 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt
@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
+import java.io.FileNotFoundException
 import java.io.FileOutputStream
 
 data class ImageData(
@@ -76,7 +77,7 @@ fun saveImage(
             uri?.let {
                 contentResolver.openOutputStream(it)?.use { os ->
                     bitmap.compress(format, quality, os)
-                }
+                } ?: throw FileNotFoundException("Failed to open output stream for URI: $uri")
             }
         } else {
             val directory =
@@ -86,12 +87,20 @@ fun saveImage(
             }
 
             val file = File(directory, filename)
+
+            // Check if the file already exists
+            if (file.exists()) {
+                println("File already exists: ${file.absolutePath}")
+                return
+            }
+
             FileOutputStream(file).use { outputStream ->
                 bitmap.compress(format, quality, outputStream)
             }
         }
+    } catch (e: FileNotFoundException) {
+        println("File not found: ${e.message}")
     } catch (e: Exception) {
-        // Handle exception here
         println("Exception while saving image: ${e.message}")
     }
 }
diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
index 63ef7408..2ad28a75 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
@@ -66,6 +66,7 @@ import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uy.kohesive.injekt.Injekt
@@ -232,25 +233,35 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
     }
 
     fun multiDownload(n: Int) {
-        // Get last viewed chapter
-        val selected = media.userProgress
-        val chapters = media.manga?.chapters?.values?.toList()
-        // Filter by selected language
-        val progressChapterIndex = (chapters?.indexOfFirst {
-            MediaNameAdapter.findChapterNumber(it.number)?.toInt() == selected
-        } ?: 0) + 1
-
-        if (progressChapterIndex < 0 || n < 1 || chapters == null) return
-
-        // Calculate the end index
-        val endIndex = minOf(progressChapterIndex + n, chapters.size)
-
-        // Make sure there are enough chapters
-        val chaptersToDownload = chapters.subList(progressChapterIndex, endIndex)
-
-
-        for (chapter in chaptersToDownload) {
+        lifecycleScope.launch {
+            // Get the last viewed chapter
+            val selected = media.userProgress ?: 0
+            val chapters = media.manga?.chapters?.values?.toList()
+            // Ensure chapters are available in the extensions
+            if (chapters.isNullOrEmpty() || n < 1) return@launch
+            // Find the index of the last viewed chapter
+            val progressChapterIndex = (chapters.indexOfFirst {
+                MediaNameAdapter.findChapterNumber(it.number)?.toInt() == selected
+            } + 1).coerceAtLeast(0)
+            // Calculate the end value for the range of chapters to download
+            val endIndex = (progressChapterIndex + n).coerceAtMost(chapters.size)
+            // Get the list of chapters to download
+            val chaptersToDownload = chapters.subList(progressChapterIndex, endIndex)
+            // Trigger the download for each chapter sequentially
+            for (chapter in chaptersToDownload) {
+                try {
+                    downloadChapterSequentially(chapter)
+                } catch (e: Exception) {
+                    Toast.makeText(requireContext(), "Failed to download chapter: ${chapter.title}", Toast.LENGTH_SHORT).show()
+                }
+            }
+            Toast.makeText(requireContext(), "All downloads completed!", Toast.LENGTH_SHORT).show()
+        }
+    }
+    private suspend fun downloadChapterSequentially(chapter: MangaChapter) {
+        withContext(Dispatchers.IO) {
             onMangaChapterDownloadClick(chapter)
+            delay(2000) // A 2-second download
         }
     }
 

From 7d0894cd923866a0091162fcb8f0ec1680632ef1 Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Wed, 14 May 2025 22:35:50 -0500
Subject: [PATCH 04/12] chore: bump extension interface

---
 README.md                                     |   2 -
 app/build.gradle                              |   2 +-
 .../ani/dantotsu/parsers/AniyomiAdapter.kt    |  16 +-
 .../tachiyomi/animesource/AnimeSource.kt      |  20 ++
 .../tachiyomi/animesource/model/Hoster.kt     |  81 ++++++
 .../tachiyomi/animesource/model/Video.kt      | 273 +++++++++++++-----
 6 files changed, 311 insertions(+), 83 deletions(-)
 create mode 100644 app/src/main/java/eu/kanade/tachiyomi/animesource/model/Hoster.kt

diff --git a/README.md b/README.md
index 6b713a2a..a1b1d673 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,6 @@ Dantotsu is an [Anilist](https://anilist.co/) only client.
 
 > **Dantotsu (断トツ; Dan-totsu)** literally means "the best of the best" in Japanese. Try it out for yourself and be the judge!
 
-<a href="https://www.buymeacoffee.com/rebelonion"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=rebelonion&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
-
 ## Terms of Use
 By downloading, installing, or using this application, you agree to:
 - Use the application in compliance with all applicable laws
diff --git a/app/build.gradle b/app/build.gradle
index bcda959a..b983443c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         targetSdk 35
         versionCode((System.currentTimeMillis() / 60000).toInteger())
         versionName "3.2.1"
-        versionCode 300200100
+        versionCode versionName.split("\\.").collect { it.toInteger() * 100 }.join("") as Integer
         signingConfig signingConfigs.debug
 
     }
diff --git a/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt b/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
index adfd857e..fa1fa9a2 100644
--- a/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
@@ -226,8 +226,18 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
             ?: return emptyList())
 
         return try {
-            val videos = source.getVideoList(sEpisode)
-            videos.map { videoToVideoServer(it) }
+            // TODO(1.6): Remove else block when dropping support for ext lib <1.6
+            if ((source as AnimeHttpSource).javaClass.declaredMethods.any { it.name == "getHosterList" }){
+                val hosters = source.getHosterList(sEpisode)
+                val allVideos = hosters.flatMap { hoster ->
+                    val videos = source.getVideoList(hoster)
+                    videos.map { it.copy(videoTitle = "${hoster.hosterName} - ${it.videoTitle}") }
+                }
+                allVideos.map { videoToVideoServer(it) }
+            } else {
+                val videos = source.getVideoList(sEpisode)
+                videos.map { videoToVideoServer(it) }
+            }
         } catch (e: Exception) {
             Logger.log("Exception occurred: ${e.message}")
             emptyList()
@@ -576,7 +586,7 @@ class VideoServerPassthrough(private val videoServer: VideoServer) : VideoExtrac
             number,
             format!!,
             FileUrl(videoUrl, headersMap),
-            if (aniVideo.totalContentLength == 0L) null else aniVideo.bytesDownloaded.toDouble()
+            null
         )
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt b/app/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt
index 171b07b2..4b54360a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animesource
 
+import eu.kanade.tachiyomi.animesource.model.Hoster
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
@@ -48,6 +49,25 @@ interface AnimeSource {
         return fetchEpisodeList(anime).awaitSingle()
     }
 
+    /**
+     * Get the list of hoster for an episode. The first hoster in the list should
+     * be the preferred hoster.
+     *
+     * @since extensions-lib 16
+     * @param episode the episode.
+     * @return the hosters for the episode.
+     */
+    suspend fun getHosterList(episode: SEpisode): List<Hoster> = throw IllegalStateException("Not used")
+
+    /**
+     * Get the list of videos for a hoster.
+     *
+     * @since extensions-lib 16
+     * @param hoster the hoster.
+     * @return the videos for the hoster.
+     */
+    suspend fun getVideoList(hoster: Hoster): List<Video> = throw IllegalStateException("Not used")
+
     /**
      * Get the list of videos a episode has. Pages should be returned
      * in the expected order; the index is ignored.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Hoster.kt b/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Hoster.kt
new file mode 100644
index 00000000..5f8d278a
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Hoster.kt
@@ -0,0 +1,81 @@
+package eu.kanade.tachiyomi.animesource.model
+
+import eu.kanade.tachiyomi.animesource.model.SerializableVideo.Companion.serialize
+import eu.kanade.tachiyomi.animesource.model.SerializableVideo.Companion.toVideoList
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+open class Hoster(
+    val hosterUrl: String = "",
+    val hosterName: String = "",
+    val videoList: List<Video>? = null,
+    val internalData: String = "",
+) {
+    @Transient
+    @Volatile
+    var status: State = State.IDLE
+
+    enum class State {
+        IDLE,
+        LOADING,
+        READY,
+        ERROR,
+    }
+
+    fun copy(
+        hosterUrl: String = this.hosterUrl,
+        hosterName: String = this.hosterName,
+        videoList: List<Video>? = this.videoList,
+        internalData: String = this.internalData,
+    ): Hoster {
+        return Hoster(hosterUrl, hosterName, videoList, internalData)
+    }
+
+    companion object {
+        const val NO_HOSTER_LIST = "no_hoster_list"
+
+        fun List<Video>.toHosterList(): List<Hoster> {
+            return listOf(
+                Hoster(
+                    hosterUrl = "",
+                    hosterName = NO_HOSTER_LIST,
+                    videoList = this,
+                ),
+            )
+        }
+    }
+}
+
+@Serializable
+data class SerializableHoster(
+    val hosterUrl: String = "",
+    val hosterName: String = "",
+    val videoList: String? = null,
+    val internalData: String = "",
+) {
+    companion object {
+        fun List<Hoster>.serialize(): String =
+            Json.encodeToString(
+                this.map { host ->
+                    SerializableHoster(
+                        host.hosterUrl,
+                        host.hosterName,
+                        host.videoList?.serialize(),
+                        host.internalData,
+                    )
+                },
+            )
+
+        fun String.toHosterList(): List<Hoster> =
+            Json.decodeFromString<List<SerializableHoster>>(this)
+                .map { sHost ->
+                    Hoster(
+                        sHost.hosterUrl,
+                        sHost.hosterName,
+                        sHost.videoList?.toVideoList(),
+                        sHost.internalData,
+                    )
+                }
+    }
+}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt b/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt
index e9d38bdd..8602be4b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt
@@ -1,31 +1,101 @@
 package eu.kanade.tachiyomi.animesource.model
 
 import android.net.Uri
-import eu.kanade.tachiyomi.network.ProgressListener
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import okhttp3.Headers
-import rx.subjects.Subject
-import java.io.IOException
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
 import java.io.Serializable
 
+@kotlinx.serialization.Serializable
 data class Track(val url: String, val lang: String) : Serializable
 
+@kotlinx.serialization.Serializable
+enum class ChapterType {
+    Opening,
+    Ending,
+    Recap,
+    MixedOp,
+    Other,
+}
+
+@kotlinx.serialization.Serializable
+data class TimeStamp(
+    val start: Double,
+    val end: Double,
+    val name: String,
+    val type: ChapterType = ChapterType.Other,
+)
+
 open class Video(
-    val url: String = "",
-    val quality: String = "",
-    var videoUrl: String? = null,
-    headers: Headers? = null,
-    // "url", "language-label-2", "url2", "language-label-2"
+    var videoUrl: String = "",
+    val videoTitle: String = "",
+    val resolution: Int? = null,
+    val bitrate: Int? = null,
+    val headers: Headers? = null,
+    val preferred: Boolean = false,
     val subtitleTracks: List<Track> = emptyList(),
     val audioTracks: List<Track> = emptyList(),
-) : Serializable, ProgressListener {
+    val timestamps: List<TimeStamp> = emptyList(),
+    val internalData: String = "",
+    val initialized: Boolean = false,
+    // TODO(1.6): Remove after ext lib bump
+    val videoPageUrl: String = "",
+) {
 
-    @Transient
-    var headers: Headers? = headers
+    // TODO(1.6): Remove after ext lib bump
+    @Deprecated("Use videoTitle instead", ReplaceWith("videoTitle"))
+    val quality: String
+        get() = videoTitle
 
+    // TODO(1.6): Remove after ext lib bump
+    @Deprecated("Use videoPageUrl instead", ReplaceWith("videoPageUrl"))
+    val url: String
+        get() = videoPageUrl
+
+    // TODO(1.6): Remove after ext lib bump
+    constructor(
+        url: String,
+        quality: String,
+        videoUrl: String?,
+        headers: Headers? = null,
+        subtitleTracks: List<Track> = emptyList(),
+        audioTracks: List<Track> = emptyList(),
+    ) : this(
+        videoPageUrl = url,
+        videoTitle = quality,
+        videoUrl = videoUrl ?: "null",
+        headers = headers,
+        subtitleTracks = subtitleTracks,
+        audioTracks = audioTracks,
+    )
+
+    // TODO(1.6): Remove after ext lib bump
+    constructor(
+        videoUrl: String = "",
+        videoTitle: String = "",
+        resolution: Int? = null,
+        bitrate: Int? = null,
+        headers: Headers? = null,
+        preferred: Boolean = false,
+        subtitleTracks: List<Track> = emptyList(),
+        audioTracks: List<Track> = emptyList(),
+        timestamps: List<TimeStamp> = emptyList(),
+        internalData: String = "",
+    ) : this(
+        videoUrl = videoUrl,
+        videoTitle = videoTitle,
+        resolution = resolution,
+        bitrate = bitrate,
+        headers = headers,
+        preferred = preferred,
+        subtitleTracks = subtitleTracks,
+        audioTracks = audioTracks,
+        timestamps = timestamps,
+        internalData = internalData,
+        videoPageUrl = "",
+    )
+
+    // TODO(1.6): Remove after ext lib bump
     @Suppress("UNUSED_PARAMETER")
     constructor(
         url: String,
@@ -38,83 +108,132 @@ open class Video(
     @Transient
     @Volatile
     var status: State = State.QUEUE
-
-    @Transient
-    private val _progressFlow = MutableStateFlow(0)
-
-    @Transient
-    val progressFlow = _progressFlow.asStateFlow()
-    var progress: Int
-        get() = _progressFlow.value
         set(value) {
-            _progressFlow.value = value
-        }
-
-    @Transient
-    @Volatile
-    var totalBytesDownloaded: Long = 0L
-
-    @Transient
-    @Volatile
-    var totalContentLength: Long = 0L
-
-    @Transient
-    @Volatile
-    var bytesDownloaded: Long = 0L
-        set(value) {
-            totalBytesDownloaded += if (value < field) {
-                value
-            } else {
-                value - field
-            }
             field = value
         }
 
-    @Transient
-    var progressSubject: Subject<State, State>? = null
+    fun copy(
+        videoUrl: String = this.videoUrl,
+        videoTitle: String = this.videoTitle,
+        resolution: Int? = this.resolution,
+        bitrate: Int? = this.bitrate,
+        headers: Headers? = this.headers,
+        preferred: Boolean = this.preferred,
+        subtitleTracks: List<Track> = this.subtitleTracks,
+        audioTracks: List<Track> = this.audioTracks,
+        timestamps: List<TimeStamp> = this.timestamps,
+        internalData: String = this.internalData,
+    ): Video {
+        return Video(
+            videoUrl = videoUrl,
+            videoTitle = videoTitle,
+            resolution = resolution,
+            bitrate = bitrate,
+            headers = headers,
+            preferred = preferred,
+            subtitleTracks = subtitleTracks,
+            audioTracks = audioTracks,
+            timestamps = timestamps,
+            internalData = internalData,
+        )
+    }
 
-    override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
-        bytesDownloaded = bytesRead
-        if (contentLength > totalContentLength) {
-            totalContentLength = contentLength
-        }
-        val newProgress = if (totalContentLength > 0) {
-            (100 * totalBytesDownloaded / totalContentLength).toInt()
-        } else {
-            -1
-        }
-        if (progress != newProgress) progress = newProgress
+    fun copy(
+        videoUrl: String = this.videoUrl,
+        videoTitle: String = this.videoTitle,
+        resolution: Int? = this.resolution,
+        bitrate: Int? = this.bitrate,
+        headers: Headers? = this.headers,
+        preferred: Boolean = this.preferred,
+        subtitleTracks: List<Track> = this.subtitleTracks,
+        audioTracks: List<Track> = this.audioTracks,
+        timestamps: List<TimeStamp> = this.timestamps,
+        internalData: String = this.internalData,
+        initialized: Boolean = this.initialized,
+        videoPageUrl: String = this.videoPageUrl,
+    ): Video {
+        return Video(
+            videoUrl = videoUrl,
+            videoTitle = videoTitle,
+            resolution = resolution,
+            bitrate = bitrate,
+            headers = headers,
+            preferred = preferred,
+            subtitleTracks = subtitleTracks,
+            audioTracks = audioTracks,
+            timestamps = timestamps,
+            internalData = internalData,
+            initialized = initialized,
+            videoPageUrl = videoPageUrl,
+        )
     }
 
     enum class State {
         QUEUE,
         LOAD_VIDEO,
-        DOWNLOAD_IMAGE,
         READY,
         ERROR,
     }
+}
 
-    @Throws(IOException::class)
-    private fun writeObject(out: ObjectOutputStream) {
-        out.defaultWriteObject()
-        val headersMap: Map<String, List<String>> = headers?.toMultimap() ?: emptyMap()
-        out.writeObject(headersMap)
-    }
+@kotlinx.serialization.Serializable
+data class SerializableVideo(
+    val videoUrl: String = "",
+    val videoTitle: String = "",
+    val resolution: Int? = null,
+    val bitrate: Int? = null,
+    val headers: List<Pair<String, String>>? = null,
+    val preferred: Boolean = false,
+    val subtitleTracks: List<Track> = emptyList(),
+    val audioTracks: List<Track> = emptyList(),
+    val timestamps: List<TimeStamp> = emptyList(),
+    val internalData: String = "",
+    val initialized: Boolean = false,
+    // TODO(1.6): Remove after ext lib bump
+    val videoPageUrl: String = "",
+) {
 
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IOException::class, ClassNotFoundException::class)
-    private fun readObject(input: ObjectInputStream) {
-        input.defaultReadObject()
-        val headersMap = input.readObject() as? Map<String, List<String>>
-        headers = headersMap?.let { map ->
-            val builder = Headers.Builder()
-            for ((key, values) in map) {
-                for (value in values) {
-                    builder.add(key, value)
+    companion object {
+        fun List<Video>.serialize(): String =
+            Json.encodeToString(
+                this.map { vid ->
+                    SerializableVideo(
+                        vid.videoUrl,
+                        vid.videoTitle,
+                        vid.resolution,
+                        vid.bitrate,
+                        vid.headers?.toList(),
+                        vid.preferred,
+                        vid.subtitleTracks,
+                        vid.audioTracks,
+                        vid.timestamps,
+                        vid.internalData,
+                        vid.initialized,
+                        vid.videoPageUrl,
+                    )
+                },
+            )
+
+        fun String.toVideoList(): List<Video> =
+            Json.decodeFromString<List<SerializableVideo>>(this)
+                .map { sVid ->
+                    Video(
+                        sVid.videoUrl,
+                        sVid.videoTitle,
+                        sVid.resolution,
+                        sVid.bitrate,
+                        sVid.headers
+                            ?.flatMap { it.toList() }
+                            ?.let { Headers.headersOf(*it.toTypedArray()) },
+                        sVid.preferred,
+                        sVid.subtitleTracks,
+                        sVid.audioTracks,
+                        sVid.timestamps,
+                        sVid.internalData,
+                        sVid.initialized,
+                        sVid.videoPageUrl,
+                    )
                 }
-            }
-            builder.build()
-        }
-
     }
 }
+

From afd9f6b8845ed3767063e2fe6056506427ba7157 Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Thu, 15 May 2025 01:13:47 -0500
Subject: [PATCH 05/12] fix: subtitles not showing

---
 app/build.gradle                              |  39 ++--
 .../dantotsu/media/MediaDetailsActivity.kt    |  17 +-
 .../ani/dantotsu/media/SubtitleDownloader.kt  |  47 +++--
 .../ani/dantotsu/media/anime/ExoplayerView.kt | 168 +++++++++---------
 .../ani/dantotsu/parsers/AniyomiAdapter.kt    |   1 -
 5 files changed, 152 insertions(+), 120 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b983443c..1f4997d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,10 @@ android {
             manifestPlaceholders.icon_placeholder_round = "@mipmap/ic_launcher_alpha_round"
             debuggable System.getenv("CI") == null
             isDefault true
+            debuggable true
+            jniDebuggable true
+            minifyEnabled false
+            shrinkResources false
         }
         debug {
             applicationIdSuffix ".beta"
@@ -81,25 +85,26 @@ android {
 dependencies {
 
 //  FireBase
-    googleImplementation platform('com.google.firebase:firebase-bom:33.0.0')
-    googleImplementation 'com.google.firebase:firebase-analytics-ktx:22.0.0'
-    googleImplementation 'com.google.firebase:firebase-crashlytics-ktx:19.0.0'
+    googleImplementation platform('com.google.firebase:firebase-bom:33.13.0')
+    googleImplementation 'com.google.firebase:firebase-analytics-ktx:22.4.0'
+    googleImplementation 'com.google.firebase:firebase-crashlytics-ktx:19.4.3'
 //  Core
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.browser:browser:1.8.0'
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.core:core-ktx:1.16.0'
+    implementation 'androidx.fragment:fragment-ktx:1.8.6'
+    implementation 'androidx.activity:activity-ktx:1.10.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "androidx.work:work-runtime-ktx:2.9.0"
+    implementation "androidx.work:work-runtime-ktx:2.10.1"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.github.Blatzar:NiceHttp:0.4.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.webkit:webkit:1.11.0'
+    implementation 'androidx.webkit:webkit:1.13.0'
     implementation "com.anggrayudi:storage:1.5.5"
     implementation "androidx.biometric:biometric:1.1.0"
 
@@ -113,7 +118,7 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
 
 //  Exoplayer
-    ext.exo_version = '1.5.1'
+    ext.exo_version = '1.6.1'
     implementation "androidx.media3:media3-exoplayer:$exo_version"
     implementation "androidx.media3:media3-ui:$exo_version"
     implementation "androidx.media3:media3-exoplayer-hls:$exo_version"
@@ -133,7 +138,7 @@ dependencies {
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
     implementation 'com.alexvasilkov:gesture-views:2.8.3'
     implementation 'com.github.VipulOG:ebook-reader:0.1.6'
-    implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
+    implementation 'androidx.paging:paging-runtime-ktx:3.3.6'
     implementation 'com.github.eltos:simpledialogfragments:v3.7'
     implementation 'com.github.AAChartModel:AAChartCore-Kotlin:7.2.3'
 
@@ -162,13 +167,13 @@ dependencies {
     implementation 'ca.gosyer:voyager-navigator:1.0.0-rc07'
     implementation 'com.squareup.logcat:logcat:0.1'
     implementation 'uy.kohesive.injekt:injekt-core:1.16.+'
-    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.12'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
+    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps'
-    implementation 'com.squareup.okio:okio:3.8.0'
-    implementation 'com.squareup.okhttp3:okhttp-brotli:5.0.0-alpha.12'
-    implementation 'org.jsoup:jsoup:1.16.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.6.3'
+    implementation 'com.squareup.okio:okio:3.9.1'
+    implementation 'com.squareup.okhttp3:okhttp-brotli:5.0.0-alpha.14'
+    implementation 'org.jsoup:jsoup:1.18.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.7.3'
     implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     implementation 'com.github.tachiyomiorg:unifile:17bec43'
     implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
index bcb21c8c..852d4ef6 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
@@ -4,6 +4,7 @@ import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.view.GestureDetector
@@ -12,6 +13,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.ImageView
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -19,8 +22,10 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.text.bold
 import androidx.core.text.color
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
+import androidx.core.view.setPadding
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
@@ -79,6 +84,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
         var media: Media = intent.getSerialized("media") ?: mediaSingleton ?: emptyMedia()
         val id = intent.getIntExtra("mediaId", -1)
@@ -109,6 +115,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         // Ui init
 
         initActivity(this)
+
         binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             bottomMargin = navBarHeight
         }
@@ -132,10 +139,12 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         val navBarBottomMargin = if (resources.configuration.orientation ==
             Configuration.ORIENTATION_LANDSCAPE
         ) 0 else navBarHeight
-        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-            rightMargin = navBarRightMargin
-            bottomMargin = navBarBottomMargin
-        }
+        navBar.setPadding(
+            navBar.paddingLeft,
+            navBar.paddingTop,
+            navBar.paddingRight + navBarRightMargin,
+            navBar.paddingBottom + navBarBottomMargin
+        )
         binding.mediaBanner.updateLayoutParams { height += statusBarHeight }
         binding.mediaBannerNoKen.updateLayoutParams { height += statusBarHeight }
         binding.mediaClose.updateLayoutParams<ViewGroup.MarginLayoutParams> { topMargin += statusBarHeight }
diff --git a/app/src/main/java/ani/dantotsu/media/SubtitleDownloader.kt b/app/src/main/java/ani/dantotsu/media/SubtitleDownloader.kt
index 5c66f6a2..7fa32de9 100644
--- a/app/src/main/java/ani/dantotsu/media/SubtitleDownloader.kt
+++ b/app/src/main/java/ani/dantotsu/media/SubtitleDownloader.kt
@@ -1,6 +1,8 @@
 package ani.dantotsu.media
 
 import android.content.Context
+import androidx.core.net.toFile
+import androidx.core.net.toUri
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.parsers.SubtitleType
@@ -21,28 +23,32 @@ class SubtitleDownloader {
         suspend fun loadSubtitleType(url: String): SubtitleType =
             withContext(Dispatchers.IO) {
                 return@withContext try {
-                    // Initialize the NetworkHelper instance. Replace this line based on how you usually initialize it
-                    val networkHelper = Injekt.get<NetworkHelper>()
-                    val request = Request.Builder()
-                        .url(url)
-                        .build()
+                    if (!url.startsWith("file")) {
+                        // Initialize the NetworkHelper instance. Replace this line based on how you usually initialize it
+                        val networkHelper = Injekt.get<NetworkHelper>()
+                        val request = Request.Builder()
+                            .url(url)
+                            .build()
 
-                    val response = networkHelper.client.newCall(request).execute()
+                        val response = networkHelper.client.newCall(request).execute()
 
-                    // Check if response is successful
-                    if (response.isSuccessful) {
-                        val responseBody = response.body.string()
+                        // Check if response is successful
+                        if (response.isSuccessful) {
+                            val responseBody = response.body.string()
 
 
-                        val subtitleType = when {
-                            responseBody.contains("[Script Info]") -> SubtitleType.ASS
-                            responseBody.contains("WEBVTT") -> SubtitleType.VTT
-                            else -> SubtitleType.SRT
+                            val subtitleType = getType(responseBody)
+
+                            subtitleType
+                        } else {
+                            SubtitleType.UNKNOWN
                         }
-
-                        subtitleType
                     } else {
-                        SubtitleType.UNKNOWN
+                        val uri = url.toUri()
+                        val file = uri.toFile()
+                        val fileBody = file.readText()
+                        val subtitleType = getType(fileBody)
+                        subtitleType
                     }
                 } catch (e: Exception) {
                     Logger.log(e)
@@ -50,6 +56,15 @@ class SubtitleDownloader {
                 }
             }
 
+        private fun getType(content: String): SubtitleType {
+            return when {
+                content.contains("[Script Info]") -> SubtitleType.ASS
+                content.contains("WEBVTT") -> SubtitleType.VTT
+                content.contains("SRT") -> SubtitleType.SRT
+                else -> SubtitleType.UNKNOWN
+            }
+        }
+
         //actually downloads lol
         @Deprecated("handled externally")
         suspend fun downloadSubtitle(
diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index 465949a4..b2503c28 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -2,7 +2,6 @@ package ani.dantotsu.media.anime
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.app.Dialog
 import android.app.PictureInPictureParams
 import android.app.PictureInPictureUiState
@@ -19,7 +18,6 @@ import android.media.AudioManager.AUDIOFOCUS_GAIN
 import android.media.AudioManager.AUDIOFOCUS_LOSS
 import android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT
 import android.media.AudioManager.STREAM_MUSIC
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -75,9 +73,7 @@ import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
 import androidx.media3.common.text.CueGroup
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.datasource.DataSource
 import androidx.media3.datasource.DefaultDataSource
-import androidx.media3.datasource.HttpDataSource
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.DefaultLoadControl
@@ -175,10 +171,10 @@ import java.util.Timer
 import java.util.TimerTask
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
-import kotlin.collections.set
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
+import androidx.core.net.toUri
 
 @UnstableApi
 @SuppressLint("ClickableViewAccessibility")
@@ -427,7 +423,8 @@ class ExoplayerView :
                 false -> 0f
             }
 
-        val textElevation = PrefManager.getVal<Float>(PrefName.SubBottomMargin) / 50 * resources.displayMetrics.heightPixels
+        val textElevation =
+            PrefManager.getVal<Float>(PrefName.SubBottomMargin) / 50 * resources.displayMetrics.heightPixels
         textView.translationY = -textElevation
     }
 
@@ -606,9 +603,9 @@ class ExoplayerView :
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             pipEnabled =
                 packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) &&
-                PrefManager.getVal(
-                    PrefName.Pip,
-                )
+                        PrefManager.getVal(
+                            PrefName.Pip,
+                        )
             if (pipEnabled) {
                 exoPip.visibility = View.VISIBLE
                 exoPip.setOnClickListener {
@@ -1044,7 +1041,8 @@ class ExoplayerView :
                             }
                         }
 
-                        override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(false, event) else handleController()
+                        override fun onSingleClick(event: MotionEvent) =
+                            if (isSeeking) doubleTap(false, event) else handleController()
                     },
                 )
             val rewindArea = playerView.findViewById<View>(R.id.exo_rewind_area)
@@ -1079,7 +1077,8 @@ class ExoplayerView :
                             }
                         }
 
-                        override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(true, event) else handleController()
+                        override fun onSingleClick(event: MotionEvent) =
+                            if (isSeeking) doubleTap(true, event) else handleController()
                     },
                 )
             val forwardArea = playerView.findViewById<View>(R.id.exo_forward_area)
@@ -1449,7 +1448,8 @@ class ExoplayerView :
                         else -> mutableListOf()
                     }
                 val startTimestamp = Calendar.getInstance()
-                val durationInSeconds = if (exoPlayer.duration != C.TIME_UNSET) (exoPlayer.duration / 1000).toInt() else 1440
+                val durationInSeconds =
+                    if (exoPlayer.duration != C.TIME_UNSET) (exoPlayer.duration / 1000).toInt() else 1440
 
                 val endTimestamp =
                     Calendar.getInstance().apply {
@@ -1502,12 +1502,12 @@ class ExoplayerView :
         @Suppress("UNCHECKED_CAST")
         val list =
             (
-                PrefManager.getNullableCustomVal(
-                    "continueAnimeList",
-                    listOf<Int>(),
-                    List::class.java,
-                ) as List<Int>
-            ).toMutableList()
+                    PrefManager.getNullableCustomVal(
+                        "continueAnimeList",
+                        listOf<Int>(),
+                        List::class.java,
+                    ) as List<Int>
+                    ).toMutableList()
         if (list.contains(media.id)) list.remove(media.id)
         list.add(media.id)
         PrefManager.setCustomVal("continueAnimeList", list)
@@ -1567,7 +1567,11 @@ class ExoplayerView :
         subtitle = intent.getSerialized("subtitle")
             ?: when (
                 val subLang: String? =
-                    PrefManager.getNullableCustomVal("subLang_${media.id}", null, String::class.java)
+                    PrefManager.getNullableCustomVal(
+                        "subLang_${media.id}",
+                        null,
+                        String::class.java
+                    )
             ) {
                 null -> {
                     when (episode.selectedSubtitle) {
@@ -1575,8 +1579,12 @@ class ExoplayerView :
                         -1 ->
                             ext.subtitles.find {
                                 it.language.contains(lang, ignoreCase = true) ||
-                                    it.language.contains(getLanguageCode(lang), ignoreCase = true)
+                                        it.language.contains(
+                                            getLanguageCode(lang),
+                                            ignoreCase = true
+                                        )
                             }
+
                         else -> ext.subtitles.getOrNull(episode.selectedSubtitle!!)
                     }
                 }
@@ -1597,29 +1605,27 @@ class ExoplayerView :
             emptyList<MediaItem.SubtitleConfiguration>().toMutableList()
         ext.subtitles.forEach { subtitle ->
             val subtitleUrl = if (!hasExtSubtitles) video!!.file.url else subtitle.file.url
-            // var localFile: String? = null
             if (subtitle.type == SubtitleType.UNKNOWN) {
                 runBlocking {
                     val type = SubtitleDownloader.loadSubtitleType(subtitleUrl)
-                    val fileUri = Uri.parse(subtitleUrl)
+                    val fileUri = (subtitleUrl).toUri()
                     sub +=
                         MediaItem.SubtitleConfiguration
                             .Builder(fileUri)
                             .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
                             .setMimeType(
                                 when (type) {
-                                    SubtitleType.VTT -> MimeTypes.TEXT_SSA
+                                    SubtitleType.VTT -> MimeTypes.TEXT_VTT
                                     SubtitleType.ASS -> MimeTypes.TEXT_SSA
-                                    SubtitleType.SRT -> MimeTypes.TEXT_SSA
-                                    else -> MimeTypes.TEXT_SSA
+                                    SubtitleType.SRT -> MimeTypes.APPLICATION_SUBRIP
+                                    else -> MimeTypes.TEXT_UNKNOWN
                                 },
                             ).setId("69")
                             .setLanguage(subtitle.language)
                             .build()
                 }
-                println("sub: $sub")
             } else {
-                val subUri = Uri.parse(subtitleUrl)
+                val subUri = subtitleUrl.toUri()
                 sub +=
                     MediaItem.SubtitleConfiguration
                         .Builder(subUri)
@@ -1649,26 +1655,18 @@ class ExoplayerView :
                     followRedirects(true)
                     followSslRedirects(true)
                 }.build()
-        val dataSourceFactory =
-            DataSource.Factory {
-                val dataSource: HttpDataSource = OkHttpDataSource.Factory(httpClient).createDataSource()
-                defaultHeaders.forEach {
-                    dataSource.setRequestProperty(it.key, it.value)
+        val httpDataSourceFactory =
+            OkHttpDataSource.Factory(httpClient).apply {
+                setDefaultRequestProperties(defaultHeaders)
+                video?.file?.headers?.let {
+                    setDefaultRequestProperties(it)
                 }
-                video?.file?.headers?.forEach {
-                    dataSource.setRequestProperty(it.key, it.value)
-                }
-                dataSource
             }
-        val dafuckDataSourceFactory = DefaultDataSource.Factory(this)
+        val defaultDataSourceFactory = DefaultDataSource.Factory(this, httpDataSourceFactory)
         cacheFactory =
             CacheDataSource.Factory().apply {
                 setCache(VideoCache.getInstance(this@ExoplayerView))
-                if (ext.server.offline) {
-                    setUpstreamDataSourceFactory(dafuckDataSourceFactory)
-                } else {
-                    setUpstreamDataSourceFactory(dataSourceFactory)
-                }
+                setUpstreamDataSourceFactory(defaultDataSourceFactory)
                 setCacheWriteDataSinkFactory(null)
             }
 
@@ -1717,16 +1715,18 @@ class ExoplayerView :
                         val docFile =
                             directory.listFiles().firstOrNull {
                                 it.name?.endsWith(".mp4") == true ||
-                                    it.name?.endsWith(".mkv") == true ||
-                                    it.name?.endsWith(
-                                        ".${Injekt
-                                            .get<DownloadAddonManager>()
-                                            .extension
-                                            ?.extension
-                                            ?.getFileExtension()
-                                            ?.first ?: "ts"}",
-                                    ) ==
-                                    true
+                                        it.name?.endsWith(".mkv") == true ||
+                                        it.name?.endsWith(
+                                            ".${
+                                                Injekt
+                                                    .get<DownloadAddonManager>()
+                                                    .extension
+                                                    ?.extension
+                                                    ?.getFileExtension()
+                                                    ?.first ?: "ts"
+                                            }",
+                                        ) ==
+                                        true
                             }
                         if (docFile != null) {
                             val uri = docFile.uri
@@ -1840,30 +1840,30 @@ class ExoplayerView :
                     "%02d:%02d:%02d",
                     TimeUnit.MILLISECONDS.toHours(playbackPosition),
                     TimeUnit.MILLISECONDS.toMinutes(playbackPosition) -
-                        TimeUnit.HOURS.toMinutes(
-                            TimeUnit.MILLISECONDS.toHours(
-                                playbackPosition,
+                            TimeUnit.HOURS.toMinutes(
+                                TimeUnit.MILLISECONDS.toHours(
+                                    playbackPosition,
+                                ),
                             ),
-                        ),
                     TimeUnit.MILLISECONDS.toSeconds(playbackPosition) -
-                        TimeUnit.MINUTES.toSeconds(
-                            TimeUnit.MILLISECONDS.toMinutes(
-                                playbackPosition,
+                            TimeUnit.MINUTES.toSeconds(
+                                TimeUnit.MILLISECONDS.toMinutes(
+                                    playbackPosition,
+                                ),
                             ),
-                        ),
                 )
-                customAlertDialog().apply {
-                    setTitle(getString(R.string.continue_from, time))
-                    setCancelable(false)
-                    setPosButton(getString(R.string.yes)) {
-                        buildExoplayer()
-                    }
-                    setNegButton(getString(R.string.no)) {
-                        playbackPosition = 0L
-                        buildExoplayer()
-                    }
-                    show()
+            customAlertDialog().apply {
+                setTitle(getString(R.string.continue_from, time))
+                setCancelable(false)
+                setPosButton(getString(R.string.yes)) {
+                    buildExoplayer()
                 }
+                setNegButton(getString(R.string.no)) {
+                    playbackPosition = 0L
+                    buildExoplayer()
+                }
+                show()
+            }
         } else {
             buildExoplayer()
         }
@@ -1940,7 +1940,9 @@ class ExoplayerView :
 
                         val currentPosition = exoPlayer.currentPosition
 
-                        if ((lastSubtitle?.length ?: 0) < 20 || (lastPosition != 0L && currentPosition - lastPosition > 1500)) {
+                        if ((lastSubtitle?.length
+                                ?: 0) < 20 || (lastPosition != 0L && currentPosition - lastPosition > 1500)
+                        ) {
                             activeSubtitles.clear()
                         }
 
@@ -2187,7 +2189,7 @@ class ExoplayerView :
             currentTimeStamp =
                 model.timeStamps.value?.find { timestamp ->
                     timestamp.interval.startTime < playerCurrentTime &&
-                        playerCurrentTime < (timestamp.interval.endTime - 1)
+                            playerCurrentTime < (timestamp.interval.endTime - 1)
                 }
 
             val new = currentTimeStamp
@@ -2213,7 +2215,8 @@ class ExoplayerView :
                                 override fun onTick(millisUntilFinished: Long) {
                                     if (new == null) {
                                         skipTimeButton.visibility = View.GONE
-                                        exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0
+                                        exoSkip.isVisible =
+                                            PrefManager.getVal<Int>(PrefName.SkipTime) > 0
                                         disappeared = false
                                         functionstarted = false
                                         cancelTimer()
@@ -2222,7 +2225,8 @@ class ExoplayerView :
 
                                 override fun onFinish() {
                                     skipTimeButton.visibility = View.GONE
-                                    exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0
+                                    exoSkip.isVisible =
+                                        PrefManager.getVal<Int>(PrefName.SkipTime) > 0
                                     disappeared = true
                                     functionstarted = false
                                     cancelTimer()
@@ -2310,7 +2314,7 @@ class ExoplayerView :
         tracks.groups.forEach {
             println(
                 "Track__: $it\nTrack__: ${it.length}\nTrack__: ${it.isSelected}\n" +
-                    "Track__: ${it.type}\nTrack__: ${it.mediaTrackGroup.id}",
+                        "Track__: ${it.type}\nTrack__: ${it.mediaTrackGroup.id}",
             )
             when (it.type) {
                 TRACK_TYPE_AUDIO -> {
@@ -2365,7 +2369,7 @@ class ExoplayerView :
         when (error.errorCode) {
             PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
             PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
-            -> {
+                -> {
                 toast("Source Exception : ${error.message}")
                 isPlayerPlaying = true
                 sourceClick()
@@ -2403,9 +2407,9 @@ class ExoplayerView :
         val incognito: Boolean = PrefManager.getVal(PrefName.Incognito)
         val episodeEnd =
             exoPlayer.currentPosition / episodeLength >
-                PrefManager.getVal<Float>(
-                    PrefName.WatchPercentage,
-                )
+                    PrefManager.getVal<Float>(
+                        PrefName.WatchPercentage,
+                    )
         val episode0 = currentEpisodeIndex == 0 && PrefManager.getVal(PrefName.ChapterZeroPlayer)
         if (!incognito && (episodeEnd || episode0) && Anilist.userid != null
         ) {
@@ -2484,7 +2488,7 @@ class ExoplayerView :
         val videoURL = video?.file?.url ?: return
         val subtitleUrl = if (!hasExtSubtitles) video!!.file.url else subtitle!!.file.url
         val shareVideo = Intent(Intent.ACTION_VIEW)
-        shareVideo.setDataAndType(Uri.parse(videoURL), "video/*")
+        shareVideo.setDataAndType(videoURL.toUri(), "video/*")
         shareVideo.setPackage("com.instantbits.cast.webvideo")
         if (subtitle != null) shareVideo.putExtra("subtitle", subtitleUrl)
         shareVideo.putExtra(
@@ -2506,7 +2510,7 @@ class ExoplayerView :
         } catch (ex: ActivityNotFoundException) {
             val intent = Intent(Intent.ACTION_VIEW)
             val uriString = "market://details?id=com.instantbits.cast.webvideo"
-            intent.data = Uri.parse(uriString)
+            intent.data = uriString.toUri()
             startActivity(intent)
         }
     }
diff --git a/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt b/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
index fa1fa9a2..0f2a438a 100644
--- a/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
@@ -646,7 +646,6 @@ class VideoServerPassthrough(private val videoServer: VideoServer) : VideoExtrac
     }
 
     private fun trackToSubtitle(track: Track): Subtitle {
-        //use Dispatchers.IO to make a HTTP request to determine the subtitle type
         var type: SubtitleType?
         runBlocking {
             type = findSubtitleType(track.url)

From baffbc845cfdbe42a8672f4ebb453e99edc1d39c Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Thu, 15 May 2025 01:16:23 -0500
Subject: [PATCH 06/12] fix: help bounds check /w custom speeds

---
 app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index b2503c28..e3a27cf3 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1308,7 +1308,7 @@ class ExoplayerView :
                 setTitle(R.string.speed)
                 singleChoiceItems(speedsName, curSpeed) { i ->
                     PrefManager.setCustomVal("${media.id}_speed", i)
-                    speed = speeds[i]
+                    speed = speeds.getOrNull(i) ?: 1f
                     curSpeed = i
                     playbackParameters = PlaybackParameters(speed)
                     exoPlayer.playbackParameters = playbackParameters

From 61a8350043d5f66a97d5b29bdd1298bcdca24edf Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Thu, 15 May 2025 01:47:06 -0500
Subject: [PATCH 07/12] fix: avoid waiting on network for local exts

---
 app/src/main/java/ani/dantotsu/App.kt         | 19 +++++++++++++------
 .../java/ani/dantotsu/parsers/AnimeSources.kt |  1 -
 .../extension/api/ExtensionGithubApi.kt       |  7 ++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/App.kt b/app/src/main/java/ani/dantotsu/App.kt
index 057c6d22..0b5751e0 100644
--- a/app/src/main/java/ani/dantotsu/App.kt
+++ b/app/src/main/java/ani/dantotsu/App.kt
@@ -113,21 +113,28 @@ class App : MultiDexApplication() {
             }
         }
 
-        CoroutineScope(Dispatchers.IO).launch {
+        val scope = CoroutineScope(Dispatchers.IO)
+        scope.launch {
             animeExtensionManager = Injekt.get()
-            animeExtensionManager.findAvailableExtensions()
+            launch {
+                animeExtensionManager.findAvailableExtensions()
+            }
             Logger.log("Anime Extensions: ${animeExtensionManager.installedExtensionsFlow.first()}")
             AnimeSources.init(animeExtensionManager.installedExtensionsFlow)
         }
-        CoroutineScope(Dispatchers.IO).launch {
+        scope.launch {
             mangaExtensionManager = Injekt.get()
-            mangaExtensionManager.findAvailableExtensions()
+            launch {
+                mangaExtensionManager.findAvailableExtensions()
+            }
             Logger.log("Manga Extensions: ${mangaExtensionManager.installedExtensionsFlow.first()}")
             MangaSources.init(mangaExtensionManager.installedExtensionsFlow)
         }
-        CoroutineScope(Dispatchers.IO).launch {
+        scope.launch {
             novelExtensionManager = Injekt.get()
-            novelExtensionManager.findAvailableExtensions()
+            launch {
+                novelExtensionManager.findAvailableExtensions()
+            }
             Logger.log("Novel Extensions: ${novelExtensionManager.installedExtensionsFlow.first()}")
             NovelSources.init(novelExtensionManager.installedExtensionsFlow)
         }
diff --git a/app/src/main/java/ani/dantotsu/parsers/AnimeSources.kt b/app/src/main/java/ani/dantotsu/parsers/AnimeSources.kt
index f343d70b..f534ce6b 100644
--- a/app/src/main/java/ani/dantotsu/parsers/AnimeSources.kt
+++ b/app/src/main/java/ani/dantotsu/parsers/AnimeSources.kt
@@ -26,7 +26,6 @@ object AnimeSources : WatchSources() {
         )
         isInitialized = true
 
-        // Update as StateFlow emits new values
         fromExtensions.collect { extensions ->
             list = sortPinnedAnimeSources(
                 createParsersFromExtensions(extensions),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
index a57f1f7d..4b0ce517 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.extension.api
 
+import ani.dantotsu.asyncMap
 import ani.dantotsu.parsers.novel.AvailableNovelSources
 import ani.dantotsu.parsers.novel.NovelExtension
 import ani.dantotsu.settings.saving.PrefManager
@@ -67,7 +68,7 @@ internal class ExtensionGithubApi {
             val repos =
                 PrefManager.getVal<Set<String>>(PrefName.AnimeExtensionRepos).toMutableList()
 
-            repos.forEach {
+            repos.asyncMap {
                 val repoUrl = if (it.contains("index.min.json")) {
                     it
                 } else {
@@ -155,7 +156,7 @@ internal class ExtensionGithubApi {
             val repos =
                 PrefManager.getVal<Set<String>>(PrefName.MangaExtensionRepos).toMutableList()
 
-            repos.forEach {
+            repos.asyncMap {
                 val repoUrl = if (it.contains("index.min.json")) {
                     it
                 } else {
@@ -207,7 +208,7 @@ internal class ExtensionGithubApi {
             val repos =
                 PrefManager.getVal<Set<String>>(PrefName.NovelExtensionRepos).toMutableList()
 
-            repos.forEach {
+            repos.asyncMap {
                 val repoUrl = if (it.contains("index.min.json")) {
                     it
                 } else {

From e83a0fe7da5bbf90d0393296670cc08629dcc563 Mon Sep 17 00:00:00 2001
From: Ankit Grai <ankigray@outlook.com>
Date: Mon, 19 May 2025 17:11:24 +0530
Subject: [PATCH 08/12] fix : long press progress dialog reset not working
 (#603)

---
 app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index e3a27cf3..98cc43da 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1358,7 +1358,7 @@ class ExoplayerView :
         val showProgressDialog =
             if (PrefManager.getVal(PrefName.AskIndividualPlayer)) {
                 PrefManager.getCustomVal(
-                    "${media.id}_ProgressDialog",
+                    "${media.id}_progressDialog",
                     true,
                 )
             } else {

From 5124d6a2d871de1bc6b9f26fccaff58418cc7ae6 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Thu, 22 May 2025 12:50:06 +0530
Subject: [PATCH 09/12] fix: discord login

---
 app/src/main/java/ani/dantotsu/connections/discord/Login.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/connections/discord/Login.kt b/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
index 513da55b..f33c03e9 100644
--- a/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
+++ b/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
@@ -47,9 +47,9 @@ class Login : AppCompatActivity() {
                         view.evaluateJavascript(
                             """
                     (function() {
-                        const wreq = (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken();
-                        return wreq;
-                    })()
+    const m = []; webpackChunkdiscord_app.push([[""], {}, e => {for (let c in e.c)m.push(e.c[c])}]);
+    return m.find(n => n?.exports?.default?.getToken !== void 0)?.exports?.default?.getToken();
+})()
                 """.trimIndent()
                         ) { result ->
                             login(result.trim('"'))

From c3f6d0ecee9920ebd4e3def4563e200d1417d7bf Mon Sep 17 00:00:00 2001
From: Ankit Grai <ankigray@outlook.com>
Date: Thu, 22 May 2025 12:51:18 +0530
Subject: [PATCH 10/12] fix : dialog key names (#605)

---
 app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index 98cc43da..75332806 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1380,7 +1380,7 @@ class ExoplayerView :
                 setCancelable(false)
                 setPosButton(R.string.yes) {
                     PrefManager.setCustomVal(
-                        "${media.id}_ProgressDialog",
+                        "${media.id}_progressDialog",
                         false,
                     )
                     PrefManager.setCustomVal(
@@ -1391,7 +1391,7 @@ class ExoplayerView :
                 }
                 setNegButton(R.string.no) {
                     PrefManager.setCustomVal(
-                        "${media.id}_ProgressDialog",
+                        "${media.id}_progressDialog",
                         false,
                     )
                     PrefManager.setCustomVal(

From fd607d98f8cc08d937a0864201e88cb739e4c9b3 Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Fri, 23 May 2025 08:02:13 -0500
Subject: [PATCH 11/12] fix: bottom bar padding

---
 app/build.gradle                                       |  2 +-
 .../java/ani/dantotsu/media/MediaDetailsActivity.kt    |  2 +-
 app/src/main/res/layout-land/activity_media.xml        |  9 ++++++++-
 app/src/main/res/layout/activity_media.xml             | 10 +++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1f4997d3..535d8922 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdk 21
         targetSdk 35
         versionCode((System.currentTimeMillis() / 60000).toInteger())
-        versionName "3.2.1"
+        versionName "3.2.2"
         versionCode versionName.split("\\.").collect { it.toInteger() * 100 }.join("") as Integer
         signingConfig signingConfigs.debug
 
diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
index 852d4ef6..1e1d2e19 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
@@ -139,7 +139,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         val navBarBottomMargin = if (resources.configuration.orientation ==
             Configuration.ORIENTATION_LANDSCAPE
         ) 0 else navBarHeight
-        navBar.setPadding(
+        binding.mediaBottomBarContainer.setPadding(
             navBar.paddingLeft,
             navBar.paddingTop,
             navBar.paddingRight + navBarRightMargin,
diff --git a/app/src/main/res/layout-land/activity_media.xml b/app/src/main/res/layout-land/activity_media.xml
index fb9c6cb7..17633d7a 100644
--- a/app/src/main/res/layout-land/activity_media.xml
+++ b/app/src/main/res/layout-land/activity_media.xml
@@ -419,13 +419,19 @@
         </LinearLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    <FrameLayout
+        android:id="@+id/mediaBottomBarContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="0"
+        android:background="?attr/colorSurface"
+        android:layout_gravity="center_horizontal|bottom">
 
     <nl.joery.animatedbottombar.AnimatedBottomBar
         android:id="@+id/mediaBottomBar"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal|bottom"
-        android:layout_weight="0"
         android:background="?attr/colorSurface"
         android:padding="0dp"
         app:abb_animationInterpolator="@anim/over_shoot"
@@ -438,5 +444,6 @@
         app:itemTextAppearanceActive="@style/NavBarText"
         app:itemTextAppearanceInactive="@style/NavBarText"
         app:itemTextColor="@color/tab_layout_icon" />
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 89d856c9..a6690a1f 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -353,11 +353,18 @@
             </LinearLayout>
         </LinearLayout>
 
+        <FrameLayout
+            android:id="@+id/mediaBottomBarContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorSurface"
+            android:layout_gravity="center_horizontal|bottom">
+
         <nl.joery.animatedbottombar.AnimatedBottomBar
             android:id="@+id/mediaBottomBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
+            android:layout_gravity="center_horizontal|top"
             android:background="?attr/colorSurface"
             android:padding="0dp"
             app:abb_animationInterpolator="@anim/over_shoot"
@@ -371,6 +378,7 @@
             app:itemTextAppearanceActive="@style/NavBarText"
             app:itemTextAppearanceInactive="@style/NavBarText"
             app:itemTextColor="@color/tab_layout_icon" />
+        </FrameLayout>
 
     </LinearLayout>
 

From 1fbbe3e77c473c9e30cee6167834f13c24fdb577 Mon Sep 17 00:00:00 2001
From: rebel onion <87634197+rebelonion@users.noreply.github.com>
Date: Fri, 23 May 2025 08:20:41 -0500
Subject: [PATCH 12/12] fix: replace runBlocking with non-blocking async
 operations

---
 app/src/main/java/ani/dantotsu/Network.kt | 42 ++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/Network.kt b/app/src/main/java/ani/dantotsu/Network.kt
index ce536e8d..f9d8b7f2 100644
--- a/app/src/main/java/ani/dantotsu/Network.kt
+++ b/app/src/main/java/ani/dantotsu/Network.kt
@@ -11,7 +11,11 @@ import com.lagradost.nicehttp.addGenericDns
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.NetworkHelper.Companion.defaultUserAgentProvider
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -85,12 +89,42 @@ object Mapper : ResponseParser {
     }
 }
 
-fun <A, B> Collection<A>.asyncMap(f: suspend (A) -> B): List<B> = runBlocking {
-    map { async { f(it) } }.map { it.await() }
+/**
+ * Performs parallel processing of collection items without blocking threads.
+ * Each operation runs in its own coroutine on the specified dispatcher.
+ *
+ * @param dispatcher The CoroutineDispatcher to use for parallel operations (defaults to IO)
+ * @param f The suspend function to apply to each item
+ * @return List of results in the same order as the original collection
+ */
+suspend fun <A, B> Collection<A>.asyncMap(
+    dispatcher: CoroutineDispatcher = Dispatchers.IO,
+    f: suspend (A) -> B
+): List<B> = coroutineScope {
+    map { item ->
+        async(dispatcher) {
+            f(item)
+        }
+    }.awaitAll()
 }
 
-fun <A, B> Collection<A>.asyncMapNotNull(f: suspend (A) -> B?): List<B> = runBlocking {
-    map { async { f(it) } }.mapNotNull { it.await() }
+/**
+ * Performs parallel processing of collection items without blocking threads,
+ * filtering out null results.
+ *
+ * @param dispatcher The CoroutineDispatcher to use for parallel operations (defaults to IO)
+ * @param f The suspend function to apply to each item
+ * @return List of non-null results in the same order as the original collection
+ */
+suspend fun <A, B> Collection<A>.asyncMapNotNull(
+    dispatcher: CoroutineDispatcher = Dispatchers.IO,
+    f: suspend (A) -> B?
+): List<B> = coroutineScope {
+    map { item ->
+        async(dispatcher) {
+            f(item)
+        }
+    }.mapNotNull { it.await() }
 }
 
 fun logError(e: Throwable, post: Boolean = true, snackbar: Boolean = true) {