Merge branch 'trz/rename' into trz/rebase

1 files changed, 16 insertions, 13 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java
index 15771248..93e525a8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java
@@ -15,20 +15,23 @@ import eu.siacs.conversations.xml.Element;
 public final class ErrorIqPacketExceptionHelper {
     private final static String ERROR_NAMESPACE = "urn:ietf:params:xml:ns:xmpp-stanzas";
 
-    public static void throwIqErrorException(Element packet) throws IqPacketErrorException {
-        if (hasErrorElement(packet, "bad-request")) {
-            throw new BadRequestIqErrorException(packet, getErrorText(packet));
+    public static void throwIqErrorException(Element errorIqPacket) throws IqPacketErrorException {
+        Element packet = IqPacketParser.findChild(errorIqPacket, "error", "jabber:client");
+        if (null != packet) {
+            if (hasErrorElement(packet, "bad-request")) {
+                throw new BadRequestIqErrorException(errorIqPacket, getErrorText(packet));
+            }
+            if (hasErrorElement(packet, "service-unavailable")) {
+                throw new ServiceUnavailableException(errorIqPacket, getErrorText(packet));
+            }
+            if (hasErrorElement(packet, "internal-server-error")) {
+                throw new InternalServerErrorException(errorIqPacket, getErrorText(packet));
+            }
+            if (hasErrorElement(packet, "undefined-condition")) {
+                throw new UndefinedConditionException(errorIqPacket, getErrorText(packet));
+            }
         }
-        if (hasErrorElement(packet, "service-unavailable")) {
-            throw new ServiceUnavailableException(packet, getErrorText(packet));
-        }
-        if (hasErrorElement(packet, "internal-server-error")) {
-            throw new InternalServerErrorException(packet, getErrorText(packet));
-        }
-        if (hasErrorElement(packet, "undefined-condition")) {
-            throw new UndefinedConditionException(packet, getErrorText(packet));
-        }
-        throw new IqPacketErrorException(packet, "Unknown error packet.");
+        throw new IqPacketErrorException(errorIqPacket, "Unknown error packet.");
     }
 
     private static boolean hasErrorElement(Element packet, String elementName) {