Merge pull request #17470 from nextcloud/fix/media-player-when-task-in-background

fix(media): video player returning from background

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt

@@ -306,10 +306,9 @@ class PreviewImageActivity :
                 // / Refresh the activity according to the Account and OCFile set
                 setFile(file) // reset after getting it fresh from storageManager
                 updateActionBarTitle(getFile()?.fileName)
-                // if (!stateWasRecovered) {
-                initViewPager(optionalUser.get())
-
-                // }
+                if (previewMediaPagerAdapter == null) {
+                    initViewPager(optionalUser.get())
+                }
             } else {
                 // handled file not in the current Account
                 finish()

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

@@ -138,6 +138,7 @@ class PreviewMediaActivity :
     private var videoMediaSession: MediaSession? = null
     private var audioMediaController: MediaController? = null
     private var mediaControllerFuture: ListenableFuture<MediaController>? = null
+    private var fullscreenDialog: PreviewVideoFullscreenDialog? = null
     private lateinit var windowInsetsController: WindowInsetsControllerCompat
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -319,14 +320,14 @@ class PreviewMediaActivity :
 
     override fun onStart() {
         super.onStart()
-
         Log_OC.v(TAG, "onStart")
-
-        if (MimeTypeUtil.isVideo(file)) {
+        if (MimeTypeUtil.isVideo(file) && videoPlayer == null) {
             initializeVideoPlayer()
         }
     }
 
+    private fun isFullscreenActive(): Boolean = fullscreenDialog?.isShowing == true
+
     private fun initializeVideoPlayer() {
         lifecycleScope.launch(Dispatchers.IO) {
             val client = clientRepository.getNextcloudClient() ?: return@launch
@@ -515,10 +516,12 @@ class PreviewMediaActivity :
         )
             .apply {
                 setOnDismissListener {
+                    fullscreenDialog = null
                     setupVideoView()
                 }
             }
 
+        fullscreenDialog = dialog
         dialog.show()
     }
 
@@ -770,15 +773,17 @@ class PreviewMediaActivity :
 
     override fun onDestroy() {
         mediaControllerFuture?.let { MediaController.releaseFuture(it) }
+        releaseVideoPlayer()
         super.onDestroy()
 
         Log_OC.v(TAG, "onDestroy")
     }
 
     override fun onStop() {
         Log_OC.v(TAG, "onStop")
-
-        releaseVideoPlayer()
+        if (!isFullscreenActive()) {
+            releaseVideoPlayer()
+        }
         super.onStop()
     }
 

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt

@@ -187,6 +187,9 @@ class PreviewMediaFragment :
 
     override fun onResume() {
         super.onResume()
+        if (isFullscreenActive) {
+            return
+        }
         applyWindowInsets()
         prepareMedia()
     }