From 35962c3cb504399fe3a53e128180bb05267307b4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 24 Apr 2020 17:40:15 +0200 Subject: [PATCH] Do not propose bootsrap for SSO accounts Because we do not support yet confirming account credentials using SSO --- .../riotx/features/home/HomeActivity.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt index ac2e2b7fa9..c28dca8dbf 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt @@ -167,13 +167,19 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable { val crossSigningEnabledOnAccount = myCrossSigningKeys != null if (!crossSigningEnabledOnAccount && !sharedActionViewModel.isAccountCreation) { - // We need to ask - promptSecurityEvent( - session, - R.string.upgrade_security, - R.string.security_prompt_text - ) { - it.navigator.upgradeSessionSecurity(it) + // Do not propose for SSO accounts, because we do not support yet confirming account credentials using SSO + if (session.getHomeServerCapabilities().canChangePassword) { + // We need to ask + promptSecurityEvent( + session, + R.string.upgrade_security, + R.string.security_prompt_text + ) { + it.navigator.upgradeSessionSecurity(it) + } + } else { + // Do not do it again + sharedActionViewModel.hasDisplayedCompleteSecurityPrompt = true } } else if (myCrossSigningKeys?.isTrusted() == false) { // We need to ask