From ee47c1ea10e486d65a99047decf18aaf13200327 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 15 Dec 2023 11:41:47 -0500 Subject: [PATCH] Fix calling controll visibility bugs. --- .../securesms/components/webrtc/CallParticipantView.java | 4 ---- .../components/webrtc/controls/ControlsAndInfoController.kt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java index fa5b28da24..af063c6d99 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java @@ -172,10 +172,6 @@ public class CallParticipantView extends ConstraintLayout { audioIndicator.setVisibility(View.VISIBLE); audioIndicator.bind(participant.isMicrophoneEnabled(), participant.getAudioLevel()); - - if (selfPipMode != SelfPipMode.NOT_SELF_PIP) { - switchCameraIconFrame.setVisibility(participant.isVideoEnabled() ? View.VISIBLE : View.GONE); - } } if (participantChanged || !Objects.equals(contactPhoto, participant.getRecipient().getContactPhoto())) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt index f058965c95..4c06dec924 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt @@ -224,7 +224,7 @@ class ControlsAndInfoController( showOrHideControlsOnUpdate(previousState) - if (controlState.controlVisibilitiesChanged(previousState)) { + if (controlState != WebRtcControls.PIP && controlState.controlVisibilitiesChanged(previousState)) { updateControlVisibilities() } }