From be53bfa88fddb8f482d579d0e1243fa631836e7e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 7 Dec 2020 14:50:11 -0400 Subject: [PATCH] Hide members list when user enters pip. --- .../org/thoughtcrime/securesms/WebRtcCallActivity.java | 2 ++ .../participantslist/CallParticipantsListDialog.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index 8fc40faa7e..f62b8b2dde 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -81,6 +81,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE"; private CallParticipantsListUpdatePopupWindow participantUpdateWindow; + private CallParticipantsListDialog participantsListDialog; private WebRtcCallView callScreen; private TooltipPopup videoTooltip; @@ -196,6 +197,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe .setAspectRatio(new Rational(9, 16)) .build(); enterPictureInPictureMode(params); + CallParticipantsListDialog.dismiss(getSupportFragmentManager()); return true; } return false; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListDialog.java index c3156d5255..2995f1a4ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListDialog.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; @@ -38,6 +39,13 @@ public class CallParticipantsListDialog extends BottomSheetDialogFragment { fragment.show(manager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG); } + public static void dismiss(@NonNull FragmentManager manager) { + Fragment fragment = manager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG); + if (fragment instanceof CallParticipantsListDialog) { + ((CallParticipantsListDialog) fragment).dismissAllowingStateLoss(); + } + } + @Override public void show(@NonNull FragmentManager manager, @Nullable String tag) { BottomSheetUtil.show(manager, tag, this);