Merge pull request #2177 from Luna712/cleanup

fire-light42 · web-flow · commit f321e98be517 · 2025-11-10T12:41:50.000Z
Some cleanup to redundant calls
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
@@ -86,7 +86,7 @@ class Addic7ed : SubtitleAPI() {
                     newSubtitleEntity(
                         displayName = node.select("td:eq(2)").text() + "\n" + node.select("td:eq(4)").text(),
                         link = node.selectFirst("a[href~=updated\\/|original\\/]")?.attr("href")?.fixUrl(),
-                        isHearingImpaired = node.select("td:eq(6)")!!.text().isNotEmpty()
+                        isHearingImpaired = node.select("td:eq(6)").text().isNotEmpty()
                     )
                 else null
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
@@ -146,7 +146,7 @@ class DownloadChildFragment : BaseFragment<FragmentChildDownloadsBinding>(
             }
         )
 
-        binding.downloadChildList?.apply {
+        binding.downloadChildList.apply {
             setHasFixedSize(true)
             setItemViewCacheSize(20)
             this.adapter = adapter
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -386,7 +386,7 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
         if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
-        val selectedVideoUri = result?.data?.data ?: return@registerForActivityResult
+        val selectedVideoUri = result.data?.data ?: return@registerForActivityResult
         playUri(activity ?: return@registerForActivityResult, selectedVideoUri)
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -309,7 +309,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
                 button?.isChecked =
-                    button?.isVisible == true && selectedTypes.any { types.contains(it) }
+                    button.isVisible && selectedTypes.any { types.contains(it) }
             }
         }
 
@@ -419,7 +419,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                         val name = getItem(position)
                         titleText?.text = name
                         val isPinned =
-                            pinnedphashset.contains(currentValidApis[position].name ?: "")
+                            pinnedphashset.contains(currentValidApis[position].name)
                         pinIcon.visibility = if (isPinned) View.VISIBLE else View.GONE
                         return view
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -470,7 +470,7 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
             val all = binding.viewpager.allViews.toList()
                 .filterIsInstance<AutofitRecyclerView>()
 
-            all?.forEach { view ->
+            all.forEach { view ->
                 view.isVisible = view.tag == position
                 view.isFocusable = view.tag == position
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -266,7 +266,7 @@ object SearchResultBuilder {
 
                 if (card.type?.isMovieType() == false) {
                     cardText?.text =
-                        cardText?.context?.getNameFull(card.name, card.episode, card.season)
+                        cardText.context?.getNameFull(card.name, card.episode, card.season)
                 }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -50,8 +50,7 @@ import java.util.Locale
 // Change local language settings in the app.
 fun getCurrentLocale(context: Context): String {
     val conf = context.resources.configuration
-
-    return ConfigurationCompat.getLocales(conf)?.get(0)?.toLanguageTag() ?: "en"
+    return ConfigurationCompat.getLocales(conf).get(0)?.toLanguageTag() ?: "en"
 }
 
 /**
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
@@ -92,7 +92,7 @@ object FillerEpisodeCheck {
             if (!localList.containsKey(realQuery)) return null
             val href = localList[realQuery]?.replace(MAIN_URL, "") ?: return null // JUST IN CASE
             val result = app.get("$MAIN_URL$href").text
-            val documented = Jsoup.parse(result) ?: return null
+            val documented = Jsoup.parse(result)
             val hashMap = HashMap<Int, Boolean>()
             documented.select("table.EpisodeList > tbody > tr").forEach {
                 val type = it.selectFirst("td.Type > span")?.text() == "Filler"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt
@@ -92,12 +92,12 @@ class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView {
                 var dy = 0f
                 if (dWidth * vHeight > vWidth * dHeight) {
                     val cropXCenterOffsetPct =
-                        if (mCropXCenterOffsetPct != null) mCropXCenterOffsetPct!!.toFloat() else 0.5f
+                        if (mCropXCenterOffsetPct != null) mCropXCenterOffsetPct!! else 0.5f
                     scale = vHeight.toFloat() / dHeight.toFloat()
                     dx = (vWidth - dWidth * scale) * cropXCenterOffsetPct
                 } else {
                     val cropYCenterOffsetPct =
-                        if (mCropYCenterOffsetPct != null) mCropYCenterOffsetPct!!.toFloat() else 0f
+                        if (mCropYCenterOffsetPct != null) mCropYCenterOffsetPct!! else 0f
                     scale = vWidth.toFloat() / dWidth.toFloat()
                     dy = (vHeight - dHeight * scale) * cropYCenterOffsetPct
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -388,7 +388,7 @@ object VideoDownloadManager {
                 val mbFormat = "%.1f MB"
 
                 if (hlsProgress != null && hlsTotal != null) {
-                    progressPercentage = hlsProgress.toLong() * 100 / hlsTotal
+                    progressPercentage = hlsProgress * 100 / hlsTotal
                     progressMbString = hlsProgress.toString()
                     totalMbString = hlsTotal.toString()
                     suffix = " - $mbFormat".format(progress / 1000000f)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt
@@ -15,8 +15,8 @@ open class AStreamHub : ExtractorApi() {
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val sources = mutableListOf<ExtractorLink>()
-        app.get(url).document.selectFirst("body > script").let { script ->
-            val text = script?.html() ?: ""
+        app.get(url).document.selectFirst("body > script")?.let { script ->
+            val text = script.html()
             Log.i("Dev", "text => $text")
             if (text.isNotBlank()) {
                 val m3link = "(?<=file:)(.*)(?=,)".toRegex().find(text)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@@ -53,8 +53,8 @@ open class Pelisplus(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
+                pageDoc.select(".dowload > a").amap { element ->
+                    val href = element.attr("href")
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
@@ -24,7 +24,7 @@ open class PlayLtXyz: ExtractorApi() {
         val doc = app.get(url, referer = referer).document
         //Log.i(this.name, "Result => (url, script) $url / ${doc.select("script")}")
         bodyText = doc.select("script").firstOrNull {
-            val text = it?.toString() ?: ""
+            val text = it.toString()
             text.contains("var idUser")
         }?.toString() ?: ""
         //Log.i(this.name, "Result => (bodyText) $bodyText")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
@@ -35,7 +35,7 @@ open class RapidVid : ExtractorApi() {
 
         if (extractedValue != null) {
             val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-            decoded   = String(bytes, Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+            decoded   = String(bytes, Charsets.UTF_8)
         } else {
             val evalJWSsetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
             val JWSsetup      = getAndUnpack(getAndUnpack(evalJWSsetup)).replace("\\\\", "\\")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
@@ -35,7 +35,7 @@ open class VidMoxy : ExtractorApi() {
 
         if (extractedValue != null) {
             val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-            decoded   = String(bytes, Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+            decoded   = String(bytes, Charsets.UTF_8)
         } else {
             val evaljwSetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
             val jwSetup     = getAndUnpack(getAndUnpack(evaljwSetup)).replace("\\\\", "\\")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -31,7 +31,7 @@ open class VidSrcExtractor : ExtractorApi() {
 
         val srcrcpList =
             iframedoc.select("div.serversList > div.server").mapNotNull {
-                val datahash = it.attr("data-hash") ?: return@mapNotNull null
+                val datahash = it.attr("data-hash")
                 val rcpLink = "$apiUrl/rcp/$datahash"
                 val rcpRes = app.get(rcpLink, referer = apiUrl).text
                 val srcrcpLink =
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -21,7 +21,7 @@ open class VideoSeyred : ExtractorApi() {
 
         val responseRaw                          = app.get(videoUrl)
         val responseList:List<VideoSeyredSource> = jacksonObjectMapper().readValue(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
-        val response                              = responseList[0] ?: throw ErrorLoadingException("VideoSeyred")
+        val response                              = responseList[0]
 
         for (track in response.tracks) {
             if (track.label != null && track.kind == "captions") {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt
@@ -106,7 +106,7 @@ open class Vidplay : ExtractorApi() {
                 "exchange" -> vrf = exchange(
                     vrf,
                     step.keys?.get(0) ?: return@forEach,
-                    step.keys?.get(1) ?: return@forEach
+                    step.keys.get(1)
                 )
 
                 "rc4" -> vrf = rc4Encryption(step.keys?.get(0) ?: return@forEach, vrf)
@@ -126,7 +126,7 @@ open class Vidplay : ExtractorApi() {
                 "exchange" -> vrf = exchange(
                     vrf,
                     step.keys?.get(1) ?: return@forEach,
-                    step.keys?.get(0) ?: return@forEach
+                    step.keys.get(0)
                 )
 
                 "rc4" -> vrf = rc4Decryption(step.keys?.get(0) ?: return@forEach, vrf)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
@@ -57,8 +57,8 @@ class Vidstream(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
+                pageDoc.select(".dowload > a").amap { element ->
+                    val href = element.attr("href")
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
@@ -19,7 +19,7 @@ class AsianEmbedHelper {
             val links = doc.select("div#list-server-more > ul > li.linkserver")
             if (!links.isNullOrEmpty()) {
                 links.amap {
-                    val datavid = it.attr("data-video") ?: ""
+                    val datavid = it.attr("data-video")
                     //Log.i("AsianEmbed", "Result => (datavid) ${datavid}")
                     if (datavid.isNotBlank()) {
                         val res = loadExtractor(datavid, url, subtitleCallback, callback)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
@@ -21,8 +21,8 @@ class VstreamhubHelper {
             if (url.startsWith(baseUrl)) {
                 // Fetch links
                 val doc = app.get(url).document.select("script")
-                doc?.forEach {
-                    val innerText = it?.toString()
+                doc.forEach {
+                    val innerText = it.toString()
                     if (!innerText.isNullOrEmpty()) {
                         if (innerText.contains("file:")) {
                             val startString = "file: "
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1279,7 +1279,7 @@ suspend fun getPostForm(requestUrl: String, html: String): String? {
     var hash: String? = null
 
     for (input in inputs) {
-        val value = input.attr("value") ?: continue
+        val value = input.attr("value")
         when (input.attr("name")) {
             "op" -> op = value
             "id" -> id = value
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -1240,7 +1240,7 @@ object HlsPlaylistParser {
         if (concatenatedCharacteristics.isNullOrEmpty()) {
             return 0
         }
-        val characteristics = Util.split(concatenatedCharacteristics!!, ",")
+        val characteristics = Util.split(concatenatedCharacteristics, ",")
         //@RoleFlags
         var roleFlags = 0
         if (characteristics.contains("public.accessibility.describes-video")) {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
@@ -34,8 +34,8 @@ class JsHunter(private val hunterJS: String) {
                 )
             val searchResults: Matcher = p.matcher(hunterJS)
             if (searchResults.find() && searchResults.groupCount() == 4) {
-                val h = searchResults.group(1)!!.toString()
-                val n = searchResults.group(2)!!.toString()
+                val h = searchResults.group(1)!!
+                val n = searchResults.group(2)!!
                 val t = searchResults.group(3)!!.toInt()
                 val e = searchResults.group(4)!!.toInt()
                 return hunter(h, n, t, e)

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class Addic7ed : SubtitleAPI() {`
`86`	`86`	`newSubtitleEntity(`
`87`	`87`	`displayName = node.select("td:eq(2)").text() + "\n" + node.select("td:eq(4)").text(),`
`88`	`88`	`link = node.selectFirst("a[href~=updated\\/\|original\\/]")?.attr("href")?.fixUrl(),`
`89`		`- isHearingImpaired = node.select("td:eq(6)")!!.text().isNotEmpty()`
	`89`	`+ isHearingImpaired = node.select("td:eq(6)").text().isNotEmpty()`
`90`	`90`	`)`
`91`	`91`	`else null`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class DownloadChildFragment : BaseFragment<FragmentChildDownloadsBinding>(`
`146`	`146`	`}`
`147`	`147`	`)`
`148`	`148`
`149`		`- binding.downloadChildList?.apply {`
	`149`	`+ binding.downloadChildList.apply {`
`150`	`150`	`setHasFixedSize(true)`
`151`	`151`	`setItemViewCacheSize(20)`
`152`	`152`	`this.adapter = adapter`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(`
`386`	`386`	`ActivityResultContracts.StartActivityForResult()`
`387`	`387`	`) { result ->`
`388`	`388`	`if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult`
`389`		`- val selectedVideoUri = result?.data?.data ?: return@registerForActivityResult`
	`389`	`+ val selectedVideoUri = result.data?.data ?: return@registerForActivityResult`
`390`	`390`	`playUri(activity ?: return@registerForActivityResult, selectedVideoUri)`
`391`	`391`	`}`
`392`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(`
`309`	`309`	`val pairList = getPairList(header)`
`310`	`310`	`for ((button, types) in pairList) {`
`311`	`311`	`button?.isChecked =`
`312`		`- button?.isVisible == true && selectedTypes.any { types.contains(it) }`
	`312`	`+ button.isVisible && selectedTypes.any { types.contains(it) }`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
`@@ -419,7 +419,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(`
`419`	`419`	`val name = getItem(position)`
`420`	`420`	`titleText?.text = name`
`421`	`421`	`val isPinned =`
`422`		`- pinnedphashset.contains(currentValidApis[position].name ?: "")`
	`422`	`+ pinnedphashset.contains(currentValidApis[position].name)`
`423`	`423`	`pinIcon.visibility = if (isPinned) View.VISIBLE else View.GONE`
`424`	`424`	`return view`
`425`	`425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ object SearchResultBuilder {`
`266`	`266`
`267`	`267`	`if (card.type?.isMovieType() == false) {`
`268`	`268`	`cardText?.text =`
`269`		`- cardText?.context?.getNameFull(card.name, card.episode, card.season)`
	`269`	`+ cardText.context?.getNameFull(card.name, card.episode, card.season)`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ import java.util.Locale`
`50`	`50`	`// Change local language settings in the app.`
`51`	`51`	`fun getCurrentLocale(context: Context): String {`
`52`	`52`	`val conf = context.resources.configuration`
`53`		`-`
`54`		`- return ConfigurationCompat.getLocales(conf)?.get(0)?.toLanguageTag() ?: "en"`
	`53`	`+ return ConfigurationCompat.getLocales(conf).get(0)?.toLanguageTag() ?: "en"`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`/**`