Fix issue where DownloadedPlayerActivity interferes with MainActivity (#674)

* Fix issue where DownloadedPlayerActivity interferes with MainActivity

app/src/main/AndroidManifest.xml

@@ -61,7 +61,9 @@
             android:exported="true"
             android:resizeableActivity="true"
             android:screenOrientation="userLandscape"
-            android:supportsPictureInPicture="true">
+            android:supportsPictureInPicture="true"
+            android:taskAffinity="com.lagradost.cloudstream3.downloadedplayer"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

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

@@ -65,6 +65,11 @@ object CommonActivity {
             _activity = WeakReference(value)
         }
 
+    @MainThread
+    fun setActivityInstance(newActivity: Activity?) {
+        activity = newActivity
+    }
+
     @MainThread
     fun Activity?.getCastSession(): CastSession? {
         return (this as MainActivity?)?.mSessionManager?.currentCastSession
@@ -203,23 +208,25 @@ object CommonActivity {
         setLocale(this, localeCode)
     }
 
-    fun init(act: ComponentActivity?) {
-        if (act == null) return
-        activity = act
+    fun init(act: Activity) {
+        setActivityInstance(act)
+
+        val componentActivity = activity as? ComponentActivity ?: return
+
         //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
         //https://developer.android.com/guide/topics/ui/picture-in-picture
         canShowPipMode =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && // OS SUPPORT
-                    act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
-                    act.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
+                    componentActivity.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
+                    componentActivity.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
 
-        act.updateLocale()
-        act.updateTv()
+        componentActivity.updateLocale()
+        componentActivity.updateTv()
         NewPipe.init(DownloaderTestImpl.getInstance())
 
         for (resumeApp in resumeApps) {
             resumeApp.launcher =
-                act.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                     val resultCode = result.resultCode
                     val data = result.data
                     if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) {
@@ -236,11 +243,11 @@ object CommonActivity {
         // Ask for notification permissions on Android 13
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             ContextCompat.checkSelfPermission(
-                act,
+                componentActivity,
                 Manifest.permission.POST_NOTIFICATIONS
             ) != PackageManager.PERMISSION_GRANTED
         ) {
-            val requestPermissionLauncher = act.registerForActivityResult(
+            val requestPermissionLauncher = componentActivity.registerForActivityResult(
                 ActivityResultContracts.RequestPermission()
             ) { isGranted: Boolean ->
                 Log.d(TAG, "Notification permission: $isGranted")

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

@@ -67,6 +67,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
+import com.lagradost.cloudstream3.CommonActivity.setActivityInstance
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
 import com.lagradost.cloudstream3.databinding.ActivityMainBinding
@@ -590,6 +591,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     override fun onResume() {
         super.onResume()
         afterPluginsLoadedEvent += ::onAllPluginsLoaded
+        setActivityInstance(this)
         try {
             if (isCastApiAvailable()) {
                 //mCastSession = mSessionManager.currentCastSession

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

@@ -110,4 +110,9 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             return
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        CommonActivity.setActivityInstance(this)
+    }
 }