From d441c3da53bcb56f0f5ceafea5a75c806f28ddff Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 4 Aug 2026 09:23:14 -0400
Subject: [PATCH] Fix some dead back button handling.

---
 .../logsubmit/SubmitDebugLogActivity.java         |  7 -------
 .../logsubmit/SubmitDebugLogViewModel.java        |  4 ----
 .../megaphone/ClientDeprecatedActivity.java       | 15 ++++++++-------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
index ce0a3ece56..5d3cb46b18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
@@ -313,13 +313,6 @@ public class SubmitDebugLogActivity extends BaseActivity {
     return false;
   }
 
-  @Override
-  public void onBackPressed() {
-    if (!viewModel.onBackPressed()) {
-      super.onBackPressed();
-    }
-  }
-
   @Override
   protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
index 635279d992..7ac9e18150 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
@@ -172,10 +172,6 @@ public class SubmitDebugLogViewModel extends ViewModel {
     });
   }
 
-  boolean onBackPressed() {
-    return false;
-  }
-
   enum Mode {
     NORMAL, LOADING, SUBMITTING
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
index e5a949df97..3bf7808d1c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.megaphone;
 
-import android.annotation.SuppressLint;
 import android.os.Bundle;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -31,6 +31,13 @@ public class ClientDeprecatedActivity extends PassphraseRequiredActivity {
 
     findViewById(R.id.client_deprecated_update_button).setOnClickListener(v -> onUpdateClicked());
     findViewById(R.id.client_deprecated_dont_update_button).setOnClickListener(v -> onDontUpdateClicked());
+
+    getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+      @Override
+      public void handleOnBackPressed() {
+        // The user must explicitly choose to update or to dismiss this screen.
+      }
+    });
   }
 
   @Override
@@ -44,12 +51,6 @@ public class ClientDeprecatedActivity extends PassphraseRequiredActivity {
     theme.onResume(this);
   }
 
-  @SuppressLint("MissingSuperCall")
-  @Override
-  public void onBackPressed() {
-    // Disabled
-  }
-
   private void onUpdateClicked() {
     PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(this);
   }