introduces JidUtil for Jid creation, fixes duplication of childs while adding childs with xmlns and name

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
index 1c7ad288..2421d86e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
@@ -32,6 +32,7 @@ import de.thedevstack.conversationsplus.utils.SimpleCryptoUtil;
 import de.thedevstack.conversationsplus.xmpp.XmppConnection;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.jid.JidUtil;
 
 public class Account extends AbstractEntity {
 
@@ -201,7 +202,7 @@ public class Account extends AbstractEntity {
 	public static Account fromCursor(final Cursor cursor) {
 		Jid jid = null;
 		try {
-			jid = Jid.fromParts(cursor.getString(cursor.getColumnIndex(USERNAME)),
+			jid = JidUtil.fromParts(cursor.getString(cursor.getColumnIndex(USERNAME)),
 					cursor.getString(cursor.getColumnIndex(SERVER)), "mobile");
 		} catch (final InvalidJidException ignored) {
 		}
@@ -294,7 +295,7 @@ public class Account extends AbstractEntity {
 		final String oldResource = jid.getResourcepart();
 		if (oldResource == null || !oldResource.equals(resource)) {
 			try {
-				jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource);
+				jid = JidUtil.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource);
 				return true;
 			} catch (final InvalidJidException ignored) {
 				return true;