From 415dbd1b619f1ad139411d64f4d43213d2fc71ef Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 25 Feb 2026 10:45:06 -0400 Subject: [PATCH] Fix issue with joining video call from lock screen. Co-authored-by: Greyson Parrelli --- .../securesms/components/webrtc/v2/WebRtcCallActivity.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt index b453bb0a8d..67d000aa37 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt @@ -1110,18 +1110,18 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re /** * Controls lock screen and screen-on behavior based on call state. - * - Show over lock screen: Only for incoming ringing calls, so user can answer. + * - Show over lock screen: For any ongoing call state, so the call UI remains visible + * if the call was answered from the lock screen. * - Turn screen on: For any ongoing call state, so screen stays on during call. */ private fun setTurnScreenOnForCallState(callState: WebRtcViewModel.State) { - val isIncomingRinging = callState == WebRtcViewModel.State.CALL_INCOMING val isOngoingCall = callState.inOngoingCall if (Build.VERSION.SDK_INT >= 27) { - setShowWhenLocked(isIncomingRinging) + setShowWhenLocked(isOngoingCall) setTurnScreenOn(isOngoingCall) } else { @Suppress("DEPRECATION") - if (isIncomingRinging) { + if (isOngoingCall) { window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED) } else { window.clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)