diff --git a/.github/downloads.jpg b/.github/downloads.jpg index 0b671edc..ca14a664 100644 Binary files a/.github/downloads.jpg and b/.github/downloads.jpg differ diff --git a/.github/home.jpg b/.github/home.jpg index 2ccfaff4..72370d3c 100644 Binary files a/.github/home.jpg and b/.github/home.jpg differ diff --git a/.github/player.jpg b/.github/player.jpg index 0580fb03..f6959cf3 100644 Binary files a/.github/player.jpg and b/.github/player.jpg differ diff --git a/.github/results.jpg b/.github/results.jpg index 5e63169f..4dbc9b8d 100644 Binary files a/.github/results.jpg and b/.github/results.jpg differ diff --git a/.github/search.jpg b/.github/search.jpg index 998b7753..784bec89 100644 Binary files a/.github/search.jpg and b/.github/search.jpg differ diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml index 032ea8d0..3c5caad7 100644 --- a/.github/workflows/generate_dokka.yml +++ b/.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 diff --git a/.github/workflows/issue-action.yml b/.github/workflows/issue_action.yml similarity index 97% rename from .github/workflows/issue-action.yml rename to .github/workflows/issue_action.yml index bfcb10d0..9ca9ff04 100644 --- a/.github/workflows/issue-action.yml +++ b/.github/workflows/issue_action.yml @@ -1,63 +1,63 @@ -name: Issue automatic actions - -on: - issues: - types: [opened, edited] - -jobs: - issue-moderator: - runs-on: ubuntu-latest - steps: - - name: Generate access token - id: generate_token - uses: tibdex/github-app-token@v1 - with: - app_id: ${{ secrets.GH_APP_ID }} - private_key: ${{ secrets.GH_APP_KEY }} - - name: Similarity analysis - uses: actions-cool/issues-similarity-analysis@v1 - with: - token: ${{ steps.generate_token.outputs.token }} - filter-threshold: 0.5 - title-excludes: '' - comment-title: | - ### Your issue looks similar to these issues: - Please close if duplicate. - comment-body: '${index}. ${similarity} #${number}' - - uses: actions/checkout@v2 - - name: Automatically close issues that dont follow the issue template - uses: lucasbento/auto-close-issues@v1.0.2 - with: - github-token: ${{ steps.generate_token.outputs.token }} - issue-close-message: | - @${issue.user.login}: hello! :wave: - This issue is being automatically closed because it does not follow the issue template." - closed-issues-label: "invalid" - - name: Check if issue mentions a provider - id: provider_check - env: - GH_TEXT: "${{ github.event.issue.title }} ${{ github.event.issue.body }}" - run: | - wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py" - pip3 install httpx - RES="$(python3 ./check_issue.py)" - echo "::set-output name=name::${RES}" - - name: Comment if issue mentions a provider - if: steps.provider_check.outputs.name != 'none' - uses: actions-cool/issues-helper@v3 - with: - actions: 'create-comment' - token: ${{ steps.generate_token.outputs.token }} - body: | - Hello ${{ github.event.issue.user.login }}. - Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM). - - Found provider name: `${{ steps.provider_check.outputs.name }}` - - name: Add eyes reaction to all issues - uses: actions-cool/emoji-helper@v1.0.0 - with: - type: 'issue' - token: ${{ steps.generate_token.outputs.token }} - emoji: 'eyes' - - +name: Issue automatic actions + +on: + issues: + types: [opened, edited] + +jobs: + issue-moderator: + runs-on: ubuntu-latest + steps: + - name: Generate access token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.GH_APP_ID }} + private_key: ${{ secrets.GH_APP_KEY }} + - name: Similarity analysis + uses: actions-cool/issues-similarity-analysis@v1 + with: + token: ${{ steps.generate_token.outputs.token }} + filter-threshold: 0.5 + title-excludes: '' + comment-title: | + ### Your issue looks similar to these issues: + Please close if duplicate. + comment-body: '${index}. ${similarity} #${number}' + - uses: actions/checkout@v2 + - name: Automatically close issues that dont follow the issue template + uses: lucasbento/auto-close-issues@v1.0.2 + with: + github-token: ${{ steps.generate_token.outputs.token }} + issue-close-message: | + @${issue.user.login}: hello! :wave: + This issue is being automatically closed because it does not follow the issue template." + closed-issues-label: "invalid" + - name: Check if issue mentions a provider + id: provider_check + env: + GH_TEXT: "${{ github.event.issue.title }} ${{ github.event.issue.body }}" + run: | + wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py" + pip3 install httpx + RES="$(python3 ./check_issue.py)" + echo "::set-output name=name::${RES}" + - name: Comment if issue mentions a provider + if: steps.provider_check.outputs.name != 'none' + uses: actions-cool/issues-helper@v3 + with: + actions: 'create-comment' + token: ${{ steps.generate_token.outputs.token }} + body: | + Hello ${{ github.event.issue.user.login }}. + Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM). + + Found provider name: `${{ steps.provider_check.outputs.name }}` + - name: Add eyes reaction to all issues + uses: actions-cool/emoji-helper@v1.0.0 + with: + type: 'issue' + token: ${{ steps.generate_token.outputs.token }} + emoji: 'eyes' + + diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 903878ed..37161d6b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -43,9 +43,7 @@ jobs: echo "::set-output name=key_pwd::$KEY_PWD" - name: Run Gradle run: | - ./gradlew assemblePrerelease - ./gradlew androidSourcesJar - ./gradlew makeJar + ./gradlew assemblePrerelease makeJar androidSourcesJar env: SIGNING_KEY_ALIAS: "key0" SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }} diff --git a/app/build.gradle b/app/build.gradle index b80c820f..291e71ff 100644 --- a/app/build.gradle +++ b/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 - include('classes.jar') // the classes file of the imported rack package - dependsOn build + into('build') + include('classes.jar') + 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") + } + } + } +} \ No newline at end of file diff --git a/app/src/debug/ic_launcher-playstore.png b/app/src/debug/ic_launcher-playstore.png index 3c4e788c..8c374dd9 100644 Binary files a/app/src/debug/ic_launcher-playstore.png and b/app/src/debug/ic_launcher-playstore.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png index bf8e595f..c947f526 100644 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher.png and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png index bf8e595f..c947f526 100644 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png index 935b7108..e841896f 100644 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher.png and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png index 935b7108..e841896f 100644 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_banner.png b/app/src/debug/res/mipmap-xhdpi/ic_banner.png index 16c4fdd1..6e23cfcf 100644 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_banner.png and b/app/src/debug/res/mipmap-xhdpi/ic_banner.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png index d62f3f79..c80f9a10 100644 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png index d62f3f79..c80f9a10 100644 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png index 38d6ede0..f0b781bb 100644 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png index 38d6ede0..f0b781bb 100644 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png index 81c5621b..d5fa9d70 100644 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png index 81c5621b..d5fa9d70 100644 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 88e4735c..d959673a 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt index 85f031b3..198f0f4c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt +++ b/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() + ) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index d282f6dd..47afbc42 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/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 = arrayListOf() fun initAll() { diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index 6c9fadd8..cd320060 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/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() // homepage api, used to speed up time to load for homepage val afterRepositoryLoadedEvent = Event() + + /** + * @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) { - 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 - } - } - } - } - } + handleAppIntentUrl(this, str, false) } 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) @@ -465,9 +484,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { lastError = errorFile.readText(Charset.defaultCharset()) errorFile.delete() } - + 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() diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt index d2e56bf1..dfccc118 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt +++ b/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" } diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt index 461f56d0..30a0496d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt +++ b/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? { - 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_-]+)") + override suspend fun getUrl( + 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 bytesToHex = bytesToHex(bytes) - val master = "$mainUrl/sources44/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362" +// val master = "$mainUrl/sources48/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362" + val master = "$mainUrl/sources48/" + bytesToHex("||$id||||streamsb".toByteArray()) + "/" val headers = mapOf( - "watchsb" to "streamsb", - ) - val urltext = app.get(master, + "watchsb" to "sbstream", + ) + val mapped = app.get( + master.lowercase(), headers = headers, - allowRedirects = false - ).text - val mapped = urltext.let { parseJson
(it) } - val testurl = app.get(mapped.streamData.file, headers = headers).text + referer = url, + ).parsedSafe
() // val urlmain = mapped.streamData.file.substringBefore("/hls/") - if (urltext.contains("m3u8") && testurl.contains("EXTM3U")) - return M3u8Helper.generateM3u8( - name, - mapped.streamData.file, - url, - headers = headers - ) - return null + M3u8Helper.generateM3u8( + name, + mapped?.streamData?.file ?: return, + url, + headers = headers + ).forEach(callback) } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt index b5441b94..c4d1f66f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt +++ b/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() + 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 + ): 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 + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt index ab702d71..f099ad1a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt +++ b/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 - .getInstance("SHA-256") - .digest("${url}#funny-salt".toByteArray()) - .fold("") { str, it -> str + "%02x".format(it) } + MessageDigest + .getInstance("SHA-256") + .digest("${url}#funny-salt".toByteArray()) + .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()?.value?.also { votesCache[pluginUrl] = it } ?: (0.also { - ioSafe { - createBucket(pluginUrl) - } + ioSafe { + 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)) { - main { - Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT).show() + // Prevent multiple requests at the same time. + voteLock.withLock { + 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 = getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE - var newType: VoteType = requestType - var changeValue = 0 - if (requestType == savedType) { - newType = VoteType.NONE - changeValue = -requestType.value - } else if (savedType == VoteType.NONE) { - changeValue = requestType.value - } else if (savedType != requestType) { - changeValue = -savedType.value + requestType.value - } - val url = "${apiDomain}/update/cs3-votes/${transformUrl(pluginUrl)}?amount=${changeValue}" - Log.d(LOGKEY, "Requesting: $url") - val res = app.get(url).parsedSafe()?.value - if (res != null) { + + val savedType: VoteType = + getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE + + val newType = if (requestType == savedType) VoteType.NONE else requestType + val changeValue = if (requestType == savedType) { + -requestType.value + } else if (savedType == VoteType.NONE) { + requestType.value + } else if (savedType != requestType) { + -savedType.value + requestType.value + } else 0 + + // Pre-emptively set vote key 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()?.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( diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt index 0f882f3b..ef74edfc 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt +++ b/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?) } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt index 606fee97..3140abbc 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt +++ b/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 { diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt index f847e0b2..7ec168da 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt +++ b/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") } diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt index ea27720a..c08958ce 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt +++ b/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 diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt index cb4bbf37..19e24f74 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt +++ b/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")) { - "https://" + requestUrl.substringAfter("?") - } else if (URI(requestUrl).scheme == appStringRepo) { - requestUrl.replaceFirst(appStringRepo, "https") - } else { - null - } - - if (repoUrl != null) { - activity?.loadRepository(repoUrl) + val performedAction = MainActivity.handleAppIntentUrl(activity, requestUrl, true) + if (performedAction) { 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) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt index 19f2b25b..1ddd752f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt +++ b/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() { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt index 3abd827e..6fc81473 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt +++ b/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() { - private var cardList: MutableList = mutableListOf() + var cardList: MutableList = mutableListOf() private val mBoundViewHolders: HashSet = HashSet() private fun getAllBoundViewHolders(): Set? { @@ -239,7 +239,6 @@ class EpisodeAdapter( itemView.setOnLongClickListener { clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card)) - return@setOnLongClickListener true } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt index 5fc61146..1ec2dd39 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt +++ b/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 + ) } } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt index 2554d6ee..f9627e46 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt +++ b/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) - i.data = Uri.parse(api.createAccountUrl) - try { - activity.startActivity(i) - } catch (e: Exception) { - logError(e) - } + openBrowser( + api.createAccountUrl ?: return@setOnClickListener, + activity + ) + dialog.dismissSafe() } 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( - api.name - ) + 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 diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt index 2dc302ee..e90166a8 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt +++ b/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 diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt index 1c7bb214..cf3fbfde 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt +++ b/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, diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt index ae3d8c06..b5c2cd44 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt @@ -237,6 +237,7 @@ val extractorApis: MutableList = arrayListOf( Sbthe(), Vidgomunime(), Sbflix(), + Streamsss(), Fastream(), @@ -333,6 +334,7 @@ val extractorApis: MutableList = arrayListOf( Gdriveplayerus(), Gdriveplayerco(), Gdriveplayer(), + DatabaseGdrive(), YoutubeExtractor(), YoutubeShortLinkExtractor(), diff --git a/app/src/main/res/drawable/example_poster.jpg b/app/src/main/res/drawable/example_poster.jpg index 6d6e04ee..f5d7345b 100644 Binary files a/app/src/main/res/drawable/example_poster.jpg and b/app/src/main/res/drawable/example_poster.jpg differ diff --git a/app/src/main/res/drawable/subtitles_preview_background.jpg b/app/src/main/res/drawable/subtitles_preview_background.jpg index c7cd5f2e..c140e9b3 100644 Binary files a/app/src/main/res/drawable/subtitles_preview_background.jpg and b/app/src/main/res/drawable/subtitles_preview_background.jpg differ diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml index 7c5b4edd..a428b80f 100644 --- a/app/src/main/res/layout/fragment_result_tv.xml +++ b/app/src/main/res/layout/fragment_result_tv.xml @@ -420,14 +420,14 @@ + android:minWidth="250dp" + android:nextFocusRight="@id/result_bookmark_button"> @@ -753,6 +753,16 @@ android:orientation="horizontal" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:listitem="@layout/result_episode" /> + + diff --git a/app/src/main/res/layout/main_settings.xml b/app/src/main/res/layout/main_settings.xml index 1527599c..387f98fa 100644 --- a/app/src/main/res/layout/main_settings.xml +++ b/app/src/main/res/layout/main_settings.xml @@ -101,7 +101,7 @@ Snelheid (%.2fx) - Beoordeeld: %.Als + Beoordeeld: %.1fAls Nieuwe update gevonden!\n%s -> %s Filler %d min diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ea6eb140..fdc89692 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -455,4 +455,5 @@ Wspierane Język Najpierw zainstaluj rozszerzenie + Zaaktualizowano %d rozszerzeń diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e6dadcf..d086ad27 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -600,6 +600,7 @@ Downloaded: %d Disabled: %d Not downloaded: %d + Updated %d plugins Add a repository to install site extensions View community repositories Public list diff --git a/app/src/prerelease/ic_launcher-playstore.png b/app/src/prerelease/ic_launcher-playstore.png index 2cb90614..fa8208c4 100644 Binary files a/app/src/prerelease/ic_launcher-playstore.png and b/app/src/prerelease/ic_launcher-playstore.png differ diff --git a/app/src/prerelease/res/mipmap-hdpi/ic_launcher.png b/app/src/prerelease/res/mipmap-hdpi/ic_launcher.png index 3174c2ac..bfff3638 100644 Binary files a/app/src/prerelease/res/mipmap-hdpi/ic_launcher.png and b/app/src/prerelease/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png b/app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png index 3174c2ac..bfff3638 100644 Binary files a/app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/prerelease/res/mipmap-mdpi/ic_launcher.png b/app/src/prerelease/res/mipmap-mdpi/ic_launcher.png index c3d7464d..21a0023f 100644 Binary files a/app/src/prerelease/res/mipmap-mdpi/ic_launcher.png and b/app/src/prerelease/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png b/app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png index c3d7464d..21a0023f 100644 Binary files a/app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/prerelease/res/mipmap-xhdpi/ic_banner.png b/app/src/prerelease/res/mipmap-xhdpi/ic_banner.png index bbf98919..f518ca52 100644 Binary files a/app/src/prerelease/res/mipmap-xhdpi/ic_banner.png and b/app/src/prerelease/res/mipmap-xhdpi/ic_banner.png differ diff --git a/app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png b/app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png index 2318107f..cd4a3b76 100644 Binary files a/app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png and b/app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png index 2318107f..cd4a3b76 100644 Binary files a/app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png b/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png index 0cbf782a..69b5f01f 100644 Binary files a/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png index 0cbf782a..69b5f01f 100644 Binary files a/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png index 4cb99059..de5e4d1c 100644 Binary files a/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png index 4cb99059..de5e4d1c 100644 Binary files a/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/release/res/mipmap-xhdpi/ic_banner.png b/app/src/release/res/mipmap-xhdpi/ic_banner.png index 7a3b1b33..d1b9bdfb 100644 Binary files a/app/src/release/res/mipmap-xhdpi/ic_banner.png and b/app/src/release/res/mipmap-xhdpi/ic_banner.png differ diff --git a/crowdin.yml b/crowdin.yml deleted file mode 100644 index 2cc75108..00000000 --- a/crowdin.yml +++ /dev/null @@ -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