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

---
 .../de/thedevstack/conversationsplus/ui/XmppActivity.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index 21292cec..516bd214 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -70,6 +70,7 @@ import de.thedevstack.conversationsplus.xmpp.OnKeyStatusUpdated;
 import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.jid.JidUtil;
 
 public abstract class XmppActivity extends Activity {
 
@@ -771,7 +772,7 @@ public abstract class XmppActivity extends Activity {
 			SessionID id = conversation.getOtrSession().getSessionID();
 			Jid jid;
 			try {
-				jid = Jid.fromString(id.getAccountID() + "/" + id.getUserID());
+				jid = JidUtil.fromString(id.getAccountID() + "/" + id.getUserID());
 			} catch (InvalidJidException e) {
 				jid = null;
 			}
@@ -796,7 +797,7 @@ public abstract class XmppActivity extends Activity {
 			} else if (presences.size() == 1) {
 				String presence = presences.asStringArray()[0];
 				try {
-					conversation.setNextCounterpart(Jid.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence));
+					conversation.setNextCounterpart(JidUtil.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence));
 				} catch (InvalidJidException e) {
 					conversation.setNextCounterpart(null);
 				}
@@ -831,7 +832,7 @@ public abstract class XmppActivity extends Activity {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						try {
-							conversation.setNextCounterpart(Jid.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence.toString()));
+							conversation.setNextCounterpart(JidUtil.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence.toString()));
 						} catch (InvalidJidException e) {
 							conversation.setNextCounterpart(null);
 						}
@@ -950,7 +951,7 @@ public abstract class XmppActivity extends Activity {
 	protected Account extractAccount(Intent intent) {
 		String jid = intent != null ? intent.getStringExtra(EXTRA_ACCOUNT) : null;
 		try {
-			return jid != null ? xmppConnectionService.findAccountByJid(Jid.fromString(jid)) : null;
+			return jid != null ? xmppConnectionService.findAccountByJid(JidUtil.fromString(jid)) : null;
 		} catch (InvalidJidException e) {
 			return null;
 		}
@@ -970,10 +971,10 @@ public abstract class XmppActivity extends Activity {
 				if (data.getBooleanExtra("multiple", false)) {
 					String[] toAdd = data.getStringArrayExtra("contacts");
 					for (String item : toAdd) {
-						invite.jids.add(Jid.fromString(item));
+						invite.jids.add(JidUtil.fromString(item));
 					}
 				} else {
-					invite.jids.add(Jid.fromString(data.getStringExtra("contact")));
+					invite.jids.add(JidUtil.fromString(data.getStringExtra("contact")));
 				}
 			} catch (final InvalidJidException ignored) {
 				return null;
-- 
cgit v1.2.3