From 5515e2fe3c8fc324056f03d1f64f34f87a3fa2d0 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 28 Jun 2026 23:14:55 +0200 Subject: [PATCH 1/3] cancel search mode when back is pressed --- .../java/org/thoughtcrime/securesms/ConversationActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index f0150e770..a18ec7cdc 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -262,6 +262,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity public void handleOnBackPressed() { if (container.isInputOpen()) { container.hideCurrentInput(composeText); + } else if (searchMenu != null) { + searchCollapse(); } else { handleReturnToConversationList(); } From 0d76ab930f72a28b7764b46aacd20abd992f1836 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 28 Jun 2026 23:16:46 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 544d11735..9be03d578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Add notifications for missed calls * Video call preview now accurately shows what is sent to remote * Fix: properly hide draft attachment during in-chat search +* Fix: cancel in-chat search when back is pressed, instead of directly returning to chatlist ## v2.53.0 2026-06 From 4757150aae5306643fc39dd86079d09d2d9df14b Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 28 Jun 2026 23:21:23 +0200 Subject: [PATCH 3/3] apply spotless --- .../java/org/thoughtcrime/securesms/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index a18ec7cdc..80b88c9f0 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -263,7 +263,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity if (container.isInputOpen()) { container.hideCurrentInput(composeText); } else if (searchMenu != null) { - searchCollapse(); + searchCollapse(); } else { handleReturnToConversationList(); }