fix crash when logging out active account

2023-05-31 10:05:31 +02:00
parent 2858aeb55e
commit 5e7a00de3e
1 changed files with 9 additions and 1 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -194,7 +194,15 @@ public class AccountSwitcherSheet extends BottomSheet{

 	private void onLoggedOut(String accountID){
 		AccountSessionManager.getInstance().removeAccount(accountID);
-		dismiss();
+		String activeAccountID = fragment != null
+				? fragment.getAccountID()
+				: AccountSessionManager.getInstance().getLastActiveAccountID();
+		if (accountID.equals(activeAccountID)) {
+			activity.finish();
+			activity.startActivity(new Intent(activity, MainActivity.class));
+		} else {
+			dismiss();
+		}
 	}

 	@Override