From 3ca10b8fa95f606024ed43c9d2cd254adfff51f1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 18 May 2020 09:35:35 +0200 Subject: [PATCH] show escaped jids when it comes to account selection --- .../java/eu/siacs/conversations/ui/BlocklistActivity.java | 2 +- .../eu/siacs/conversations/ui/ChannelDiscoveryActivity.java | 2 +- .../java/eu/siacs/conversations/ui/ChooseContactActivity.java | 4 ++-- src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java | 4 ++-- .../eu/siacs/conversations/ui/StartConversationActivity.java | 4 ++-- src/main/java/eu/siacs/conversations/utils/AccountUtils.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java index 6e85c58f26dfbd2f5c02d8c805e4933c1ce4bfc0..f0aef4741c1e0cfdc4416b31c091ed20084c520c 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java @@ -79,7 +79,7 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem getString(R.string.block_jabber_id), getString(R.string.block), null, - account.getJid().asBareJid().toString(), + account.getJid().asBareJid().toEscapedString(), true, false ); diff --git a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java index ec80152ebe3603322d71a42ad6cc21933f278648..c0b97759d186030d7b3ef331ff2bc19ca84c7e51 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java @@ -263,7 +263,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O } public void joinChannelSearchResult(String selectedAccount, Room result) { - final Jid jid = Config.DOMAIN_LOCK == null ? Jid.of(selectedAccount) : Jid.of(selectedAccount, Config.DOMAIN_LOCK, null); + final Jid jid = Config.DOMAIN_LOCK == null ? Jid.ofEscaped(selectedAccount) : Jid.ofEscaped(selectedAccount, Config.DOMAIN_LOCK, null); final boolean syncAutoJoin = getBooleanPreference("autojoin", R.bool.autojoin); final Account account = xmppConnectionService.findAccountByJid(jid); final Conversation conversation = xmppConnectionService.findOrCreateConversation(account, result.getRoom(), true, true, true); diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java index cec1d8ca743fc2eb292da178a1a3fceca76b5d7d..afda6670910608efe40c89abf319c06549cd5056 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java @@ -361,9 +361,9 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity im for (Account account : xmppConnectionService.getAccounts()) { if (account.getStatus() != Account.State.DISABLED) { if (Config.DOMAIN_LOCK != null) { - this.mActivatedAccounts.add(account.getJid().getLocal()); + this.mActivatedAccounts.add(account.getJid().getEscapedLocal()); } else { - this.mActivatedAccounts.add(account.getJid().asBareJid().toString()); + this.mActivatedAccounts.add(account.getJid().asBareJid().toEscapedString()); } } } diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java index fef479e37bac2cfff3e964cccc093d70ce8d8665..83d6d4a0c4b25470d8ffffb0f1445d67c8b63148 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java @@ -146,9 +146,9 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected } try { if (Config.DOMAIN_LOCK != null) { - accountJid = Jid.of((String) binding.account.getSelectedItem(), Config.DOMAIN_LOCK, null); + accountJid = Jid.ofEscaped((String) binding.account.getSelectedItem(), Config.DOMAIN_LOCK, null); } else { - accountJid = Jid.of((String) binding.account.getSelectedItem()); + accountJid = Jid.ofEscaped((String) binding.account.getSelectedItem()); } } catch (final IllegalArgumentException e) { return; diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 8e46786e2aace3ad6a775148f6f5ff8d3a130ca7..57cc492e0f4e849376b145f7e618850ce4434279 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -577,9 +577,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne Jid jid; try { if (Config.DOMAIN_LOCK != null) { - jid = Jid.of((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); + jid = Jid.ofEscaped((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); } else { - jid = Jid.of((String) spinner.getSelectedItem()); + jid = Jid.ofEscaped((String) spinner.getSelectedItem()); } } catch (final IllegalArgumentException e) { return null; diff --git a/src/main/java/eu/siacs/conversations/utils/AccountUtils.java b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java index 475682bec9650ca7eed15c65d8411c76b97ba867..09b65f69471f692d1d1dc8e0698b4045667ff303 100644 --- a/src/main/java/eu/siacs/conversations/utils/AccountUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java @@ -39,9 +39,9 @@ public class AccountUtils { for (Account account : service.getAccounts()) { if (account.getStatus() != Account.State.DISABLED) { if (Config.DOMAIN_LOCK != null) { - accounts.add(account.getJid().getLocal()); + accounts.add(account.getJid().toEscapedString()); } else { - accounts.add(account.getJid().asBareJid().toString()); + accounts.add(account.getJid().asBareJid().toEscapedString()); } } }