From 1bdc77affed5fe1770efc706c2a51a1b7fb2705f Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 22 Jun 2023 14:52:10 -0300 Subject: [PATCH] Resolve issue with incoming video call state. --- .../java/org/thoughtcrime/securesms/WebRtcCallActivity.java | 4 +++- .../securesms/webrtc/CallNotificationBuilder.java | 1 - 2 files changed, 3 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 0452235015..ebb27c73d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -171,7 +171,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan processIntent(getIntent()); - if (ANSWER_ACTION.equals(getIntent().getAction())) { + if (ANSWER_VIDEO_ACTION.equals(getIntent().getAction())) { + enableVideoIfAvailable = true; + } else if (ANSWER_ACTION.equals(getIntent().getAction()) || getIntent().getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false)) { enableVideoIfAvailable = false; } else { enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false); diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java index ae8cb1a451..4f42d37f31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java @@ -54,7 +54,6 @@ public class CallNotificationBuilder { Intent contentIntent = new Intent(context, WebRtcCallActivity.class); contentIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); contentIntent.putExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_FULLSCREEN, true); - contentIntent.putExtra(WebRtcCallActivity.EXTRA_ENABLE_VIDEO_IF_AVAILABLE, isVideoCall); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, contentIntent, PendingIntentFlags.mutable());