diff options
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/entities')
5 files changed, 14 insertions, 10 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java index 1c7ad288..2421d86e 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java @@ -32,6 +32,7 @@ import de.thedevstack.conversationsplus.utils.SimpleCryptoUtil; 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 Account extends AbstractEntity { @@ -201,7 +202,7 @@ public class Account extends AbstractEntity { public static Account fromCursor(final Cursor cursor) { Jid jid = null; try { - jid = Jid.fromParts(cursor.getString(cursor.getColumnIndex(USERNAME)), + jid = JidUtil.fromParts(cursor.getString(cursor.getColumnIndex(USERNAME)), cursor.getString(cursor.getColumnIndex(SERVER)), "mobile"); } catch (final InvalidJidException ignored) { } @@ -294,7 +295,7 @@ public class Account extends AbstractEntity { final String oldResource = jid.getResourcepart(); if (oldResource == null || !oldResource.equals(resource)) { try { - jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource); + jid = JidUtil.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource); return true; } catch (final InvalidJidException ignored) { return true; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java index 3dc7c10a..dd832b9b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java @@ -17,6 +17,7 @@ import de.thedevstack.conversationsplus.xml.Element; 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 Contact implements ListItem, Blockable { public static final String TABLENAME = "contacts"; @@ -87,7 +88,7 @@ public class Contact implements ListItem, Blockable { cursor.getLong(cursor.getColumnIndex(LAST_TIME))); final Jid jid; try { - jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(JID)), true); + jid = JidUtil.fromString(cursor.getString(cursor.getColumnIndex(JID)), true); } catch (final InvalidJidException e) { // TODO: Borked DB... handle this somehow? return null; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java index 0cce63f4..19f21610 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java @@ -22,7 +22,6 @@ import java.util.NavigableSet; import java.util.TreeSet; import de.thedevstack.conversationsplus.dto.LoadAvatarFor; -import de.thedevstack.conversationsplus.enums.MessageDirection; import de.thedevstack.conversationsplus.enums.MessageStatus; import de.thedevstack.conversationsplus.utils.MessageUtil; import de.thedevstack.conversationsplus.Config; @@ -30,6 +29,7 @@ import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService; import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public class Conversation extends AbstractEntity implements Blockable, LoadAvatarFor { public static final String TABLENAME = "conversations"; @@ -461,7 +461,7 @@ public class Conversation extends AbstractEntity implements Blockable, LoadAvata public static Conversation fromCursor(Cursor cursor) { Jid jid; try { - jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(CONTACTJID)), true); + jid = JidUtil.fromString(cursor.getString(cursor.getColumnIndex(CONTACTJID)), true); } catch (final InvalidJidException e) { // Borked DB.. jid = null; @@ -826,7 +826,7 @@ public class Conversation extends AbstractEntity implements Blockable, LoadAvata JSONArray array = this.attributes.getJSONArray(key); for (int i = 0; i < array.length(); ++i) { try { - list.add(Jid.fromString(array.getString(i))); + list.add(JidUtil.fromString(array.getString(i))); } catch (InvalidJidException e) { //ignored } 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; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java index abc45f0b..6b578c2b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java @@ -17,6 +17,7 @@ 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.mam.Mam; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; @SuppressLint("DefaultLocale") public class MucOptions { @@ -463,7 +464,7 @@ public class MucOptions { public Jid createJoinJid(String nick) { try { - return Jid.fromString(this.conversation.getJid().toBareJid().toString() + "/" + nick); + return JidUtil.fromString(this.conversation.getJid().toBareJid().toString() + "/" + nick); } catch (final InvalidJidException e) { return null; } |