From 021f39375f1747ced9c39a97f6d61732f1383852 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 14 Feb 2025 08:46:25 +0100 Subject: [PATCH] introduce dedicated channel binding error state --- src/main/java/eu/siacs/conversations/entities/Account.java | 3 +++ src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index f55618fe2baeded03cbe51bd7e298d084011ce50..4d4c4e8d3bd5996f972cb489d6b1d320e571dc90 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -793,6 +793,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable REGISTRATION_PASSWORD_TOO_WEAK(true, false), TLS_ERROR, TLS_ERROR_DOMAIN, + CHANNEL_BINDING, INCOMPATIBLE_SERVER, INCOMPATIBLE_CLIENT, TOR_NOT_AVAILABLE, @@ -871,6 +872,8 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable return R.string.account_status_incompatible_server; case INCOMPATIBLE_CLIENT: return R.string.account_status_incompatible_client; + case CHANNEL_BINDING: + return R.string.account_status_channel_binding; case TOR_NOT_AVAILABLE: return R.string.account_status_tor_unavailable; case BIND_FAILURE: diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 136904a17bdb764e20a208c3ba74b3de9dc91644..2d7e0e52125121be8c8fe97b618c9eacb9881bc3 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1696,7 +1696,7 @@ public class XmppConnection implements Runnable { return; } Log.d(Config.LOGTAG, account.getJid() + ": server did not offer channel binding"); - throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER); + throw new StateChangingException(Account.State.CHANNEL_BINDING); } }