From 9fef8386e61463c795af73db48d4facbf7fdb29a Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 14 Jun 2023 16:57:51 -0300 Subject: [PATCH] Fix initial call state when starting from action. --- .../securesms/WebRtcCallActivity.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index a5287657ba..0452235015 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -106,7 +106,14 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan private static final int STANDARD_DELAY_FINISH = 1000; private static final int VIBRATE_DURATION = 50; + /** + * ANSWER the call via voice-only. + */ public static final String ANSWER_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION"; + + /** + * ANSWER the call via video. + */ public static final String ANSWER_VIDEO_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION"; public static final String DENY_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".DENY_ACTION"; public static final String END_CALL_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".END_CALL_ACTION"; @@ -164,8 +171,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan processIntent(getIntent()); - enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false); - getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE); + if (ANSWER_ACTION.equals(getIntent().getAction())) { + enableVideoIfAvailable = false; + } else { + enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false); + getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE); + } windowLayoutInfoConsumer = new WindowLayoutInfoConsumer();