From cd9a160cae370a93b68b4a7e501562e02d0ef6aa Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 1 Jun 2023 09:55:15 -0300
Subject: [PATCH] Fix pip offset.

---
 .../components/webrtc/WebRtcCallView.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
index 5662500ce5..e042bbf359 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -375,12 +375,10 @@ public class WebRtcCallView extends ConstraintLayout {
 
   @Override
   public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-    if (android.os.Build.VERSION.SDK_INT >= 20) {
-      navBarBottomInset = WindowInsetsCompat.toWindowInsetsCompat(insets).getInsets(WindowInsetsCompat.Type.navigationBars()).bottom;
+    navBarBottomInset = WindowInsetsCompat.toWindowInsetsCompat(insets).getInsets(WindowInsetsCompat.Type.navigationBars()).bottom;
 
-      if (lastState != null) {
-        updateCallParticipants(lastState);
-      }
+    if (lastState != null) {
+      updateCallParticipants(lastState);
     }
 
     return super.onApplyWindowInsets(insets);
@@ -391,9 +389,9 @@ public class WebRtcCallView extends ConstraintLayout {
     if ((visible & SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
       if (controls.adjustForFold()) {
         pictureInPictureGestureHelper.clearVerticalBoundaries();
-        pictureInPictureGestureHelper.setTopVerticalBoundary(largeHeader.getTop());
+        pictureInPictureGestureHelper.setTopVerticalBoundary(getPipBarrier().getTop());
       } else {
-        pictureInPictureGestureHelper.setTopVerticalBoundary(largeHeader.getBottom());
+        pictureInPictureGestureHelper.setTopVerticalBoundary(getPipBarrier().getBottom());
         pictureInPictureGestureHelper.setBottomVerticalBoundary(videoToggle.getTop());
       }
     } else {
@@ -579,6 +577,14 @@ public class WebRtcCallView extends ConstraintLayout {
     setStatus(getContext().getString(statusRes));
   }
 
+  private @NonNull View getPipBarrier() {
+    if (collapsedToolbar.isEnabled()) {
+      return collapsedToolbar;
+    } else {
+      return largeHeader;
+    }
+  }
+
   public void setStatusFromHangupType(@NonNull HangupMessage.Type hangupType) {
     switch (hangupType) {
       case NORMAL: