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/EditAccountActivity.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
index 725e10a9..1f8fd7f7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
@@ -61,6 +61,7 @@ import de.thedevstack.conversationsplus.xmpp.forms.Data;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.dto.Avatar;
+import de.thedevstack.conversationsplus.xmpp.jid.JidUtil;
 
 public class EditAccountActivity extends XmppActivity implements OnAccountUpdate,
 		OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched {
@@ -132,9 +133,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			final Jid jid;
 			try {
 				if (Config.DOMAIN_LOCK != null) {
-					jid = Jid.fromParts(mAccountJid.getText().toString(), Config.DOMAIN_LOCK, null);
+					jid = JidUtil.fromParts(mAccountJid.getText().toString(), Config.DOMAIN_LOCK, null);
 				} else {
-					jid = Jid.fromString(mAccountJid.getText().toString());
+					jid = JidUtil.fromString(mAccountJid.getText().toString());
 				}
 			} catch (final InvalidJidException e) {
 				if (Config.DOMAIN_LOCK != null) {
@@ -504,7 +505,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		super.onStart();
 		if (getIntent() != null) {
 			try {
-				this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
+				this.jidToEdit = JidUtil.fromString(getIntent().getStringExtra("jid"));
 			} catch (final InvalidJidException | NullPointerException ignored) {
 				this.jidToEdit = null;
 			}
-- 
cgit v1.2.3