thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

fix crash on PIP (Christian Schneppe)

Browse source
This commit is contained in:
12aw 2022-09-01 21:22:23 +02:00
parent 2fea930bfa
commit 28fb03321e
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java
View file

@ -378,15 +378,17 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On
try {
binding.messageVideoView.hideController();
binding.speedDial.setVisibility(View.GONE);
if (Compatibility.runsTwentySix()) {
final Rational rational = new Rational(width, height);
final Rational clippedRational = Rationals.clip(rational);
final PictureInPictureParams params = new PictureInPictureParams.Builder()
.setAspectRatio(clippedRational)
.build();
this.enterPictureInPictureMode(params);
} else {
this.enterPictureInPictureMode();
if (supportsPIP()) {
if (Compatibility.runsTwentySix()) {
final Rational rational = new Rational(width, height);
final Rational clippedRational = Rationals.clip(rational);
final PictureInPictureParams params = new PictureInPictureParams.Builder()
.setAspectRatio(clippedRational)
.build();
this.enterPictureInPictureMode(params);
} else {
this.enterPictureInPictureMode();
}
}
} catch (final IllegalStateException e) {
// this sometimes happens on Samsung phones (possibly when Knox is enabled)
@ -422,7 +424,7 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On
@Override
public void onBackPressed() {
if (isVideo && isPlaying() && Compatibility.runsTwentyFour() && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
if (isVideo && isPlaying() && supportsPIP()) {
PIPVideo();
} else {
super.onBackPressed();
@ -484,7 +486,7 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On
private void stopPlayer() {
if (player != null && isVideo) {
if ((Compatibility.runsTwentyFour()) && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
if (supportsPIP()) {
finishAndRemoveTask();
}
if (isPlaying()) {
@ -595,4 +597,12 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On
private void hideFAB() {
binding.speedDial.hide();
}
private boolean supportsPIP() {
if (Compatibility.runsTwentyFour()) {
return this.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
} else {
return false;
}
}
}