Merge branch 'master' of https://github.com/recloudstream/cloudstream into account-changes

.github/workflows/prerelease.yml

@@ -43,7 +43,8 @@ jobs:
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
     - name: Run Gradle
       run: |
-        ./gradlew assemblePrerelease makeJar androidSourcesJar
+        ./gradlew assemblePrerelease build androidSourcesJar
+        ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}

.idea/gradle.xml

@@ -8,6 +8,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

app/build.gradle.kts

@@ -1,10 +1,12 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 import java.net.URL
 
 plugins {
     id("com.android.application")
+    id("com.google.devtools.ksp")
     id("kotlin-android")
     id("kotlin-kapt")
     id("org.jetbrains.dokka")
@@ -87,6 +89,11 @@ android {
         )
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("exportSchema", "true")
+        }
+
         kapt {
             includeCompileClasspath = true
         }
@@ -127,10 +134,6 @@ android {
             versionCode = (System.currentTimeMillis() / 60000).toInt()
         }
     }
-    //toolchain {
-    //     languageVersion.set(JavaLanguageVersion.of(17))
-    // }
-    // jvmToolchain(17)
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -138,10 +141,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=compatibility")
-    }
     lint {
         abortOnError = false
         checkReleaseBuilds = false
@@ -181,9 +180,13 @@ dependencies {
 
     implementation("androidx.preference:preference-ktx:1.2.1")
 
-    implementation("com.github.bumptech.glide:glide:4.13.1")
+    implementation("com.github.bumptech.glide:glide:4.15.1")
-    kapt("com.github.bumptech.glide:compiler:4.13.1")
+    ksp("com.github.bumptech.glide:ksp:4.15.1")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.13.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.1")
+    // for ksp
+    ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
+    implementation("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
+    implementation("com.google.guava:guava:32.1.2-android")
 
     implementation("jp.wasabeef:glide-transformations:4.3.0")
 
@@ -207,9 +210,6 @@ dependencies {
     implementation("ch.acra:acra-core:5.11.2")
     implementation("ch.acra:acra-toast:5.11.2")
 
-    compileOnly("com.google.auto.service:auto-service-annotations:1.1.1")
-    //either for java sources:
-    annotationProcessor("com.google.auto.service:auto-service:1.1.1")
     //or for kotlin sources (requires kapt gradle plugin):
     kapt("com.google.auto.service:auto-service:1.1.1")
 
@@ -276,7 +276,13 @@ tasks.register("makeJar", Copy::class) {
     from("build/intermediates/compile_app_classes_jar/prereleaseDebug")
     into("build")
     include("classes.jar")
-    dependsOn("build")
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+    }
 }
 
 tasks.withType<DokkaTask>().configureEach {

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" /> <!-- unless you only use cs3 as a player for downloaded stuff, you need this -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- Downloads -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Downloads on low api devices -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- Plugin API -->
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" /> <!-- Plugin API -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- some dependency needs this -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
@@ -17,7 +17,11 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages  -->
+    <!-- Required for getting arbitrary Aniyomi packages  -->
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -37,9 +41,11 @@
     <application
         android:name=".AcraApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:appCategory="video"
         android:banner="@mipmap/ic_banner"
         android:fullBackupContent="@xml/backup_descriptor"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
@@ -47,7 +53,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="o">
+        tools:targetApi="tiramisu">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -181,8 +187,8 @@
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
-            android:exported="true">
+            android:exported="false">
-            <intent-filter android:exported="true">
+            <intent-filter android:exported="false">
                 <action android:name="restart_service" />
             </intent-filter>
         </receiver>

app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.google.auto.service.AutoService
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -37,7 +36,6 @@ import java.lang.ref.WeakReference
 import kotlin.concurrent.thread
 import kotlin.system.exitProcess
 
-
 class CustomReportSender : ReportSender {
     // Sends all your crashes to google forms
     override fun send(context: Context, errorContent: CrashReportData) {
@@ -65,7 +63,6 @@ class CustomReportSender : ReportSender {
     }
 }
 
-@AutoService(ReportSenderFactory::class)
 class CustomSenderFactory : ReportSenderFactory {
     override fun create(context: Context, config: CoreConfiguration): ReportSender {
         return CustomReportSender()

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -19,6 +19,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
 import androidx.annotation.MainThread
@@ -132,7 +133,6 @@ import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.IOnBackPressed
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
@@ -654,34 +654,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         builder.show().setDefaultFocus()
     }
 
-    private fun backPressed() {
-        this.window?.navigationBarColor =
-            this.colorFromAttribute(R.attr.primaryGrayBackground)
-        this.updateLocale()
-        this.updateLocale()
-
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
-        val navController = navHostFragment?.navController
-        val isAtHome =
-            navController?.currentDestination?.matchDestination(R.id.navigation_home) == true
-
-        if (isAtHome && isTvSettings()) {
-            showConfirmExitDialog()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-    override fun onBackPressed() {
-        ((supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?)?.childFragmentManager?.primaryNavigationFragment as? IOnBackPressed)?.onBackPressed()
-            ?.let { runNormal ->
-                if (runNormal) backPressed()
-            } ?: run {
-            backPressed()
-        }
-    }
-
     override fun onDestroy() {
         val broadcastIntent = Intent()
         broadcastIntent.action = "restart_service"
@@ -1091,6 +1063,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         } catch (_: Throwable) {
         }
     }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@@ -1388,6 +1361,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                     this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery)
                 }
             }
+
+            if (isTvSettings()) {
+                if (navDestination.matchDestination(R.id.navigation_home)) {
+                    attachBackPressedCallback()
+                } else detachBackPressedCallback()
+            }
         }
 
         //val navController = findNavController(R.id.nav_host_fragment)
@@ -1602,6 +1581,44 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 //            }
 //        }
 
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground)
+                    updateLocale()
+
+                    // If we don't disable we end up in a loop with default behavior calling
+                    // this callback as well, so we disable it, run default behavior,
+                    // then re-enable this callback so it can be used for next back press.
+                    isEnabled = false
+                    onBackPressedDispatcher.onBackPressed()
+                    isEnabled = true
+                }
+            }
+        )
+    }
+
+    private var backPressedCallback: OnBackPressedCallback? = null
+
+    private fun attachBackPressedCallback() {
+        if (backPressedCallback == null) {
+            backPressedCallback = object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    showConfirmExitDialog()
+                    window?.navigationBarColor =
+                        colorFromAttribute(R.attr.primaryGrayBackground)
+                    updateLocale()
+                }
+            }
+        }
+
+        backPressedCallback?.isEnabled = true
+        onBackPressedDispatcher.addCallback(this, backPressedCallback ?: return)
+    }
+
+    private fun detachBackPressedCallback() {
+        backPressedCallback?.isEnabled = false
     }
 
     suspend fun checkGithubConnectivity(): Boolean {

app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt

@@ -16,13 +16,13 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-// No License found in https://github.com/enimax-anime/key
+// Code found in https://github.com/theonlymo/keys
-// special credits to @enimax for providing key
+// special credits to @theonlymo for providing key
 class Megacloud : Rabbitstream() {
     override val name = "Megacloud"
     override val mainUrl = "https://megacloud.tv"
     override val embed = "embed-2/ajax/e-1"
-    override val key = "https://raw.githubusercontent.com/enimax-anime/key/e6/key.txt"
+    override val key = "https://raw.githubusercontent.com/theonlymo/keys/e1/key"
 }
 
 class Dokicloud : Rabbitstream() {
@@ -35,7 +35,7 @@ open class Rabbitstream : ExtractorApi() {
     override val mainUrl = "https://rabbitstream.net"
     override val requiresReferer = false
     open val embed = "ajax/embed-4"
-    open val key = "https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt"
+    open val key = "https://raw.githubusercontent.com/theonlymo/keys/e4/key"
 
     override suspend fun getUrl(
         url: String,
@@ -86,21 +86,23 @@ open class Rabbitstream : ExtractorApi() {
 
     private suspend fun getRawKey(): String = app.get(key).text
 
-    private fun extractRealKey(originalString: String?, stops: String): Pair<String, String> {
+    private fun extractRealKey(sources: String, stops: String): Pair<String, String> {
-        val table = parseJson<List<List<Int>>>(stops)
+        val decryptKey = parseJson<List<List<Int>>>(stops)
-        val decryptedKey = StringBuilder()
+        val sourcesArray = sources.toCharArray()
-        var offset = 0
-        var encryptedString = originalString
 
-        table.forEach { (start, end) ->
+        var extractedKey = ""
-            decryptedKey.append(encryptedString?.substring(start - offset, end - offset))
+        var currentIndex = 0
-            encryptedString = encryptedString?.substring(
+        for (index in decryptKey) {
-                0,
+            val start = index[0] + currentIndex
-                start - offset
+            val end = start + index[1]
-            ) + encryptedString?.substring(end - offset)
+            for (i in start until end) {
-            offset += end - start
+                extractedKey += sourcesArray[i].toString()
+                sourcesArray[i] = ' '
+            }
+            currentIndex += index[1]
         }
-        return decryptedKey.toString() to encryptedString.toString()
+
+        return extractedKey to sourcesArray.joinToString("")
     }
 
     private inline fun <reified T> decryptMapped(input: String, key: String): T? {

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt

@@ -60,7 +60,7 @@ class DownloadChildFragment : Fragment() {
                 }
             }.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
             if (eps.isEmpty()) {
-                activity?.onBackPressed()
+                activity?.onBackPressedDispatcher?.onBackPressed()
                 return@main
             }
 
@@ -78,7 +78,7 @@ class DownloadChildFragment : Fragment() {
         val folder = arguments?.getString("folder")
         val name = arguments?.getString("name")
         if (folder == null) {
-            activity?.onBackPressed() // TODO FIX
+            activity?.onBackPressedDispatcher?.onBackPressed() // TODO FIX
             return
         }
         fixPaddingStatusbar(binding?.downloadChildRoot)
@@ -87,7 +87,7 @@ class DownloadChildFragment : Fragment() {
             title = name
             setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
             setNavigationOnClickListener {
-                activity?.onBackPressed()
+                activity?.onBackPressedDispatcher?.onBackPressed()
             }
         }
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt

@@ -1254,7 +1254,7 @@ class CS3IPlayer : IPlayer {
                 .setMimeType(sub.mimeType)
                 .setLanguage("_${sub.name}")
                 .setId(sub.getId())
-                .setSelectionFlags(SELECTION_FLAG_DEFAULT)
+                .setSelectionFlags(0)
                 .build()
             when (sub.origin) {
                 SubtitleOrigin.DOWNLOADED_FILE -> {

app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt

@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
@@ -34,10 +35,6 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         CommonActivity.onUserLeaveHint(this)
     }
 
-    override fun onBackPressed() {
-        finish()
-    }
-
     private fun playLink(url: String) {
         this.navigate(
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
@@ -109,6 +106,15 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             finish()
             return
         }
+
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    finish()
+                }
+            }
+        )
     }
 
     override fun onResume() {

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
@@ -15,10 +16,8 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
 import com.lagradost.cloudstream3.ui.player.PlayerEventSource
 import com.lagradost.cloudstream3.ui.player.SubtitleData
-import com.lagradost.cloudstream3.utils.IOnBackPressed
 
-
+open class ResultTrailerPlayer : ResultFragmentPhone() {
-open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
@@ -28,7 +27,7 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
         const val TAG = "RESULT_TRAILER"
     }
 
-    var playerWidthHeight: Pair<Int, Int>? = null
+    private var playerWidthHeight: Pair<Int, Int>? = null
 
     override fun nextEpisode() {}
 
@@ -154,6 +153,10 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
         }
         fixPlayerSize()
         uiReset()
+
+        if (isFullScreenPlayer) {
+            attachBackPressedCallback()
+        } else detachBackPressedCallback()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -172,12 +175,26 @@ open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
         }
     }
 
-    override fun onBackPressed(): Boolean {
+    private var backPressedCallback: OnBackPressedCallback? = null
-        return if (isFullScreenPlayer) {
+
-            updateFullscreen(false)
+    private fun attachBackPressedCallback() {
-            false
+        if (backPressedCallback == null) {
-        } else {
+            backPressedCallback = object : OnBackPressedCallback(true) {
-            true
+                override fun handleOnBackPressed() {
+                    updateFullscreen(false)
+                }
+            }
         }
+
+        backPressedCallback?.isEnabled = true
+
+        activity?.onBackPressedDispatcher?.addCallback(
+            activity ?: return,
+            backPressedCallback ?: return
+        )
+    }
+
+    private fun detachBackPressedCallback() {
+        backPressedCallback?.isEnabled = false
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt

@@ -65,6 +65,15 @@ class SettingsFragment : Fragment() {
                 }
             }
         }
+        fun Fragment?.setToolBarScrollFlags() {
+            if (isTvSettings()) {
+                val settingsAppbar = this?.view?.findViewById<MaterialToolbar>(R.id.settings_toolbar)
+
+                settingsAppbar?.updateLayoutParams<AppBarLayout.LayoutParams> {
+                    scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
+                }
+            }
+        }
         fun Fragment?.setUpToolbar(title: String) {
             if (this == null) return
             val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
@@ -73,7 +82,7 @@ class SettingsFragment : Fragment() {
                 setTitle(title)
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                 setNavigationOnClickListener {
-                    activity?.onBackPressed()
+                    activity?.onBackPressedDispatcher?.onBackPressed()
                 }
             }
             fixPaddingStatusbar(settingsToolbar)
@@ -88,7 +97,7 @@ class SettingsFragment : Fragment() {
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                 children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
                 setNavigationOnClickListener {
-                    activity?.onBackPressed()
+                    activity?.onBackPressedDispatcher?.onBackPressed()
                 }
             }
             fixPaddingStatusbar(settingsToolbar)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt

@@ -30,6 +30,7 @@ import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppUtils.downloadAllPluginsDialog
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
@@ -85,7 +86,7 @@ class ExtensionsFragment : Fragment() {
         //context?.fixPaddingStatusbar(extensions_root)
 
         setUpToolbar(R.string.extensions)
-
+        setToolBarScrollFlags()
 
         binding?.repoRecyclerView?.apply {
             setLinearListLayout(

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt

@@ -21,7 +21,6 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueT
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.GlideApp
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -87,7 +86,7 @@ class PluginAdapter(
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
         if (holder is PluginViewHolder) {
             holder.binding.entryIcon.let { pluginIcon ->
-                GlideApp.with(pluginIcon).clear(pluginIcon)
+                com.bumptech.glide.Glide.with(pluginIcon).clear(pluginIcon)
             }
         }
         super.onViewRecycled(holder)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt

@@ -18,6 +18,7 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
@@ -69,10 +70,11 @@ class PluginsFragment : Fragment() {
         val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
 
         if (url == null || name == null) {
-            activity?.onBackPressed()
+            activity?.onBackPressedDispatcher?.onBackPressed()
             return
         }
 
+        setToolBarScrollFlags()
         setUpToolbar(name)
         binding?.settingsToolbar?.apply {
             setOnMenuItemClickListener { menuItem ->
@@ -117,7 +119,7 @@ class PluginsFragment : Fragment() {
                 if (searchView?.isIconified == false) {
                     searchView.isIconified = true
                 } else {
-                    activity?.onBackPressed()
+                    activity?.onBackPressedDispatcher?.onBackPressed()
                 }
             }
             searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->

app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt

@@ -12,6 +12,7 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 
 
@@ -27,6 +28,7 @@ class TestFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setUpToolbar(R.string.category_provider_test)
+        setToolBarScrollFlags()
         super.onViewCreated(view, savedInstanceState)
 
         binding?.apply {

app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt

@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import android.net.Uri
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.USER_AGENT
@@ -377,7 +378,8 @@ open class ExtractorLink constructor(
 ) : VideoDownloadManager.IDownloadableMinimum {
     val isM3u8 : Boolean get() = type == ExtractorLinkType.M3U8
     val isDash : Boolean get() = type == ExtractorLinkType.DASH
-
+    
+    @JsonIgnore
     fun getAllHeaders() : Map<String, String> {
         if (referer.isBlank()) {
             return headers
@@ -920,4 +922,4 @@ abstract class ExtractorApi {
     open fun getExtractorUrl(id: String): String {
         return id
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/utils/IOnBackPressed.kt

@@ -1,5 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-interface IOnBackPressed {
-    fun onBackPressed(): Boolean
-}

app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt

@@ -301,7 +301,7 @@ object UIHelper {
             } ?: return false
 
         return try {
-            var builder = GlideApp.with(this)
+            var builder = com.bumptech.glide.Glide.with(this)
                 .load(glideImage)
                 .skipMemoryCache(true)
                 .diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
@@ -368,7 +368,7 @@ object UIHelper {
     ) {
         if (this == null || url.isNullOrBlank()) return
         try {
-            val res = GlideApp.with(this)
+            val res = com.bumptech.glide.Glide.with(this)
                 .load(GlideUrl(url) { headers ?: emptyMap() })
                 .apply(bitmapTransform(BlurTransformation(radius, sample)))
                 .transition(
@@ -418,7 +418,7 @@ object UIHelper {
     }
 
     fun FragmentActivity.popCurrentPage() {
-        this.onBackPressed()
+        this.onBackPressedDispatcher.onBackPressed()
         /*val currentFragment = supportFragmentManager.fragments.lastOrNull {
             it.isVisible
         } ?: return
@@ -438,7 +438,7 @@ object UIHelper {
         val currentFragment = supportFragmentManager.fragments.lastOrNull {
             it.isVisible
         }
-            ?: //this.onBackPressed()
+            ?: //this.onBackPressedDispatcher.onBackPressed()
             return
 
 /*

app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt

@@ -234,7 +234,7 @@ object VideoDownloadManager {
                 return cachedBitmaps[url]
             }
 
-            val bitmap = GlideApp.with(this)
+            val bitmap = com.bumptech.glide.Glide.with(this)
                 .asBitmap()
                 .load(GlideUrl(url) { headers ?: emptyMap() })
                 .into(720, 720)

app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+</data-extraction-rules>

build.gradle.kts

@@ -5,10 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        // we stay on low ver because prerelease build gradle is fucked
+        classpath("com.android.tools.build:gradle:8.1.3")
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle.kts files
@@ -22,6 +21,10 @@ allprojects {
     }
 }
 
+plugins {
+    id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false
+}
+
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME