Merge pull request #4177 from parneet-guraya/migrate-to-media3

Migrate to media3

Author: JuancaG05

gradle/libs.versions.toml

@@ -24,7 +24,7 @@ androidxWork = "2.8.1"
 coil = "2.2.2"
 dexopener = "2.0.5"
 disklrucache = "2.0.2"
-exoplayer ="2.16.1"
+media3 ="1.1.1"
 floatingactionbutton = "1.10.1"
 glide = "4.15.1"
 glideToVectorYou = "v2.0.0"
@@ -81,7 +81,8 @@ androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx"
 coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
 dexopener = { group = "com.github.tmurakami", name = "dexopener", version.ref = "dexopener" }
 disklrucache = { group = "com.jakewharton", name = "disklrucache", version.ref = "disklrucache" }
-exoplayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref = "exoplayer" }
+media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
+media3-ui = { group = "androidx.media3", name = "media3-ui", version.ref = "media3" }
 floatingactionbutton = { group = "com.getbase", name = "floatingactionbutton", version.ref = "floatingactionbutton" }
 glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
 glide-vector = { group = "com.github.2coffees1team", name = "GlideToVectorYou", version.ref = "glideToVectorYou" }

owncloudApp/build.gradle

@@ -49,7 +49,8 @@ dependencies {
 
     // Miscellaneous
     implementation libs.disklrucache
-    implementation libs.exoplayer
+    implementation libs.media3.exoplayer
+    implementation libs.media3.ui
     implementation libs.floatingactionbutton
     implementation libs.material
     implementation libs.patternlockview

owncloudApp/src/main/AndroidManifest.xml

@@ -56,9 +56,16 @@
         android:supportsPictureInPicture="false"
         android:taskAffinity=""
         android:theme="@style/Theme.ownCloud.Toolbar">
+        <activity
+            android:name=".ui.preview.PreviewVideoActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:theme="@style/Theme.ownCloud.Video"
+            android:exported="false" />
 
-        <meta-data android:name="android.content.APP_RESTRICTIONS"
+        <meta-data
+            android:name="android.content.APP_RESTRICTIONS"
             android:resource="@xml/managed_configurations" />
+
         <activity
             android:name=".presentation.releasenotes.ReleaseNotesActivity"
             android:exported="false" />
@@ -67,10 +74,11 @@
         <activity android:name=".presentation.migration.StorageMigrationActivity" />
         <activity
             android:name=".ui.activity.SplashActivity"
-            android:theme="@style/Theme.ownCloud.Splash"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.ownCloud.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -83,8 +91,8 @@
             android:name=".ui.activity.ReceiveExternalFilesActivity"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
-            android:taskAffinity=""
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -168,8 +176,8 @@
 
         <activity
             android:name=".presentation.security.passcode.PassCodeActivity"
-            android:theme="@style/Theme.ownCloud"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.ownCloud" />
         <activity
             android:name=".presentation.conflicts.ConflictsResolveActivity"
             android:theme="@style/Theme.ownCloud" />
@@ -191,11 +199,11 @@
         <activity android:name=".ui.activity.UploadPathActivity" />
         <activity
             android:name=".presentation.sharing.ShareActivity"
+            android:exported="false"
             android:label="@string/share_dialog_title"
             android:launchMode="singleTop"
             android:theme="@style/Theme.ownCloud"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="false">
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -208,10 +216,6 @@
             android:name=".ui.activity.ManageSpaceActivity"
             android:label="@string/manage_space_title"
             android:theme="@style/Theme.ownCloud" />
-        <activity
-            android:name=".ui.preview.PreviewVideoActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
-            android:theme="@style/Theme.ownCloud.Fullscreen" />
         <activity
             android:name=".presentation.security.pattern.PatternActivity"
             android:screenOrientation="portrait"
@@ -234,4 +238,5 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+
+</manifest>

owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt

@@ -74,7 +74,7 @@ import com.owncloud.android.ui.fragment.FileFragment
 import com.owncloud.android.ui.preview.PreviewAudioFragment
 import com.owncloud.android.ui.preview.PreviewImageFragment
 import com.owncloud.android.ui.preview.PreviewTextFragment
-import com.owncloud.android.ui.preview.PreviewVideoFragment
+import com.owncloud.android.ui.preview.PreviewVideoActivity
 import com.owncloud.android.usecases.synchronization.SynchronizeFileUseCase
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.MimetypeIconUtil
@@ -533,7 +533,7 @@ class FileDetailsFragment : FileFragment() {
                 fileDisplayActivity.startAudioPreview(fileWaitingToPreview, 0)
             }
 
-            PreviewVideoFragment.canBePreviewed(fileWaitingToPreview) -> {
+            PreviewVideoActivity.canBePreviewed(fileWaitingToPreview) -> {
                 fileDisplayActivity.startVideoPreview(fileWaitingToPreview, 0)
             }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt

@@ -104,7 +104,6 @@ import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.FolderPickerActivity
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
-import com.owncloud.android.ui.preview.PreviewVideoFragment
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.MimetypeIconUtil
 import com.owncloud.android.utils.PreferenceUtils
@@ -1135,16 +1134,8 @@ class MainFileListFragment : Fragment(),
             downloadWorkerUuid = fileWithSyncInfo.downloadWorkerUuid,
             isSynchronizing = fileWithSyncInfo.isSynchronizing
         )
-
-        val secondFragment = requireActivity().supportFragmentManager.findFragmentByTag(TAG_SECOND_FRAGMENT)
-        val isAnyFileVideoPreviewing = if (secondFragment is PreviewVideoFragment) {
-            secondFragment.file == file
-        } else {
-            false
-        }
-
         mainFileListViewModel.filterMenuOptions(
-            listOf(file), listOf(fileSync), isAnyFileVideoPreviewing,
+            listOf(file), listOf(fileSync),
             displaySelectAll = false, isMultiselection = false
         )
     }
@@ -1199,15 +1190,9 @@ class MainFileListFragment : Fragment(),
                 )
             }
 
-            val secondFragment = requireActivity().supportFragmentManager.findFragmentByTag(TAG_SECOND_FRAGMENT)
-            val isAnyFileVideoPreviewing = if (secondFragment is PreviewVideoFragment) {
-                checkedFiles.any { secondFragment.file == it }
-            } else {
-                false
-            }
             val displaySelectAll = checkedCount != fileListAdapter.itemCount - 1 // -1 because one of them is the footer :S
             mainFileListViewModel.filterMenuOptions(
-                checkedFiles, checkedFilesSync, isAnyFileVideoPreviewing,
+                checkedFiles, checkedFilesSync,
                 displaySelectAll, isMultiselection = true
             )
 

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListViewModel.kt

@@ -300,7 +300,7 @@ class MainFileListViewModel(
     }
 
     fun filterMenuOptions(
-        files: List<OCFile>, filesSyncInfo: List<OCFileSyncInfo>, isAnyFileVideoPreviewing: Boolean,
+        files: List<OCFile>, filesSyncInfo: List<OCFileSyncInfo>,
         displaySelectAll: Boolean, isMultiselection: Boolean
     ) {
         val shareViaLinkAllowed = contextProvider.getBoolean(R.bool.share_via_link_feature)
@@ -312,7 +312,7 @@ class MainFileListViewModel(
                     files = files,
                     filesSyncInfo = filesSyncInfo,
                     accountName = currentFolderDisplayed.value.owner,
-                    isAnyFileVideoPreviewing = isAnyFileVideoPreviewing,
+                    isAnyFileVideoPreviewing = false,
                     displaySelectAll = displaySelectAll,
                     displaySelectInverse = isMultiselection,
                     onlyAvailableOfflineFiles = fileListOption.value.isAvailableOffline(),

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -105,7 +105,6 @@ import com.owncloud.android.ui.preview.PreviewImageActivity
 import com.owncloud.android.ui.preview.PreviewImageFragment
 import com.owncloud.android.ui.preview.PreviewTextFragment
 import com.owncloud.android.ui.preview.PreviewVideoActivity
-import com.owncloud.android.ui.preview.PreviewVideoFragment
 import com.owncloud.android.usecases.synchronization.SynchronizeFileUseCase
 import com.owncloud.android.usecases.transfers.downloads.DownloadFileUseCase
 import com.owncloud.android.utils.PreferenceUtils
@@ -430,7 +429,7 @@ class FileDisplayActivity : FileActivity(),
         // Otherwise, decide which fragment should be shown.
         return when {
             PreviewAudioFragment.canBePreviewed(file) -> {
-                val startPlaybackPosition = intent.getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0)
+                val startPlaybackPosition = intent.getIntExtra(PreviewVideoActivity.EXTRA_PLAY_POSITION, 0)
                 val autoplay = intent.getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true)
                 PreviewAudioFragment.newInstance(
                     file,
@@ -440,17 +439,6 @@ class FileDisplayActivity : FileActivity(),
                 )
             }
 
-            PreviewVideoFragment.canBePreviewed(file) -> {
-                val startPlaybackPosition = intent.getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0)
-                val autoplay = intent.getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true)
-                PreviewVideoFragment.newInstance(
-                    file,
-                    account,
-                    startPlaybackPosition,
-                    autoplay
-                )
-            }
-
             PreviewTextFragment.canBePreviewed(file) -> {
                 PreviewTextFragment.newInstance(
                     file,
@@ -459,7 +447,7 @@ class FileDisplayActivity : FileActivity(),
             }
 
             else -> {
-                FileDetailsFragment.newInstance(file, account)
+                FileDetailsFragment.newInstance(file, account, false)
             }
         }
     }
@@ -971,10 +959,6 @@ class FileDisplayActivity : FileActivity(),
                         is PreviewAudioFragment -> {
                             secondFragment.stopPreview()
                         }
-
-                        is PreviewVideoFragment -> {
-                            secondFragment.releasePlayer()
-                        }
                     }
                     file = storageManager.getFileById(lastRemovedFile.parentId!!)
                     cleanSecondFragment()
@@ -1546,15 +1530,11 @@ class FileDisplayActivity : FileActivity(),
      * in milliseconds.
      */
     fun startVideoPreview(file: OCFile, startPlaybackPosition: Int) {
-        val mediaFragment = PreviewVideoFragment.newInstance(
-            file,
-            account,
-            startPlaybackPosition,
-            true
-        )
-        setSecondFragment(mediaFragment)
-        updateToolbar(file)
-        setFile(file)
+        val videoActivityIntent = Intent(this, PreviewVideoActivity::class.java)
+        videoActivityIntent.putExtra(PreviewVideoActivity.EXTRA_FILE, file)
+        videoActivityIntent.putExtra(PreviewVideoActivity.EXTRA_ACCOUNT, account)
+        videoActivityIntent.putExtra(PreviewVideoActivity.EXTRA_PLAY_POSITION, startPlaybackPosition)
+        startActivity(videoActivityIntent)
     }
 
     /**
@@ -1728,7 +1708,7 @@ class FileDisplayActivity : FileActivity(),
                 fileOperationsViewModel.performOperation(FileOperation.SynchronizeFileOperation(file, account.name))
             }
 
-            PreviewVideoFragment.canBePreviewed(file) && !WorkManager.getInstance(this).isDownloadPending(account, file) -> {
+            PreviewVideoActivity.canBePreviewed(file) && !WorkManager.getInstance(this).isDownloadPending(account, file) -> {
                 // Available offline but not downloaded yet, don't initialize streaming
                 if (!file.isAvailableLocally && file.isAvailableOffline) {
                     // sync file content, then open with external apps

owncloudApp/src/main/java/com/owncloud/android/ui/preview/CustomHttpDataSourceFactory.java

@@ -20,18 +20,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
-import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
-import com.google.android.exoplayer2.upstream.TransferListener;
+import androidx.annotation.OptIn;
+import androidx.media3.common.util.UnstableApi;
+import androidx.media3.datasource.DefaultHttpDataSource;
+import androidx.media3.datasource.HttpDataSource;
+import androidx.media3.datasource.TransferListener;
 
 import java.util.Map;
 
 /**
  * A {@link Factory} that produces {@link CustomHttpDataSourceFactory} instances.
  */
-public final class CustomHttpDataSourceFactory extends BaseFactory {
+@OptIn(markerClass = UnstableApi.class)
+public final class CustomHttpDataSourceFactory extends HttpDataSource.BaseFactory {
 
     private final String userAgent;
     private final TransferListener listener;

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PrepareVideoPlayerAsyncTask.java

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;
@@ -27,15 +26,17 @@
 import android.os.AsyncTask;
 import android.util.Base64;
 
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
+import androidx.annotation.OptIn;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.util.UnstableApi;
+import androidx.media3.datasource.DataSource;
+import androidx.media3.datasource.DefaultDataSourceFactory;
+import androidx.media3.datasource.DefaultHttpDataSource;
+import androidx.media3.datasource.HttpDataSource;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.source.ProgressiveMediaSource;
+import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
+import androidx.media3.extractor.DefaultExtractorsFactory;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.domain.files.model.OCFile;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
@@ -53,20 +54,22 @@
 /**
  * Task for prepare video player asynchronously
  */
+@OptIn(markerClass = UnstableApi.class)
 public class PrepareVideoPlayerAsyncTask extends AsyncTask<Object, Void, MediaSource> {
 
     private final Context mContext;
     private final WeakReference<OnPrepareVideoPlayerTaskListener> mListener;
     private final OCFile mFile;
     private final Account mAccount;
 
-    private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();
+    private static DefaultBandwidthMeter BANDWIDTH_METER;
 
     public PrepareVideoPlayerAsyncTask(Context context, OnPrepareVideoPlayerTaskListener listener, OCFile file, Account account) {
         mContext = context;
         mListener = new WeakReference<>(listener);
         mFile = file;
         mAccount = account;
+        BANDWIDTH_METER = new DefaultBandwidthMeter.Builder(mContext).build();
     }
 
     @Override
@@ -79,8 +82,7 @@ protected MediaSource doInBackground(Object... params) {
         try {
             // If the file is already downloaded, reproduce it locally, if not, do streaming
             uri = mFile.isAvailableLocally() ? UriUtilsKt.INSTANCE.getStorageUriForFile(mFile) :
-                    Uri.parse(AccountUtils.getWebDavUrlForAccount(mContext, mAccount) +
-                            Uri.encode(mFile.getRemotePath(), "/"));
+                    Uri.parse(AccountUtils.getWebDavUrlForAccount(mContext, mAccount) + Uri.encode(mFile.getRemotePath(), "/"));
 
             boolean useBandwidthMeter = true;
 
@@ -121,10 +123,7 @@ private MediaSource buildMediaSource(DataSource.Factory mediaDataSourceFactory,
      *                       DataSource factory.
      * @return A new HttpDataSource factory.
      */
-    private HttpDataSource.Factory buildHttpDataSourceFactory(
-            DefaultBandwidthMeter bandwidthMeter,
-            OCFile file,
-            Account account) {
+    private HttpDataSource.Factory buildHttpDataSourceFactory(DefaultBandwidthMeter bandwidthMeter, OCFile file, Account account) {
 
         if (file.isAvailableLocally()) {
 
@@ -150,8 +149,7 @@ private HttpDataSource.Factory buildHttpDataSourceFactory(
                     params.put("Authorization", auth);
                 }
 
-                return new CustomHttpDataSourceFactory(MainApp.Companion.getUserAgent(),
-                        bandwidthMeter, params);
+                return new CustomHttpDataSourceFactory(MainApp.Companion.getUserAgent(), bandwidthMeter, params);
 
             } catch (AuthenticatorException | IOException | OperationCanceledException e) {
                 Timber.e(e);