themes and various bugs

app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt

@@ -6,6 +6,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import okhttp3.Headers
 import rx.subjects.Subject
+import java.io.IOException
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
 import java.io.Serializable
 
 data class Track(val url: String, val lang: String)
@@ -14,12 +17,15 @@ open class Video(
     val url: String = "",
     val quality: String = "",
     var videoUrl: String? = null,
-    val headers: Headers? = null,
+    headers: Headers? = null,
     // "url", "language-label-2", "url2", "language-label-2"
     val subtitleTracks: List<Track> = emptyList(),
     val audioTracks: List<Track> = emptyList(),
 ) : Serializable, ProgressListener {
 
+    @Transient
+    var headers: Headers? = headers
+
     @Suppress("UNUSED_PARAMETER")
     constructor(
         url: String,
@@ -90,4 +96,27 @@ open class Video(
         READY,
         ERROR,
     }
+
+    @Throws(IOException::class)
+    private fun writeObject(out: ObjectOutputStream) {
+        out.defaultWriteObject()
+        val headersMap: Map<String, List<String>> = headers?.toMultimap() ?: emptyMap()
+        out.writeObject(headersMap)
+    }
+
+    @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)
+                }
+            }
+            builder.build()
+        }
+
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallActivity.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.extension.anime.util
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import ani.dantotsu.themes.ThemeManager
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
@@ -24,6 +25,7 @@ class AnimeExtensionInstallActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
             .setDataAndType(intent.data, intent.type)

app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallActivity.kt

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.extension.manga.util
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import ani.dantotsu.themes.ThemeManager
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
@@ -24,6 +25,7 @@ class MangaExtensionInstallActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
 
         val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
             .setDataAndType(intent.data, intent.type)

app/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt

@@ -13,7 +13,7 @@ class NetworkPreferences(
     }
 
     fun dohProvider(): Preference<Int> {
-        return preferenceStore.getInt("doh_provider", 1)
+        return preferenceStore.getInt("doh_provider", 0)
     }
 
     fun defaultUserAgent(): Preference<String> {