diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f8e0091c..1cbcec68 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,8 +47,8 @@ android { minSdk = 21 targetSdk = 33 - versionCode = 55 - versionName = "3.4.0" + versionCode = 56 + versionName = "3.5.0" resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}") diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt index 198f0f4c..0351b1ff 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt @@ -43,9 +43,9 @@ class CustomReportSender : ReportSender { override fun send(context: Context, errorContent: CrashReportData) { println("Sending report") val url = - "https://docs.google.com/forms/u/0/d/e/1FAIpQLSe9Vff8oHGMRXcjgCXZwkjvx3eBdNpn4DzjO0FkcWEU1gEQpA/formResponse" + "https://docs.google.com/forms/d/e/1FAIpQLSdOlbgCx7NeaxjvEGyEQlqdh2nCvwjm2vwpP1VwW7REj9Ri3Q/formResponse" val data = mapOf( - "entry.1586460852" to errorContent.toJSON() + "entry.753293084" to errorContent.toJSON() ) thread { // to not run it on main thread diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index 6565b144..8c818027 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi import com.lagradost.cloudstream3.ui.player.SubtitleData -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.ui.result.UiText import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf import com.lagradost.cloudstream3.utils.ExtractorLink @@ -81,7 +81,7 @@ object APIHolder { synchronized(allProviders) { initMap() return apiMap?.get(apiName)?.let { apis.getOrNull(it) } - // Leave the ?. null check, it can crash regardless + // Leave the ?. null check, it can crash regardless ?: allProviders.firstOrNull { it?.name == apiName } } } @@ -318,6 +318,57 @@ object APIHolder { } } +/* +// THIS IS WORK IN PROGRESS API +interface ITag { + val name: UiText +} + +data class SimpleTag(override val name: UiText, val data: String) : ITag + +enum class SelectType { + SingleSelect, + MultiSelect, + MultiSelectAndExclude, +} + +enum class SelectValue { + Selected, + Excluded, +} + +interface GenreSelector { + val title: UiText + val id : Int +} + +data class TagSelector( + override val title: UiText, + override val id : Int, + val tags: Set, + val defaultTags : Set = setOf(), + val selectType: SelectType = SelectType.SingleSelect, +) : GenreSelector + +data class BoolSelector( + override val title: UiText, + override val id : Int, + + val defaultValue : Boolean = false, +) : GenreSelector + +data class InputField( + override val title: UiText, + override val id : Int, + + val hint : UiText? = null, +) : GenreSelector + +// This response describes how a user might filter the homepage or search results +data class GenreResponse( + val searchSelectors : List, + val filterSelectors: List = searchSelectors +) */ /* 0 = Site not good diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt index bc9bfb1f..50fb37d6 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt @@ -67,7 +67,7 @@ class SetupFragmentLayout : Fragment() { crash_reporting_text?.text = getText(text) } - val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, false) + val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true) acra_switch.isChecked = enableCrashReporting crash_reporting_text.text = getText( diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml index ba098c8c..f2ec6747 100644 --- a/app/src/main/res/xml/settings_updates.xml +++ b/app/src/main/res/xml/settings_updates.xml @@ -2,7 +2,7 @@