nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10181 from nextcloud/videoFullscreenPause 

Correctly obey play/pause state
This commit is contained in:
Tobias Kaminsky 2022-05-06 14:43:43 +02:00 committed by GitHub
parent b950be1f7d
commit 8d4ed0a862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View File

@ -506,7 +506,10 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
if (savedPlaybackPosition >= 0) {
exoPlayer.seekTo(savedPlaybackPosition);
}
exoPlayer.play();
if (autoplay) {
exoPlayer.play();
}
}
@Override
@ -575,7 +578,6 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
@Override
public void onResume() {
super.onResume();
autoplay = false;
if(getActivity() instanceof FileDisplayActivity){
((FileDisplayActivity) getActivity()).configureToolbarForMediaPreview(getFile());
}

8
app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt
View File

@ -114,6 +114,8 @@ class PreviewVideoActivity :
if (mSavedPlaybackPosition >= 0) {
exoPlayer?.seekTo(mSavedPlaybackPosition)
}
onIsPlayingChanged(exoPlayer!!.isPlaying)
}
override fun onIsPlayingChanged(isPlaying: Boolean) {
@ -200,7 +202,10 @@ class PreviewVideoActivity :
private fun play(item: MediaItem) {
exoPlayer?.addMediaItem(item)
exoPlayer?.prepare()
exoPlayer?.play()
if (mAutoplay) {
exoPlayer?.play()
}
}
override fun onStart() {
@ -220,6 +225,7 @@ class PreviewVideoActivity :
else -> MediaItem.fromUri(mStreamUri!!)
}
if (exoPlayer != null) {
setupPlayerView()
play(mediaItem)
} else {
val context = this