Merge branch 'master' into packages

Author: Luna712

app/build.gradle.kts

@@ -161,7 +161,7 @@ dependencies {
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
-    implementation(libs.activity)
+    implementation(libs.activity.ktx)
     implementation(libs.appcompat)
     implementation(libs.bundles.navigationKtx)
     implementation(libs.lifecycle.livedata.ktx)

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

@@ -192,7 +192,7 @@ abstract class AbstractPlayerFragment(
             }
         }
 
-        canEnterPipMode = isPlayingRightNow && hasPipModeSupport
+        canEnterPipMode = (isPlayingRightNow || isBuffering) && hasPipModeSupport
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             activity?.let { act ->
                 PlayerPipHelper.updatePIPModeActions(

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

@@ -758,6 +758,8 @@ class CS3IPlayer : IPlayer {
                     cacheDirectory.mkdirs()
                 }
                 CronetEngine.Builder(context)
+                    .enableBrotli(true)
+                    .enableHttp2(true)
                     .enableQuic(true)
                     .setStoragePath(cacheDirectory.absolutePath)
                     .setLibraryLoader(null)

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

@@ -189,7 +189,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     )
 
     private var isShowingEpisodeOverlay: Boolean = false
-
+    private var previousPlayStatus: Boolean = false
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -2083,11 +2083,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun toggleEpisodesOverlay(show: Boolean) {
         if (show && !isShowingEpisodeOverlay) {
+            previousPlayStatus = player.getIsPlaying()
             player.handleEvent(CSPlayerEvent.Pause)
             showEpisodesOverlay()
             isShowingEpisodeOverlay = true
             animateEpisodesOverlay(true)
         } else if (isShowingEpisodeOverlay) {
+            if(previousPlayStatus) player.handleEvent(CSPlayerEvent.Play)
             isShowingEpisodeOverlay = false
             animateEpisodesOverlay(false)
         }

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

@@ -852,7 +852,7 @@
     <string name="torrent_not_accepted">Restart app and accept Stream Torrent pop-up to proceed.</string>
     <string name="software_decoding_key" translatable="false">software_decoding_key2</string>
     <string name="software_decoding">Software decoding</string>
-    <string name="software_decoding_desc">Software decoding enables the player to play video files not supported by your phone, but may cause laggy or unstable playback on high resolution</string>
+    <string name="software_decoding_desc">Software decoding enables the player to play video files not supported by your device, but may cause laggy or unstable playback on high resolution.</string>
     <string name="volume_exceeded_100">Volume has exceeded 100%</string>
     <string name="slide_up_again_to_exceed_100">Slide up again to go beyond 100%</string>
     <string name="update_plugins">Update Plugins</string>

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 acraCore = "5.13.1"
-activity = "1.11.0"
+activityKtx = "1.11.0"
 androidGradlePlugin = "8.13.0"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha04"
@@ -54,7 +54,7 @@ targetSdk = "35"
 [libraries]
 acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
 acra-toast = { module = "ch.acra:acra-toast", version.ref = "acraCore" }
-activity = { module = "androidx.activity:activity", version.ref = "activity" }
+activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt

@@ -10,7 +10,6 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.loadExtractor
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.net.URI
-import java.net.URL
 
 class HubCloud : ExtractorApi() {
     override val name = "Hub-Cloud"
@@ -25,7 +24,7 @@ class HubCloud : ExtractorApi() {
     ) {
         val tag = "HubCloud"
         val realUrl = url.takeIf {
-            try { URL(it); true } catch (e: Exception) { Log.e(tag, "Invalid URL: ${e.message}"); false }
+            try { URI(it).toURL(); true } catch (e: Exception) { Log.e(tag, "Invalid URL: ${e.message}"); false }
         } ?: return
 
         val baseUrl=getBaseUrl(realUrl)