|
@@ -473,15 +473,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
|
|
// load the video file in the video player
|
|
// load the video file in the video player
|
|
// when done, VideoHelper#onPrepared() will be called
|
|
// when done, VideoHelper#onPrepared() will be called
|
|
if (getFile().isDown()) {
|
|
if (getFile().isDown()) {
|
|
- binding.progress.setVisibility(View.GONE);
|
|
|
|
-
|
|
|
|
- exoPlayer.addMediaItem(MediaItem.fromUri(getFile().getStorageUri()));
|
|
|
|
- exoPlayer.prepare();
|
|
|
|
-
|
|
|
|
- if (savedPlaybackPosition >= 0) {
|
|
|
|
- exoPlayer.seekTo(savedPlaybackPosition);
|
|
|
|
- }
|
|
|
|
- exoPlayer.play();
|
|
|
|
|
|
+ playVideoUri(getFile().getStorageUri());
|
|
} else {
|
|
} else {
|
|
try {
|
|
try {
|
|
new LoadStreamUrl(this, user, clientFactory).execute(getFile().getLocalId());
|
|
new LoadStreamUrl(this, user, clientFactory).execute(getFile().getLocalId());
|
|
@@ -491,6 +483,18 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void playVideoUri(final Uri uri) {
|
|
|
|
+ binding.progress.setVisibility(View.GONE);
|
|
|
|
+
|
|
|
|
+ exoPlayer.addMediaItem(MediaItem.fromUri(uri));
|
|
|
|
+ exoPlayer.prepare();
|
|
|
|
+
|
|
|
|
+ if (savedPlaybackPosition >= 0) {
|
|
|
|
+ exoPlayer.seekTo(savedPlaybackPosition);
|
|
|
|
+ }
|
|
|
|
+ exoPlayer.play();
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void onFullScreenModeChanged(boolean isFullScreen) {
|
|
public void onFullScreenModeChanged(boolean isFullScreen) {
|
|
Log_OC.e(TAG, "Fullscreen: " + isFullScreen);
|
|
Log_OC.e(TAG, "Fullscreen: " + isFullScreen);
|
|
@@ -535,12 +539,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
|
|
if (previewMediaFragment != null && previewMediaFragment.binding != null && context != null) {
|
|
if (previewMediaFragment != null && previewMediaFragment.binding != null && context != null) {
|
|
if (uri != null) {
|
|
if (uri != null) {
|
|
previewMediaFragment.videoUri = uri;
|
|
previewMediaFragment.videoUri = uri;
|
|
-
|
|
|
|
- previewMediaFragment.binding.progress.setVisibility(View.GONE);
|
|
|
|
-
|
|
|
|
- previewMediaFragment.exoPlayer.addMediaItem(MediaItem.fromUri(uri));
|
|
|
|
- previewMediaFragment.exoPlayer.prepare();
|
|
|
|
- previewMediaFragment.exoPlayer.play();
|
|
|
|
|
|
+ previewMediaFragment.playVideoUri(uri);
|
|
} else {
|
|
} else {
|
|
previewMediaFragment.emptyListView.setVisibility(View.VISIBLE);
|
|
previewMediaFragment.emptyListView.setVisibility(View.VISIBLE);
|
|
previewMediaFragment.setVideoErrorMessage(
|
|
previewMediaFragment.setVideoErrorMessage(
|