From be8009c95030e4291346badcbdb7b415d79cc2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?bi=C3=B6rn?= Date: Wed, 11 Mar 2026 14:01:34 +0100 Subject: [PATCH] fix: leave and delete finishes activity (#4266) * fix: leave and delete finishes activity the chat is gone - otherwise, we end up in ghost chat zero :) moreover, the fix removes shortcuts from the homescreen. a toast is no longer needed, as there is enough visual feedback; we're also not showing a toast on plain deletion. * use consistent string and clarify deletion scope --- .../org/thoughtcrime/securesms/ConversationActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index efc3493cf..7e72bd4b4 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -729,7 +729,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity .setNegativeButton(R.string.menu_leave_and_delete, (d, which) -> { DcHelper.getContext(context).removeContactFromChat(chatId, DcContact.DC_CONTACT_ID_SELF); DcHelper.getContext(context).deleteChat(chatId); - Toast.makeText(this, getString(R.string.done), Toast.LENGTH_SHORT).show(); + DirectShareUtil.clearShortcut(this, chatId); + finish(); }) .setNeutralButton(R.string.cancel, null) .show(); @@ -753,7 +754,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void handleDeleteChat() { AlertDialog dialog = new AlertDialog.Builder(this) .setMessage(getResources().getString(R.string.ask_delete_named_chat, dcChat.getName())) - .setPositiveButton(R.string.delete, (d, which) -> { + .setPositiveButton(R.string.delete_for_me, (d, which) -> { DcHelper.getContext(context).deleteChat(chatId); DirectShareUtil.clearShortcut(this, chatId); finish();