From e98ab37c9df7fdc0ef6e2900e8979467bae34e28 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 25 Aug 2016 23:42:42 +0200 Subject: [PATCH] made payment required error standard compliant --- .../java/eu/siacs/conversations/xmpp/XmppConnection.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 739e8ac28..ddc538e54 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -510,11 +510,12 @@ public class XmppConnection implements Runnable { break; } else if (nextTag.isStart("failure")) { final Element failure = tagReader.readElement(nextTag); - final String accountDisabled = failure.findChildContent("account-disabled"); - if (accountDisabled != null - && accountDisabled.contains("renew") + final String text = failure.findChildContent("text"); + if (failure.hasChild("account-disabled") + && text != null + && text.contains("renew") && Config.MAGIC_CREATE_DOMAIN != null - && accountDisabled.contains(Config.MAGIC_CREATE_DOMAIN)) { + && text.contains(Config.MAGIC_CREATE_DOMAIN)) { throw new PaymentRequiredException(); } else { throw new UnauthorizedException();