From 5e40d7362de6129fbc2e0835c4f3d7a30d4567d9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 7 Aug 2024 14:32:33 +0200 Subject: [PATCH] reset quick start setting when account is disabled under some circumstances Conversations wont upgrade to 'better' SASL mechanisms once a mechanism has been selected for quick start (and remains available). disabling an account now resets the quick start availability so upon the next reconnect a new decision can be made --- .../eu/siacs/conversations/ui/ManageAccountActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 2f4c81671ca459553156fe6a8736f276c1bc0be3..6ab32682fd866ac7d906d058220fdbe2ea7598a4 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -109,7 +109,6 @@ public class ManageAccountActivity extends XmppActivity registerForContextMenu(binding.accountList); } - @Override public void onSaveInstanceState(@NonNull final Bundle savedInstanceState) { if (selectedAccount != null) { @@ -352,8 +351,14 @@ public class ManageAccountActivity extends XmppActivity } } - private void disableAccount(Account account) { + private void disableAccount(final Account account) { account.setOption(Account.OPTION_DISABLED, true); + if (account.setOption(Account.OPTION_QUICKSTART_AVAILABLE, false)) { + Log.d( + Config.LOGTAG, + account.getJid().asBareJid() + + ": quick start disabled. account will regain this capability on the next connect"); + } if (!xmppConnectionService.updateAccount(account)) { Toast.makeText(this, R.string.unable_to_update_account, Toast.LENGTH_SHORT).show(); }