diff options
author | steckbrief <steckbrief@chefmail.de> | 2018-05-11 19:49:27 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2018-05-11 19:49:27 +0200 |
commit | bff97731deed4c599dcb6c3a2887c9f47165dd3f (patch) | |
tree | 1a1479be225fef127146f58d69f32a947c4d013e /src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java | |
parent | 1d8c547b447d68daf079d9db2b1d792fc631e462 (diff) |
introduces JidUtil for Jid creation, fixes duplication of childs while adding childs with xmlns and name
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java index 9e52d390..5bef1624 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/EnterJidDialog.java @@ -16,6 +16,7 @@ import de.thedevstack.conversationsplus.R; import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public class EnterJidDialog { public interface OnEnterJidDialogPositiveListener { @@ -91,9 +92,9 @@ public class EnterJidDialog { } try { if (Config.DOMAIN_LOCK != null) { - accountJid = Jid.fromParts((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); + accountJid = JidUtil.fromParts((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); } else { - accountJid = Jid.fromString((String) spinner.getSelectedItem()); + accountJid = JidUtil.fromString((String) spinner.getSelectedItem()); } } catch (final InvalidJidException e) { return; @@ -101,9 +102,9 @@ public class EnterJidDialog { final Jid contactJid; try { if (lock) { - contactJid = Jid.fromParts(jid.getText().toString(), Config.DOMAIN_LOCK, null); + contactJid = JidUtil.fromParts(jid.getText().toString(), Config.DOMAIN_LOCK, null); } else { - contactJid = Jid.fromString(jid.getText().toString()); + contactJid = JidUtil.fromString(jid.getText().toString()); } } catch (final InvalidJidException e) { jid.setError(context.getString(lock ? R.string.invalid_username : R.string.invalid_jid)); |