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/entities/Message.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/entities/Message.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Message.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java index 86adb4af..debcaca1 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java @@ -17,6 +17,7 @@ import de.thedevstack.conversationsplus.utils.MessageParserUtil; import de.thedevstack.conversationsplus.utils.MimeUtils; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public class Message extends AbstractEntity implements LoadAvatarFor { @@ -151,7 +152,7 @@ public class Message extends AbstractEntity implements LoadAvatarFor { try { String value = cursor.getString(cursor.getColumnIndex(COUNTERPART)); if (value != null) { - jid = Jid.fromString(value, true); + jid = JidUtil.fromString(value, true); } else { jid = null; } @@ -162,7 +163,7 @@ public class Message extends AbstractEntity implements LoadAvatarFor { try { String value = cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART)); if (value != null) { - trueCounterpart = Jid.fromString(value, true); + trueCounterpart = JidUtil.fromString(value, true); } else { trueCounterpart = null; } @@ -449,7 +450,7 @@ public class Message extends AbstractEntity implements LoadAvatarFor { return true; } else if (presences.size() >= 1) { try { - counterpart = Jid.fromParts(conversation.getJid().getLocalpart(), + counterpart = JidUtil.fromParts(conversation.getJid().getLocalpart(), conversation.getJid().getDomainpart(), presences.asStringArray()[0]); return true; |