Merge branch 'recloudstream:master' into master

.github/workflows/generate_dokka.yml

@@ -39,9 +39,8 @@ jobs:
       
       - name: Clean old builds
         run: |
-          shopt -s extglob
           cd $GITHUB_WORKSPACE/dokka/
-          rm -rf !(.git)
+          rm -rf "./-cloudstream"
 
       - name: Setup JDK 11
         uses: actions/setup-java@v1

.github/workflows/prerelease.yml

@@ -43,9 +43,7 @@ jobs:
         echo "::set-output name=key_pwd::$KEY_PWD"
     - name: Run Gradle
       run: |
-        ./gradlew assemblePrerelease
+        ./gradlew assemblePrerelease makeJar androidSourcesJar
-        ./gradlew androidSourcesJar
-        ./gradlew makeJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}

app/build.gradle

@@ -206,10 +206,28 @@ task androidSourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs//full sources
 }
 
+// this is used by the gradlew plugin
 task makeJar(type: Copy) {
-    // after modifying here, you can export. Jar
     from('build/intermediates/compile_app_classes_jar/debug')
-    into('build') // output location
+    into('build')
-    include('classes.jar') // the classes file of the imported rack package
+    include('classes.jar')
-    dependsOn build
+    dependsOn('build')
+}
+
+dokkaHtml {
+    moduleName.set("Cloudstream")
+    dokkaSourceSets {
+        main {
+            sourceLink {
+                // Unix based directory relative path to the root of the project (where you execute gradle respectively). 
+                localDirectory.set(file("src/main/java"))
+
+                // URL showing where the source code can be accessed through the web browser
+                remoteUrl.set(new URL(
+                    "https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
+                // Suffix which is used to append the line number to the URL. Use #L for GitHub
+                remoteLineSuffix.set("#L")
+            }
+        }
+    }
 }

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

@@ -7,10 +7,12 @@ import android.content.ContextWrapper
 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
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStore.getKey
@@ -74,19 +76,28 @@ class CustomSenderFactory : ReportSenderFactory {
     }
 }
 
-class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)): Thread.UncaughtExceptionHandler {
+class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
+    Thread.UncaughtExceptionHandler {
     override fun uncaughtException(thread: Thread, error: Throwable) {
         ACRA.errorReporter.handleException(error)
         try {
             PrintStream(errorFile).use { ps ->
                 ps.println(String.format("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}"))
-                ps.println(String.format("Fatal exception on thread %s (%d)", thread.name, thread.id))
+                ps.println(
+                    String.format(
+                        "Fatal exception on thread %s (%d)",
+                        thread.name,
+                        thread.id
+                    )
+                )
                 error.printStackTrace(ps)
             }
-        } catch (ignored: FileNotFoundException) { }
+        } catch (ignored: FileNotFoundException) {
+        }
         try {
             onError.invoke()
-        } catch (ignored: Exception) { }
+        } catch (ignored: Exception) {
+        }
         exitProcess(1)
     }
 
@@ -95,7 +106,7 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)): Thread.U
 class AcraApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(filesDir.resolve("last_error")){
+        Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(filesDir.resolve("last_error")) {
             val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
             startActivity(Intent.makeRestartActivityTask(intent!!.component))
         })
@@ -183,5 +194,15 @@ class AcraApplication : Application() {
         fun openBrowser(url: String, fallbackWebview: Boolean = false, fragment: Fragment? = null) {
             context?.openBrowser(url, fallbackWebview, fragment)
         }
+
+        /** Will fallback to webview if in TV layout */
+        fun openBrowser(url: String, activity: FragmentActivity?) {
+            openBrowser(
+                url,
+                isTvSettings(),
+                activity?.supportFragmentManager?.fragments?.lastOrNull()
+            )
+        }
+
     }
 }

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

@@ -40,6 +40,7 @@ object APIHolder {
 
     private const val defProvider = 0
 
+    // ConcurrentModificationException is possible!!!
     val allProviders: MutableList<MainAPI> = arrayListOf()
 
     fun initAll() {

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

@@ -15,6 +15,7 @@ import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
@@ -144,6 +145,72 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         val mainPluginsLoadedEvent =
             Event<Boolean>() // homepage api, used to speed up time to load for homepage
         val afterRepositoryLoadedEvent = Event<Boolean>()
+
+        /**
+         * @return true if the str has launched an app task (be it successful or not)
+         * @param isWebview does not handle providers and opening download page if true. Can still add repos and login.
+         * */
+        fun handleAppIntentUrl(
+            activity: FragmentActivity?,
+            str: String?,
+            isWebview: Boolean
+        ): Boolean =
+            with(activity) {
+                if (str != null && this != null) {
+                    if (str.startsWith("https://cs.repo")) {
+                        val realUrl = "https://" + str.substringAfter("?")
+                        println("Repository url: $realUrl")
+                        loadRepository(realUrl)
+                        return true
+                    } else if (str.contains(appString)) {
+                        for (api in OAuth2Apis) {
+                            if (str.contains("/${api.redirectUrl}")) {
+                                ioSafe {
+                                    Log.i(TAG, "handleAppIntent $str")
+                                    val isSuccessful = api.handleRedirect(str)
+
+                                    if (isSuccessful) {
+                                        Log.i(TAG, "authenticated ${api.name}")
+                                    } else {
+                                        Log.i(TAG, "failed to authenticate ${api.name}")
+                                    }
+
+                                    this@with.runOnUiThread {
+                                        try {
+                                            showToast(
+                                                this@with,
+                                                getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
+                                                    api.name
+                                                )
+                                            )
+                                        } catch (e: Exception) {
+                                            logError(e) // format might fail
+                                        }
+                                    }
+                                }
+                                return true
+                            }
+                        }
+                    } else if (URI(str).scheme == appStringRepo) {
+                        val url = str.replaceFirst(appStringRepo, "https")
+                        loadRepository(url)
+                        return true
+                    } else if (!isWebview) {
+                        if (str.startsWith(DOWNLOAD_NAVIGATE_TO)) {
+                            this.navigate(R.id.navigation_downloads)
+                            return true
+                        } else {
+                            for (api in apis) {
+                                if (str.startsWith(api.mainUrl)) {
+                                    loadResult(str, api.name)
+                                    return true
+                                }
+                            }
+                        }
+                    }
+                }
+                return false
+            }
     }
 
     override fun onColorSelected(dialogId: Int, color: Int) {
@@ -348,56 +415,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         if (intent == null) return
         val str = intent.dataString
         loadCache()
-        if (str != null) {
+        handleAppIntentUrl(this, str, false)
-            if (str.startsWith("https://cs.repo")) {
-                val realUrl = "https://" + str.substringAfter("?")
-                println("Repository url: $realUrl")
-                loadRepository(realUrl)
-            } else if (str.contains(appString)) {
-                for (api in OAuth2Apis) {
-                    if (str.contains("/${api.redirectUrl}")) {
-                        val activity = this
-                        ioSafe {
-                            Log.i(TAG, "handleAppIntent $str")
-                            val isSuccessful = api.handleRedirect(str)
-
-                            if (isSuccessful) {
-                                Log.i(TAG, "authenticated ${api.name}")
-                            } else {
-                                Log.i(TAG, "failed to authenticate ${api.name}")
-                            }
-
-                            activity.runOnUiThread {
-                                try {
-                                    showToast(
-                                        activity,
-                                        getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
-                                            api.name
-                                        )
-                                    )
-                                } catch (e: Exception) {
-                                    logError(e) // format might fail
-                                }
-                            }
-                        }
-                    }
-                }
-            } else if (URI(str).scheme == appStringRepo) {
-                val url = str.replaceFirst(appStringRepo, "https")
-                loadRepository(url)
-            } else {
-                if (str.startsWith(DOWNLOAD_NAVIGATE_TO)) {
-                    this.navigate(R.id.navigation_downloads)
-                } else {
-                    for (api in apis) {
-                        if (str.startsWith(api.mainUrl)) {
-                            loadResult(str, api.name)
-                            break
-                        }
-                    }
-                }
-            }
-        }
     }
 
     private fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
@@ -445,7 +463,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         }
                     }
                     // it.hashCode() is not enough to make sure they are distinct
-                    apis = allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
+                    apis =
+                        allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
                     APIHolder.apiMap = null
                 } catch (e: Exception) {
                     logError(e)
@@ -467,7 +486,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
 
         val settingsForProvider = SettingsJson()
-        settingsForProvider.enableAdult = settingsManager.getBoolean(getString(R.string.enable_nsfw_on_providers_key), false)
+        settingsForProvider.enableAdult =
+            settingsManager.getBoolean(getString(R.string.enable_nsfw_on_providers_key), false)
 
         MainAPI.settingsForProvider = settingsForProvider
 
@@ -501,7 +521,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                 }
 
                 ioSafe {
-                    if (settingsManager.getBoolean(getString(R.string.auto_update_plugins_key), true)) {
+                    if (settingsManager.getBoolean(
+                            getString(R.string.auto_update_plugins_key),
+                            true
+                        )
+                    ) {
                         PluginManager.updateAllOnlinePluginsAndLoadThem(this@MainActivity)
                     } else {
                         PluginManager.loadAllOnlinePlugins(this@MainActivity)
@@ -545,9 +569,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             for (api in accountManagers) {
                 api.init()
             }
-        }
 
-        ioSafe {
             inAppAuths.apmap { api ->
                 try {
                     api.initialize()

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

@@ -10,6 +10,10 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
+class DatabaseGdrive : Gdriveplayer() {
+    override var mainUrl = "https://series.databasegdriveplayer.co"
+}
+
 class Gdriveplayerapi: Gdriveplayer() {
     override val mainUrl: String = "https://gdriveplayerapi.com"
 }

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

@@ -1,12 +1,16 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
+class Streamsss : StreamSB() {
+    override var mainUrl = "https://streamsss.net"
+}
+
 class Sbflix : StreamSB() {
     override var mainUrl = "https://sbflix.xyz"
     override var name = "Sbflix"
@@ -109,31 +113,33 @@ open class StreamSB : ExtractorApi() {
         @JsonProperty("status_code") val statusCode: Int,
     )
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+    override suspend fun getUrl(
-        val regexID = Regex("(embed-[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+|\\/e\\/[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+)")
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val regexID =
+            Regex("(embed-[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+|/e/[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+)")
         val id = regexID.findAll(url).map {
-            it.value.replace(Regex("(embed-|\\/e\\/)"),"")
+            it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
-        val bytes = id.toByteArray()
+//        val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
-        val bytesToHex = bytesToHex(bytes)
+        val master = "$mainUrl/sources48/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/"
-        val master = "$mainUrl/sources44/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
         val headers = mapOf(
-            "watchsb" to "streamsb",
+            "watchsb" to "sbstream",
-            )
+        )
-        val urltext = app.get(master,
+        val mapped = app.get(
+            master.lowercase(),
             headers = headers,
-            allowRedirects = false
+            referer = url,
-        ).text
+        ).parsedSafe<Main>()
-        val mapped = urltext.let { parseJson<Main>(it) }
-        val testurl = app.get(mapped.streamData.file, headers = headers).text
         // val urlmain = mapped.streamData.file.substringBefore("/hls/")
-        if (urltext.contains("m3u8") && testurl.contains("EXTM3U"))
+        M3u8Helper.generateM3u8(
-            return M3u8Helper.generateM3u8(
+            name,
-                name,
+            mapped?.streamData?.file ?: return,
-                mapped.streamData.file,
+            url,
-                url,
+            headers = headers
-                headers = headers
+        ).forEach(callback)
-            )
-        return null
     }
 }

app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt

@@ -1,13 +1,19 @@
 package com.lagradost.cloudstream3.plugins
 
+import android.app.*
 import dalvik.system.PathClassLoader
 import com.google.gson.Gson
 import android.content.res.AssetManager
 import android.content.res.Resources
 import android.os.Environment
 import android.widget.Toast
-import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.net.toUri
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
@@ -25,7 +31,9 @@ import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.extractorApis
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -38,6 +46,9 @@ import java.util.*
 const val PLUGINS_KEY = "PLUGINS_KEY"
 const val PLUGINS_KEY_LOCAL = "PLUGINS_KEY_LOCAL"
 
+const val EXTENSIONS_CHANNEL_ID = "cloudstream3.extensions"
+const val EXTENSIONS_CHANNEL_NAME = "Extensions"
+const val EXTENSIONS_CHANNEL_DESCRIPT = "Extension notification channel"
 
 // Data class for internal storage
 data class PluginData(
@@ -78,6 +89,8 @@ object PluginManager {
 
     const val TAG = "PluginManager"
 
+    private var hasCreatedNotChanel = false
+
     /**
      * Store data about the plugin for fetching later
      * */
@@ -220,8 +233,11 @@ object PluginManager {
             "Outdated plugins: ${outdatedPlugins.filter { it.isOutdated }}"
         }
 
+        val updatedPlugins = mutableListOf<String>()
+
         outdatedPlugins.apmap { pluginData ->
             if (pluginData.isDisabled) {
+                //updatedPlugins.add(activity.getString(R.string.single_plugin_disabled, pluginData.onlineData.second.name))
                 unloadPlugin(pluginData.savedData.filePath)
             } else if (pluginData.isOutdated) {
                 downloadAndLoadPlugin(
@@ -229,10 +245,17 @@ object PluginManager {
                     pluginData.onlineData.second.url,
                     pluginData.savedData.internalName,
                     pluginData.onlineData.first
-                )
+                ).let { success ->
+                    if (success)
+                        updatedPlugins.add(pluginData.onlineData.second.name)
+                }
             }
         }
 
+        main {
+            createNotification(activity, updatedPlugins)
+        }
+
         ioSafe {
             afterPluginsLoadedEvent.invoke(true)
         }
@@ -438,4 +461,59 @@ object PluginManager {
             false
         }
     }
+
+    private fun Context.createNotificationChannel() {
+        hasCreatedNotChanel = true
+        // Create the NotificationChannel, but only on API 26+ because
+        // the NotificationChannel class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name = EXTENSIONS_CHANNEL_NAME //getString(R.string.channel_name)
+            val descriptionText = EXTENSIONS_CHANNEL_DESCRIPT//getString(R.string.channel_description)
+            val importance = NotificationManager.IMPORTANCE_LOW
+            val channel = NotificationChannel(EXTENSIONS_CHANNEL_ID, name, importance).apply {
+                description = descriptionText
+            }
+            // Register the channel with the system
+            val notificationManager: NotificationManager =
+                this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+    private fun createNotification(
+        context: Context,
+        extensionNames: List<String>
+        ): Notification? {
+        try {
+            if (extensionNames.isEmpty()) return null
+
+            val content = extensionNames.joinToString(", ")
+//        main { // DON'T WANT TO SLOW IT DOWN
+            val builder = NotificationCompat.Builder(context, EXTENSIONS_CHANNEL_ID)
+                .setAutoCancel(false)
+                .setColorized(true)
+                .setOnlyAlertOnce(true)
+                .setSilent(true)
+                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setColor(context.colorFromAttribute(R.attr.colorPrimary))
+                .setContentTitle(context.getString(R.string.plugins_updated, extensionNames.size))
+                .setSmallIcon(R.drawable.ic_baseline_extension_24)
+                .setStyle(NotificationCompat.BigTextStyle()
+                    .bigText(content))
+                .setContentText(content)
+
+            if (!hasCreatedNotChanel) {
+                context.createNotificationChannel()
+            }
+
+            val notification = builder.build()
+            with(NotificationManagerCompat.from(context)) {
+                // notificationId is a unique int for each notification that you must define
+                notify((System.currentTimeMillis()/1000).toInt(), notification)
+            }
+            return notification
+        } catch (e: Exception) {
+            logError(e)
+            return null
+        }
+    }
 }

app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt

@@ -10,6 +10,9 @@ import java.security.MessageDigest
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 object VotingApi { // please do not cheat the votes lol
     private const val LOGKEY = "VotingApi"
@@ -23,10 +26,10 @@ object VotingApi { // please do not cheat the votes lol
     private val apiDomain = "https://api.countapi.xyz"
 
     private fun transformUrl(url: String): String = // dont touch or all votes get reset
-            MessageDigest
+        MessageDigest
-                .getInstance("SHA-256")
+            .getInstance("SHA-256")
-                .digest("${url}#funny-salt".toByteArray())
+            .digest("${url}#funny-salt".toByteArray())
-                .fold("") { str, it -> str + "%02x".format(it) }
+            .fold("") { str, it -> str + "%02x".format(it) }
 
     suspend fun SitePlugin.getVotes(): Int {
         return getVotes(url)
@@ -53,9 +56,9 @@ object VotingApi { // please do not cheat the votes lol
         return votesCache[pluginUrl] ?: app.get(url).parsedSafe<Result>()?.value?.also {
             votesCache[pluginUrl] = it
         } ?: (0.also {
-          ioSafe {
+            ioSafe {
-              createBucket(pluginUrl)
+                createBucket(pluginUrl)
-          }
+            }
         })
     }
 
@@ -64,7 +67,8 @@ object VotingApi { // please do not cheat the votes lol
     }
 
     private suspend fun createBucket(pluginUrl: String) {
-        val url = "${apiDomain}/create?namespace=cs3-votes&key=${transformUrl(pluginUrl)}&value=0&update_lowerbound=-2&update_upperbound=2&enable_reset=0"
+        val url =
+            "${apiDomain}/create?namespace=cs3-votes&key=${transformUrl(pluginUrl)}&value=0&update_lowerbound=-2&update_upperbound=2&enable_reset=0"
         Log.d(LOGKEY, "Requesting: $url")
         app.get(url)
     }
@@ -74,32 +78,46 @@ object VotingApi { // please do not cheat the votes lol
         return true
     }
 
+    private val voteLock = Mutex()
     suspend fun vote(pluginUrl: String, requestType: VoteType): Int {
-        if (!canVote(pluginUrl)) {
+        // Prevent multiple requests at the same time.
-            main {
+        voteLock.withLock {
-                Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT).show()
+            if (!canVote(pluginUrl)) {
+                main {
+                    Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT)
+                        .show()
+                }
+                return getVotes(pluginUrl)
             }
-            return getVotes(pluginUrl)
+
-        }
+            val savedType: VoteType =
-        val savedType: VoteType = getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
+                getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
-        var newType: VoteType = requestType
+
-        var changeValue = 0
+            val newType = if (requestType == savedType) VoteType.NONE else requestType
-        if (requestType == savedType) {
+            val changeValue = if (requestType == savedType) {
-            newType = VoteType.NONE
+                -requestType.value
-            changeValue = -requestType.value
+            } else if (savedType == VoteType.NONE) {
-        } else if (savedType == VoteType.NONE) {
+                requestType.value
-            changeValue = requestType.value
+            } else if (savedType != requestType) {
-        } else if (savedType != requestType) {
+                -savedType.value + requestType.value
-            changeValue = -savedType.value + requestType.value
+            } else 0
-        }
+
-        val url = "${apiDomain}/update/cs3-votes/${transformUrl(pluginUrl)}?amount=${changeValue}"
+            // Pre-emptively set vote key
-        Log.d(LOGKEY, "Requesting: $url")
-        val res = app.get(url).parsedSafe<Result>()?.value
-        if (res != null) {
             setKey("cs3-votes/${transformUrl(pluginUrl)}", newType)
-            votesCache[pluginUrl] = res
+
+            val url =
+                "${apiDomain}/update/cs3-votes/${transformUrl(pluginUrl)}?amount=${changeValue}"
+            Log.d(LOGKEY, "Requesting: $url")
+            val res = app.get(url).parsedSafe<Result>()?.value
+
+            if (res == null) {
+                // "Refund" key if the response is invalid
+                setKey("cs3-votes/${transformUrl(pluginUrl)}", savedType)
+            } else {
+                votesCache[pluginUrl] = res
+            }
+            return res ?: 0
         }
-        return res ?: 0
     }
 
     private data class Result(

app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt

@@ -1,9 +1,11 @@
 package com.lagradost.cloudstream3.syncproviders
 
+import androidx.fragment.app.FragmentActivity
+
 interface OAuth2API : AuthAPI {
     val key: String
     val redirectUrl: String
 
     suspend fun handleRedirect(url: String) : Boolean
-    fun authenticate()
+    fun authenticate(activity: FragmentActivity?)
 }

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
@@ -48,9 +49,9 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         removeAccountKeys()
     }
 
-    override fun authenticate() {
+    override fun authenticate(activity: FragmentActivity?) {
         val request = "https://anilist.co/api/v2/oauth/authorize?client_id=$key&response_type=token"
-        openBrowser(request)
+        openBrowser(request, activity)
     }
 
     override suspend fun handleRedirect(url: String): Boolean {

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+import androidx.fragment.app.FragmentActivity
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.OAuth2API
 
@@ -15,7 +16,7 @@ class Dropbox : OAuth2API {
     override val icon: Int
         get() = TODO("Not yet implemented")
 
-    override fun authenticate() {
+    override fun authenticate(activity: FragmentActivity?) {
         TODO("Not yet implemented")
     }
 

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt

@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Base64
+import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
@@ -281,7 +282,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return false
     }
 
-    override fun authenticate() {
+    override fun authenticate(activity: FragmentActivity?) {
         // It is recommended to use a URL-safe string as code_verifier.
         // See section 4 of RFC 7636 for more details.
 
@@ -294,7 +295,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         val codeChallenge = codeVerifier
         val request =
             "$mainUrl/v1/oauth2/authorize?response_type=code&client_id=$key&code_challenge=$codeChallenge&state=RequestID$requestId"
-        openBrowser(request)
+        openBrowser(request, activity)
     }
 
     private var requestId = 0

app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt

@@ -11,12 +11,12 @@ import android.webkit.WebViewClient
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.network.WebViewResolver
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import kotlinx.android.synthetic.main.fragment_webview.*
-import java.net.URI
 
 class WebviewFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -31,16 +31,8 @@ class WebviewFragment : Fragment() {
                 request: WebResourceRequest?
             ): Boolean {
                 val requestUrl = request?.url.toString()
-                val repoUrl = if (requestUrl.startsWith("https://cs.repo")) {
+                val performedAction = MainActivity.handleAppIntentUrl(activity, requestUrl, true)
-                    "https://" + requestUrl.substringAfter("?")
+                if (performedAction) {
-                } else if (URI(requestUrl).scheme == appStringRepo) {
-                    requestUrl.replaceFirst(appStringRepo, "https")
-                } else {
-                    null
-                }
-
-                if (repoUrl != null) {
-                    activity?.loadRepository(repoUrl)
                     findNavController().popBackStack()
                     return true
                 }
@@ -48,12 +40,15 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
-        web_view.addJavascriptInterface(RepoApi(activity), "RepoApi")
-        web_view.settings.javaScriptEnabled = true
-        web_view.settings.domStorageEnabled = true
 
         WebViewResolver.webViewUserAgent = web_view.settings.userAgentString
-//        web_view.settings.userAgentString = USER_AGENT
+
+        web_view.addJavascriptInterface(RepoApi(activity), "RepoApi")
+        web_view.settings.javaScriptEnabled = true
+        web_view.settings.userAgentString = USER_AGENT
+        web_view.settings.domStorageEnabled = true
+//        WebView.setWebContentsDebuggingEnabled(true)
+
         web_view.loadUrl(url)
     }
 

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

@@ -611,6 +611,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         player_lock?.isGone = !isShowing
         //player_media_route_button?.isClickable = !isGone
         player_go_back_holder?.isGone = isGone
+        player_sources_btt?.isGone = isGone
     }
 
     private fun updateLockUI() {

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

@@ -60,7 +60,7 @@ class EpisodeAdapter(
     private val clickCallback: (EpisodeClickEvent) -> Unit,
     private val downloadClickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private var cardList: MutableList<ResultEpisode> = mutableListOf()
+    var cardList: MutableList<ResultEpisode> = mutableListOf()
 
     private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
     private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
@@ -239,7 +239,6 @@ class EpisodeAdapter(
 
             itemView.setOnLongClickListener {
                 clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
-
                 return@setOnLongClickListener true
             }
 

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

@@ -95,6 +95,7 @@ import kotlinx.android.synthetic.main.fragment_result.result_vpn
 import kotlinx.android.synthetic.main.fragment_result_swipe.*
 import kotlinx.android.synthetic.main.fragment_result_tv.*
 import kotlinx.android.synthetic.main.result_sync.*
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 
 
@@ -293,7 +294,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                 result_reload_connection_open_in_browser?.isVisible = true
             }
             2 -> {
-                result_bookmark_fab?.isGone = isTvSettings()
+                result_bookmark_fab?.isGone = isTrueTvSettings()
                 result_bookmark_fab?.extend()
                 //if (result_bookmark_button?.context?.isTrueTvSettings() == true) {
                 //    when {
@@ -412,7 +413,39 @@ open class ResultFragment : ResultTrailerPlayer() {
             is ResourceSome.Success -> {
                 result_episodes?.isVisible = true
                 result_episode_loading?.isVisible = false
+
+                /*
+                 * Okay so what is this fuckery?
+                 * Basically Android TV will crash if you request a new focus while
+                 * the adapter gets updated.
+                 *
+                 * This means that if you load thumbnails and request a next focus at the same time
+                 * the app will crash without any way to catch it!
+                 *
+                 * How to bypass this?
+                 * This code basically steals the focus for 500ms and puts it in an inescapable view
+                 * then lets out the focus by requesting focus to result_episodes
+                 */
+
+                // Do not use this.isTv, that is the player
+                val isTv = isTvSettings()
+                val hasEpisodes =
+                    !(result_episodes?.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty()
+
+                if (isTv && hasEpisodes) {
+                    // Make it impossible to focus anywhere else!
+                    temporary_no_focus?.isFocusable = true
+                    temporary_no_focus?.requestFocus()
+                }
+
                 (result_episodes?.adapter as? EpisodeAdapter?)?.updateList(episodes.value)
+
+                if (isTv && hasEpisodes) main {
+                    delay(500)
+                    temporary_no_focus?.isFocusable = false
+                    // This might make some people sad as it changes the focus when leaving an episode :(
+                    result_episodes?.requestFocus()
+                }
             }
         }
     }
@@ -458,7 +491,14 @@ open class ResultFragment : ResultTrailerPlayer() {
             val storedData = getStoredData(activity ?: context ?: return) ?: return
 
             //viewModel.clear()
-            viewModel.load(activity, storedData.url ?: return, storedData.apiName, storedData.showFillers, storedData.dubStatus, storedData.start)
+            viewModel.load(
+                activity,
+                storedData.url ?: return,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
         }
     }
 
@@ -916,7 +956,14 @@ open class ResultFragment : ResultTrailerPlayer() {
 
             if (storedData?.url != null) {
                 result_reload_connectionerror.setOnClickListener {
-                    viewModel.load(activity, storedData.url, storedData.apiName, storedData.showFillers, storedData.dubStatus, storedData.start)
+                    viewModel.load(
+                        activity,
+                        storedData.url,
+                        storedData.apiName,
+                        storedData.showFillers,
+                        storedData.dubStatus,
+                        storedData.start
+                    )
                 }
 
                 result_reload_connection_open_in_browser?.setOnClickListener {
@@ -952,7 +999,14 @@ open class ResultFragment : ResultTrailerPlayer() {
 
                 if (restart || !viewModel.hasLoaded()) {
                     //viewModel.clear()
-                    viewModel.load(activity, storedData.url, storedData.apiName, storedData.showFillers, storedData.dubStatus, storedData.start)
+                    viewModel.load(
+                        activity,
+                        storedData.url,
+                        storedData.apiName,
+                        storedData.showFillers,
+                        storedData.dubStatus,
+                        storedData.start
+                    )
                 }
             }
         }

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

@@ -1,8 +1,5 @@
 package com.lagradost.cloudstream3.ui.settings
 
-import android.app.Activity
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.View.*
@@ -12,8 +9,10 @@ import androidx.annotation.UiThread
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -39,7 +38,11 @@ import kotlinx.android.synthetic.main.add_account_input.*
 class SettingsAccount : PreferenceFragmentCompat() {
     companion object {
         /** Used by nginx plugin too */
-        fun showLoginInfo(activity: Activity?, api: AccountManager, info: AuthAPI.LoginInfo) {
+        fun showLoginInfo(
+            activity: FragmentActivity?,
+            api: AccountManager,
+            info: AuthAPI.LoginInfo
+        ) {
             val builder =
                 AlertDialog.Builder(activity ?: return, R.style.AlertDialogCustom)
                     .setView(R.layout.account_managment)
@@ -62,9 +65,13 @@ class SettingsAccount : PreferenceFragmentCompat() {
                 dialog.dismissSafe(activity)
                 showAccountSwitch(activity, api)
             }
+
+            if (isTvSettings()) {
+                dialog.account_switch_account?.requestFocus()
+            }
         }
 
-        fun showAccountSwitch(activity: Activity, api: AccountManager) {
+        fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
             val accounts = api.getAccounts() ?: return
 
             val builder =
@@ -98,11 +105,11 @@ class SettingsAccount : PreferenceFragmentCompat() {
         }
 
         @UiThread
-        fun addAccount(activity: Activity?, api: AccountManager) {
+        fun addAccount(activity: FragmentActivity?, api: AccountManager) {
             try {
                 when (api) {
                     is OAuth2API -> {
-                        api.authenticate()
+                        api.authenticate(activity)
                     }
                     is InAppAuthAPI -> {
                         val builder =
@@ -144,13 +151,11 @@ class SettingsAccount : PreferenceFragmentCompat() {
                         dialog.login_username_input?.isVisible = api.requiresUsername
                         dialog.create_account?.isGone = api.createAccountUrl.isNullOrBlank()
                         dialog.create_account?.setOnClickListener {
-                            val i = Intent(Intent.ACTION_VIEW)
+                            openBrowser(
-                            i.data = Uri.parse(api.createAccountUrl)
+                                api.createAccountUrl ?: return@setOnClickListener,
-                            try {
+                                activity
-                                activity.startActivity(i)
+                            )
-                            } catch (e: Exception) {
+                            dialog.dismissSafe()
-                                logError(e)
-                            }
                         }
                         dialog.text1?.text = api.name
 
@@ -181,9 +186,10 @@ class SettingsAccount : PreferenceFragmentCompat() {
                                     try {
                                         showToast(
                                             activity,
-                                            activity.getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
+                                            activity.getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail)
-                                                api.name
+                                                .format(
-                                            )
+                                                    api.name
+                                                )
                                         )
                                     } catch (e: Exception) {
                                         logError(e) // format might fail

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

@@ -76,7 +76,7 @@ class RepoAdapter(
                 imageClickCallback(repositoryData)
             }
 
-            itemView.setOnClickListener {
+            itemView.repository_item_root?.setOnClickListener {
                 clickCallback(repositoryData)
             }
             itemView.main_text?.text = repositoryData.name

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

@@ -31,6 +31,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.toSpanned
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -415,7 +416,7 @@ object AppUtils {
         }
     }
 
-    fun AppCompatActivity.loadResult(
+    fun FragmentActivity.loadResult(
         url: String,
         apiName: String,
         startAction: Int = 0,

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

@@ -237,6 +237,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Sbthe(),
     Vidgomunime(),
     Sbflix(),
+    Streamsss(),
 
     Fastream(),
 
@@ -333,6 +334,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Gdriveplayerus(),
     Gdriveplayerco(),
     Gdriveplayer(),
+    DatabaseGdrive(),
 
     YoutubeExtractor(),
     YoutubeShortLinkExtractor(),

app/src/main/res/layout/fragment_result_tv.xml

@@ -420,14 +420,14 @@
 
 
                             <FrameLayout
-                                android:nextFocusRight="@id/result_bookmark_button"
                                 android:id="@+id/result_movie_progress_downloaded_holder"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="5dp"
                                 android:layout_marginEnd="5dp"
                                 android:layout_weight="1"
-                                android:minWidth="250dp">
+                                android:minWidth="250dp"
+                                android:nextFocusRight="@id/result_bookmark_button">
 
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_download_movie"
@@ -510,17 +510,17 @@
                             </FrameLayout>
 
                             <com.google.android.material.button.MaterialButton
-                                android:nextFocusLeft="@id/result_movie_progress_downloaded_holder"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-
                                 android:id="@+id/result_bookmark_button"
                                 style="@style/BlackButton"
+
                                 android:layout_width="wrap_content"
                                 android:layout_marginStart="5dp"
                                 android:layout_marginEnd="5dp"
                                 android:layout_marginBottom="10dp"
                                 android:layout_weight="1"
                                 android:minWidth="250dp"
+                                android:nextFocusLeft="@id/result_movie_progress_downloaded_holder"
+                                android:nextFocusDown="@id/result_resume_series_button_play"
                                 android:text="@string/type_none"
                                 android:visibility="visible" />
                         </LinearLayout>
@@ -753,6 +753,16 @@
                                 android:orientation="horizontal"
                                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                                 tools:listitem="@layout/result_episode" />
+
+                            <View
+                                android:id="@+id/temporary_no_focus"
+                                android:layout_width="1dp"
+                                android:layout_height="1dp"
+                                android:focusable="false"
+                                android:nextFocusLeft="@id/temporary_no_focus"
+                                android:nextFocusRight="@id/temporary_no_focus"
+                                android:nextFocusUp="@id/temporary_no_focus"
+                                android:nextFocusDown="@id/temporary_no_focus" />
                         </LinearLayout>
                     </LinearLayout>
 

app/src/main/res/layout/main_settings.xml

@@ -101,7 +101,7 @@
             <TextView
                 android:id="@+id/settings_extensions"
                 style="@style/SettingsItem"
-                android:nextFocusUp="@id/settings_updates"
+                android:nextFocusUp="@id/settings_credits"
                 android:text="@string/extensions" />
 
             <LinearLayout

app/src/main/res/layout/repository_item_tv.xml

@@ -8,6 +8,8 @@
     android:background="@drawable/outline_drawable"
     android:nextFocusRight="@id/action_button"
     android:orientation="horizontal"
+    android:clickable="true"
+    android:focusable="true"
     android:padding="12dp">
 
     <ImageView

app/src/main/res/values-nl/strings.xml

@@ -20,7 +20,7 @@
 
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Snelheid (%.2fx)</string>
-    <string name="rated_format" formatted="true">Beoordeeld: %.Als</string>
+    <string name="rated_format" formatted="true">Beoordeeld: %.1fAls</string>
     <string name="new_update_format" formatted="true">Nieuwe update gevonden!\n%s -> %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>

app/src/main/res/values-pl/strings.xml

@@ -455,4 +455,5 @@
     <string name="extension_types">Wspierane</string>
     <string name="extension_language">Język</string>
     <string name="extension_install_first">Najpierw zainstaluj rozszerzenie</string>
+    <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -600,6 +600,7 @@
     <string name="plugins_downloaded" formatted="true">Downloaded: %d</string>
     <string name="plugins_disabled" formatted="true">Disabled: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Not downloaded: %d</string>
+    <string name="plugins_updated" formatted="true">Updated %d plugins</string>
     <string name="blank_repo_message">Add a repository to install site extensions</string>
     <string name="view_public_repositories_button">View community repositories</string>
     <string name="view_public_repositories_button_short">Public list</string>

crowdin.yml

@@ -1,5 +0,0 @@
-files:
-  - source: /app/src/main/res/values/strings.xml
-    translation: /app/src/main/res/values-%android_code%/strings.xml
-  - source: /app/src/main/res/values/array.xml
-    translation: /app/src/main/res/values-%android_code%/array.xml