From c6b98f365471ffe3e66c6b677088ad33c61e950e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 13 Dec 2019 12:40:15 +0100 Subject: [PATCH] Soft Logout - display hard logout screen --- vector/src/main/java/im/vector/riotx/features/MainActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt index 302ddf28b4..041eb85a11 100644 --- a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt @@ -176,7 +176,8 @@ class MainActivity : VectorBaseActivity() { private fun startNextActivityAndFinish() { val intent = when { - args.clearCredentials -> + args.clearCredentials + && !args.isUserLoggedOut -> // User has explicitly asked to log out LoginActivity.newIntent(this, null) args.isSoftLogout ->