Fix call notification answer button handling

mollyim · Sep 13, 2023 · 965a62f · 965a62f
1 parent 0b4efa7
commit 965a62f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -325,7 +325,7 @@ public void onBackPressed() {
 
   @Override
   protected void onAuthenticationCancel() {
-    onBackPressed();
+    super.onBackPressed();
   }
 
   private boolean enterPipModeIfPossible() {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
@@ -198,15 +198,14 @@ private static PendingIntent getActivityPendingIntent(@NonNull Context context,
     intent.setAction(launchCallScreenIntentState.action);
 
     if (launchCallScreenIntentState == LaunchCallScreenIntentState.CONTENT) {
+      // MOLLY: Set a non-empty action to clear any pending action held by the screen lock
+      intent.setAction(WebRtcCallActivity.NO_ACTION);
       intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
     }
 
     intent.putExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_FULLSCREEN, launchCallScreenIntentState == LaunchCallScreenIntentState.CONTENT);
     intent.putExtra(WebRtcCallActivity.EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false);
 
-    // MOLLY: Set a non-empty action to clear any pending action held by the screen lock
-    intent.setAction(WebRtcCallActivity.NO_ACTION);
-
     return PendingIntent.getActivity(context, launchCallScreenIntentState.requestCode, intent, PendingIntentFlags.updateCurrent());
   }