From 835eb95aa15b9bc76e5614d370d70876ed3d20ee Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 7 Apr 2021 14:52:27 +0200 Subject: [PATCH] If signout request fails, do not start LoginActivity, but restart the app (#3099) --- CHANGES.md | 1 + vector/src/main/java/im/vector/app/features/MainActivity.kt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c07d23fe9f..13385123e6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Bugfix 🐛: - Disable URL preview for some domains (#2995) - Fix avatar rendering for DMs, after initial sync (#2693) - Fix mandatory parameter in API (#3065) + - If signout request fails, do not start LoginActivity, but restart the app (#3099) Translations 🗣: - diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index fd032c1d35..34e73c8702 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -212,15 +212,16 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity .setTitle(R.string.dialog_title_error) .setMessage(errorFormatter.toHumanReadable(failure)) .setPositiveButton(R.string.global_retry) { _, _ -> doCleanUp() } - .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish() } + .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) } .setCancelable(false) .show() } } - private fun startNextActivityAndFinish() { + private fun startNextActivityAndFinish(ignoreClearCredentials: Boolean = false) { val intent = when { args.clearCredentials + && !ignoreClearCredentials && (!args.isUserLoggedOut || args.isAccountDeactivated) -> // User has explicitly asked to log out or deactivated his account LoginActivity.newIntent(this, null)