From 5edba751d7620222daa7f5a2edee982099c00265 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 17 Apr 2020 00:45:03 +0200 Subject: [PATCH] on account-switching, force finishing all activities --- src/org/thoughtcrime/securesms/connect/AccountManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/connect/AccountManager.java b/src/org/thoughtcrime/securesms/connect/AccountManager.java index ef201c1fd..4f5ceb604 100644 --- a/src/org/thoughtcrime/securesms/connect/AccountManager.java +++ b/src/org/thoughtcrime/securesms/connect/AccountManager.java @@ -232,11 +232,11 @@ public class AccountManager { .setSingleChoiceItems(menu.toArray(new String[menu.size()]), presel, (dialog, which) -> { if (which==addAccount) { beginAccountCreation(activity); + activity.finishAffinity(); activity.startActivity(new Intent(activity, WelcomeActivity.class)); - activity.finish(); } else { // switch account switchAccount(activity, accounts.get(which)); - activity.finish(); + activity.finishAffinity(); activity.startActivity(new Intent(activity.getApplicationContext(), ConversationListActivity.class)); } });