Peertube/TubeLab-App-Android
1
0
Fork 0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-06-05 21:09:11 +02:00
Code Issues Releases Wiki Activity

release 1.1.0-a

Browse Source
This commit is contained in:
Thomas
2020-09-19 18:19:59 +02:00
parent 0a7fab6883
commit eef6b3d76c
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
View File

@ -28,6 +28,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.media.session.MediaSessionCompat;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
@ -61,6 +62,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import com.google.android.exoplayer2.ui.PlayerControlView;
@ -732,7 +734,12 @@ public class PeertubeActivity extends AppCompatActivity {
}
private void enterVideoMode() {
if (playInMinimized && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (playInMinimized && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && player != null && player.isPlaying()) {
MediaSessionCompat mediaSession = new MediaSessionCompat(this, getPackageName());
MediaSessionConnector mediaSessionConnector = new MediaSessionConnector(mediaSession);
mediaSessionConnector.setPlayer(player);
playerView.setControllerAutoShow(false);
mediaSession.setActive(true);
enterPictureInPictureMode();
}
}
@ -740,7 +747,7 @@ public class PeertubeActivity extends AppCompatActivity {
@Override
public void onBackPressed() {
if (playInMinimized) {
if (playInMinimized && player != null && player.isPlaying()) {
enterVideoMode();
} else {
super.onBackPressed();