From bff97731deed4c599dcb6c3a2887c9f47165dd3f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 11 May 2018 19:49:27 +0200
Subject: introduces JidUtil for Jid creation, fixes duplication of childs
 while adding childs with xmlns and name

---
 src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java
index 5d3a2694..8d5967b6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java
@@ -7,6 +7,7 @@ import java.net.URLDecoder;
 
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.jid.JidUtil;
 
 public class XmppUri {
 
@@ -19,7 +20,7 @@ public class XmppUri {
 			parse(Uri.parse(uri));
 		} catch (IllegalArgumentException e) {
 			try {
-				jid = Jid.fromString(uri).toBareJid().toString();
+				jid = JidUtil.fromString(uri).toBareJid().toString();
 			} catch (InvalidJidException e2) {
 				jid = null;
 			}
@@ -50,7 +51,7 @@ public class XmppUri {
 			}
 		} else {
 			try {
-				jid = Jid.fromString(uri.toString()).toBareJid().toString();
+				jid = JidUtil.fromString(uri.toString()).toBareJid().toString();
 			} catch (final InvalidJidException ignored) {
 				jid = null;
 			}
@@ -73,7 +74,7 @@ public class XmppUri {
 
 	public Jid getJid() {
 		try {
-			return this.jid == null ? null :Jid.fromString(this.jid.toLowerCase());
+			return this.jid == null ? null : JidUtil.fromString(this.jid.toLowerCase());
 		} catch (InvalidJidException e) {
 			return null;
 		}
-- 
cgit v1.2.3