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/StartConversationActivity.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/StartConversationActivity.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java index 2dc8d1a5..d159d044 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java @@ -74,6 +74,7 @@ import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; 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 StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist { @@ -424,9 +425,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU final Jid conferenceJid; try { if (lock) { - conferenceJid = Jid.fromParts(jid.getText().toString(),Config.CONFERENCE_DOMAIN_LOCK, null); + conferenceJid = JidUtil.fromParts(jid.getText().toString(),Config.CONFERENCE_DOMAIN_LOCK, null); } else { - conferenceJid = Jid.fromString(jid.getText().toString()); + conferenceJid = JidUtil.fromString(jid.getText().toString()); } } catch (final InvalidJidException e) { jid.setError(getString(lock ? R.string.invalid_conference_name : R.string.invalid_jid)); @@ -476,9 +477,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU Jid jid; try { if (Config.DOMAIN_LOCK != null) { - jid = Jid.fromParts((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); + jid = JidUtil.fromParts((String) spinner.getSelectedItem(), Config.DOMAIN_LOCK, null); } else { - jid = Jid.fromString((String) spinner.getSelectedItem()); + jid = JidUtil.fromString((String) spinner.getSelectedItem()); } } catch (final InvalidJidException e) { return null; |