feat: Migrate from the old exoPlayer to the new Media3

app/build.gradle.kts

@@ -214,9 +214,10 @@ dependencies {
     ksp(core.hilt.androidx.compiler)
 
     implementation(libs.exoplayer)
-    implementation(libs.exoplayer.core)
-    implementation(libs.exoplayer.ui)
-    implementation(libs.extension.okhttp)
+    implementation(libs.exoplayer.dash)
+    implementation(libs.exoplayer.media3.ui)
+    implementation(libs.exoplayer.media3.datasource)
+    implementation(libs.exoplayer.media3.session)
 
     implementation(libs.android.pdfview)
     implementation(libs.gravity.snap.helper)

app/src/main/AndroidManifest.xml

@@ -39,6 +39,7 @@
         android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED"
         android:minSdkVersion="34" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
@@ -103,11 +104,26 @@
             android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize|layoutDirection|screenLayout" />
 
+        <activity
+            android:name=".ui.fileList.preview.playback.VideoActivity"
+            android:configChanges="orientation|screenSize|layoutDirection|screenLayout|smallestScreenSize"
+            android:launchMode="singleInstance"
+            android:supportsPictureInPicture="true" />
+
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
 
+        <service
+            android:name=".ui.fileList.preview.playback.PlaybackService"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService" />
+            </intent-filter>
+        </service>
+
         <activity android:name=".ui.menu.settings.SyncSettingsActivity" />
 
         <activity android:name=".ui.MaintenanceActivity" />

app/src/main/java/com/infomaniak/drive/MainApplication.kt

@@ -92,6 +92,7 @@ open class MainApplication : Application(), SingletonImageLoader.Factory, Defaul
     }
 
     var geniusScanIsReady = false
+    var isVideoActivityInPIPMode = false
 
     private val appUpdateWorkerScheduler by lazy { AppUpdateScheduler(applicationContext) }
 

app/src/main/java/com/infomaniak/drive/data/models/File.kt

@@ -194,6 +194,7 @@ open class File(
     }
 
     fun isPDF() = getFileType() == ExtensionType.PDF
+    fun isVideo() = getFileType() == ExtensionType.VIDEO
 
     fun getFileType(): ExtensionType {
         return if (isFromUploads) getFileTypeFromExtension() else when (extensionType) {

app/src/main/java/com/infomaniak/drive/ui/BasePreviewSliderFragment.kt

@@ -22,11 +22,13 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.annotation.CallSuper
+import androidx.annotation.OptIn
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.media3.common.util.UnstableApi
 import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionManager
 import androidx.viewpager2.widget.ViewPager2
@@ -47,6 +49,8 @@ import com.infomaniak.drive.ui.fileList.preview.PreviewPDFFragment
 import com.infomaniak.drive.ui.fileList.preview.PreviewPDFHandler
 import com.infomaniak.drive.ui.fileList.preview.PreviewSliderAdapter
 import com.infomaniak.drive.ui.fileList.preview.PreviewSliderViewModel
+import com.infomaniak.drive.ui.fileList.preview.playback.PlaybackUtils
+import com.infomaniak.drive.ui.fileList.preview.playback.PreviewPlaybackFragment
 import com.infomaniak.drive.utils.DrivePermissions
 import com.infomaniak.drive.utils.Utils.openWith
 import com.infomaniak.drive.utils.openOnlyOfficeDocument
@@ -60,6 +64,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
+@OptIn(UnstableApi::class)
 abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnItemClickListener {
 
     protected var _binding: FragmentPreviewSliderBinding? = null
@@ -77,8 +82,16 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
     private var isOverlayShown = true
 
     override val currentContext by lazy { requireContext() }
+
+    private val bottomSheetUpdates = MutableSharedFlow<File>(extraBufferCapacity = 1)
+
     override lateinit var currentFile: File
 
+    var positionsForMedia: MutableMap<Int, Long> = mutableMapOf()
+
+    // If the user want to navigate back and something is playing, we don't want to start PIP
+    private var hasNavigateBack = false
+
     // This is not protected, otherwise it won't build because PublicSharePreviewSliderFragment needs it public for the interface
     // it implements
     val downloadPermissions: DrivePermissions = DrivePermissions(type = DrivePermissions.Type.DownloadingWithDownloadManager)
@@ -109,7 +122,7 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
         header.apply {
             setupWindowInsetsListener(root, bottomSheetView) { pdfContainer.setMargins(right = it?.right ?: 0) }
             setup(
-                onBackClicked = findNavController()::popBackStack,
+                onBackClicked = ::navigateBack,
                 onOpenWithClicked = ::openWith,
                 onEditClicked = { openOnlyOfficeDocument(currentFile, mainViewModel.hasNetwork) },
             )
@@ -127,36 +140,7 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
             isPublicShared = isPublicShared,
         )
 
-        viewPager.apply {
-            adapter = previewSliderAdapter
-            offscreenPageLimit = 1
-
-            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    val file = previewSliderAdapter.getFile(position)
-                    currentFile = file
-                    previewSliderViewModel.currentPreview = file
-
-                    var shouldDisplayPageNumber = false
-
-                    childFragmentManager.findFragmentByTag("f${previewSliderAdapter.getItemId(position)}")?.apply {
-                        trackScreen()
-                        shouldDisplayPageNumber = this is PreviewPDFFragment && tryToUpdatePageCount()
-                    }
-
-                    with(header) {
-                        toggleEditVisibility(isVisible = file.isOnlyOfficePreview())
-                        setPageNumberVisibility(isVisible = shouldDisplayPageNumber)
-                        toggleOpenWithVisibility(isVisible = !isPublicShared && !file.isOnlyOfficePreview())
-                    }
-
-                    setPrintButtonVisibility(isGone = !file.isPDF() || !canDownloadFiles)
-
-                    (bottomSheetView as? FileInfoActionsView)?.openWith?.isGone = isPublicShared
-                    bottomSheetUpdates.tryEmit(file)
-                }
-            })
-        }
+        initViewPager()
 
         previewSliderViewModel.pdfIsDownloading.observe(viewLifecycleOwner) { isDownloading ->
             if (!currentFile.isOnlyOfficePreview()) header.toggleOpenWithVisibility(isVisible = !isDownloading)
@@ -189,6 +173,14 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
         }
     }
 
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
+        if (isInPictureInPictureMode) {
+            binding.header.toggleVisibility(isVisible = false)
+            toggleBottomSheet(shouldShow = false)
+        }
+    }
+
     override fun onPause() {
         super.onPause()
         if (noPreviewList()) return
@@ -200,6 +192,7 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
         super.onStop()
     }
 
+    @OptIn(UnstableApi::class)
     override fun onDestroyView() {
         super.onDestroyView()
         _binding?.previewSliderParent?.let(TransitionManager::endTransitions)
@@ -213,9 +206,61 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
             mainViewModel.currentPreviewFileList = LinkedHashMap()
         }
 
+        // Release Player
+        PlaybackUtils.releasePlayer()
+
         super.onDestroy()
     }
 
+    private fun initViewPager() = with(binding) {
+        viewPager.apply {
+            adapter = previewSliderAdapter
+            offscreenPageLimit = 1
+
+            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+
+                @OptIn(UnstableApi::class)
+                override fun onPageSelected(position: Int) {
+
+                    val file = previewSliderAdapter.getFile(position)
+                    currentFile = file
+                    previewSliderViewModel.currentPreview = file
+
+                    var shouldDisplayPageNumber = false
+
+                    val selectedFragment =
+                        childFragmentManager.findFragmentByTag("f${previewSliderAdapter.getItemId(position)}")?.apply {
+                            this.trackScreen()
+                            shouldDisplayPageNumber = this is PreviewPDFFragment && tryToUpdatePageCount()
+                        }
+
+                    // Implementation of onFragmentUnselected to handle resume of media to the same position, only
+                    // for PreviewPlaybackFragment.
+                    childFragmentManager.fragments.filterIsInstance<PreviewPlaybackFragment>().forEach { fragment ->
+                        if (fragment != selectedFragment) {
+                            fragment.onFragmentUnselected()
+                        }
+                    }
+
+                    with(header) {
+                        toggleEditVisibility(isVisible = currentFile.isOnlyOfficePreview())
+                        setPageNumberVisibility(isVisible = shouldDisplayPageNumber)
+                        toggleOpenWithVisibility(isVisible = !isPublicShared && !currentFile.isOnlyOfficePreview())
+                    }
+
+                    setPrintButtonVisibility(isGone = !file.isPDF() || !canDownloadFiles)
+                    (bottomSheetView as? FileInfoActionsView)?.openWith?.isGone = isPublicShared
+                    bottomSheetUpdates.tryEmit(file)
+                }
+            })
+        }
+    }
+
+    private fun navigateBack() {
+        hasNavigateBack = true
+        findNavController().popBackStack()
+    }
+
     protected fun noPreviewList() = mainViewModel.currentPreviewFileList.isEmpty()
 
     protected open fun setBackActionHandlers() {
@@ -244,8 +289,6 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
         }
     }
 
-    private val bottomSheetUpdates = MutableSharedFlow<File>(extraBufferCapacity = 1)
-
     private fun clearEdgeToEdge() = with(requireActivity()) {
         toggleSystemBar(true)
     }

app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt

@@ -21,6 +21,8 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.ContentResolver
 import android.content.Context
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -40,6 +42,7 @@ import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult
 import androidx.activity.viewModels
+import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.toBitmap
@@ -49,6 +52,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
@@ -76,6 +80,7 @@ import com.infomaniak.core.legacy.utils.whenResultIsOk
 import com.infomaniak.core.observe
 import com.infomaniak.drive.GeniusScanUtils.scanResultProcessing
 import com.infomaniak.drive.GeniusScanUtils.startScanFlow
+import com.infomaniak.drive.MainApplication
 import com.infomaniak.drive.MatomoDrive.MatomoCategory
 import com.infomaniak.drive.MatomoDrive.MatomoName
 import com.infomaniak.drive.MatomoDrive.trackAccountEvent
@@ -101,6 +106,7 @@ import com.infomaniak.drive.extensions.trackDestination
 import com.infomaniak.drive.ui.addFiles.AddFileBottomSheetDialogArgs
 import com.infomaniak.drive.ui.bottomSheetDialogs.FileInfoActionsBottomSheetDialogArgs
 import com.infomaniak.drive.ui.fileList.FileListFragmentArgs
+import com.infomaniak.drive.ui.fileList.preview.playback.VideoActivity
 import com.infomaniak.drive.utils.AccountUtils
 import com.infomaniak.drive.utils.DownloadOfflineFileManager
 import com.infomaniak.drive.utils.DrivePermissions
@@ -427,6 +433,7 @@ class MainActivity : BaseActivity() {
     }
     //endregion
 
+    @OptIn(UnstableApi::class)
     override fun onResume() {
         super.onResume()
 
@@ -438,6 +445,19 @@ class MainActivity : BaseActivity() {
 
         setBottomNavigationUserAvatar(this)
         startContentObserverService()
+
+        finishPIPActivity()
+    }
+
+    @OptIn(UnstableApi::class)
+    private fun finishPIPActivity() {
+        lifecycleScope.launch {
+            if ((application as MainApplication).isVideoActivityInPIPMode) {
+                startActivity(Intent(this@MainActivity, VideoActivity::class.java).apply {
+                    flags = FLAG_ACTIVITY_REORDER_TO_FRONT
+                })
+            }
+        }
     }
 
     private fun launchNextDeleteRequest() {

app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewSliderAdapter.kt

@@ -17,13 +17,16 @@
  */
 package com.infomaniak.drive.ui.fileList.preview
 
+import androidx.annotation.OptIn
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
+import androidx.media3.common.util.UnstableApi
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.infomaniak.drive.data.models.ExtensionType
 import com.infomaniak.drive.data.models.File
 import com.infomaniak.drive.data.models.UserDrive
+import com.infomaniak.drive.ui.fileList.preview.playback.PreviewPlaybackFragment
 
 class PreviewSliderAdapter(
     manager: FragmentManager,
@@ -37,14 +40,14 @@ class PreviewSliderAdapter(
 
     override fun getItemCount() = files.size
 
+    @OptIn(UnstableApi::class)
     override fun createFragment(position: Int): Fragment {
         val file = getFile(position)
         val args = PreviewFragmentArgs(fileId = file.id, userDrive = userDrive, isPublicShared = isPublicShared).toBundle()
 
         return when (file.getFileType()) {
             ExtensionType.IMAGE -> PreviewPictureFragment()
-            ExtensionType.VIDEO -> PreviewVideoFragment()
-            ExtensionType.AUDIO -> PreviewMusicFragment()
+            ExtensionType.VIDEO, ExtensionType.AUDIO -> PreviewPlaybackFragment()
             ExtensionType.PDF -> PreviewPDFFragment()
             else -> if (file.isOnlyOfficePreview()) PreviewPDFFragment() else PreviewOtherFragment()
         }.apply { arguments = args }