diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
11 files changed, 95 insertions, 106 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java index 8b2eef3eb..4dcd028ba 100644 --- a/src/main/java/de/pixart/messenger/entities/Account.java +++ b/src/main/java/de/pixart/messenger/entities/Account.java @@ -3,6 +3,7 @@ package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; import android.os.SystemClock; +import android.util.Log; import android.util.Pair; import net.java.otr4j.crypto.OtrCryptoEngineImpl; @@ -30,8 +31,7 @@ import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.utils.XmppUri; import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class Account extends AbstractEntity { @@ -287,13 +287,16 @@ public class Account extends AbstractEntity { } public static Account fromCursor(final Cursor cursor) { - Jid jid = null; + final Jid jid; try { - jid = Jid.fromParts( + String resource = cursor.getString(cursor.getColumnIndex(RESOURCE)); + jid = Jid.of( cursor.getString(cursor.getColumnIndex(USERNAME)), cursor.getString(cursor.getColumnIndex(SERVER)), - cursor.getString(cursor.getColumnIndex(RESOURCE))); - } catch (final InvalidJidException ignored) { + resource == null || resource.trim().isEmpty() ? null : resource); + } catch (final IllegalArgumentException ignored) { + Log.d(Config.LOGTAG, cursor.getString(cursor.getColumnIndex(USERNAME)) + "@" + cursor.getString(cursor.getColumnIndex(SERVER))); + throw new AssertionError(ignored); } return new Account(cursor.getString(cursor.getColumnIndex(UUID)), jid, @@ -324,13 +327,13 @@ public class Account extends AbstractEntity { } public String getUsername() { - return jid.getLocalpart(); + return jid.getLocal(); } public boolean setJid(final Jid next) { final Jid previousFull = this.jid; - final Jid prev = this.jid != null ? this.jid.toBareJid() : null; - final boolean changed = prev == null || (next != null && !prev.equals(next.toBareJid())); + final Jid prev = this.jid != null ? this.jid.asBareJid() : null; + final boolean changed = prev == null || (next != null && !prev.equals(next.asBareJid())); if (changed) { final AxolotlService oldAxolotlService = this.axolotlService; if (oldAxolotlService != null) { @@ -340,11 +343,11 @@ public class Account extends AbstractEntity { } } this.jid = next; - return next != null && next.equals(previousFull); + return next != null && !next.equals(previousFull); } public Jid getServer() { - return jid.toDomainJid(); + return Jid.ofDomain(jid.getDomain()); } public String getPassword() { @@ -419,20 +422,11 @@ public class Account extends AbstractEntity { } public String getResource() { - return jid.getResourcepart(); + return jid.getResource(); } - public boolean setResource(final String resource) { - final String oldResource = jid.getResourcepart(); - if (oldResource == null || !oldResource.equals(resource)) { - try { - jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource); - return true; - } catch (final InvalidJidException ignored) { - return true; - } - } - return false; + public void setResource(final String resource) { + this.jid = this.jid.withResource(resource); } public Jid getJid() { @@ -481,8 +475,8 @@ public class Account extends AbstractEntity { public ContentValues getContentValues() { final ContentValues values = new ContentValues(); values.put(UUID, uuid); - values.put(USERNAME, jid.getLocalpart()); - values.put(SERVER, jid.getDomainpart()); + values.put(USERNAME, jid.getLocal()); + values.put(SERVER, jid.getDomain()); values.put(PASSWORD, password); values.put(OPTIONS, options); synchronized (this.keys) { @@ -495,7 +489,7 @@ public class Account extends AbstractEntity { values.put(PORT, port); values.put(STATUS, presenceStatus.toShowString()); values.put(STATUS_MESSAGE, presenceStatusMessage); - values.put(RESOURCE, jid.getResourcepart()); + values.put(RESOURCE, jid.getResource()); return values; } @@ -625,7 +619,7 @@ public class Account extends AbstractEntity { public Bookmark getBookmark(final Jid jid) { for (final Bookmark bookmark : this.bookmarks) { - if (bookmark.getJid() != null && jid.toBareJid().equals(bookmark.getJid().toBareJid())) { + if (bookmark.getJid() != null && jid.asBareJid().equals(bookmark.getJid().asBareJid())) { return bookmark; } } @@ -659,7 +653,7 @@ public class Account extends AbstractEntity { public String getShareableUri() { List<XmppUri.Fingerprint> fingerprints = this.getFingerprints(); - String uri = "xmpp:" + this.getJid().toBareJid().toString(); + String uri = "xmpp:" + this.getJid().asBareJid().toString(); if (fingerprints.size() > 0) { return XmppUri.getFingerprintUri(uri,fingerprints,';'); } else { @@ -668,7 +662,7 @@ public class Account extends AbstractEntity { } public String getShareableLink() { List<XmppUri.Fingerprint> fingerprints = this.getFingerprints(); - String uri = Config.inviteUserURL+this.getJid().toBareJid().toString(); + String uri = Config.inviteUserURL+this.getJid().asBareJid().toString(); if (fingerprints.size() > 0) { return XmppUri.getFingerprintUri(uri,fingerprints,'&'); } else { @@ -696,11 +690,11 @@ public class Account extends AbstractEntity { public boolean isBlocked(final ListItem contact) { final Jid jid = contact.getJid(); - return jid != null && (blocklist.contains(jid.toBareJid()) || blocklist.contains(jid.toDomainJid())); + return jid != null && (blocklist.contains(jid.asBareJid()) || blocklist.contains(Jid.ofDomain(jid.getDomain()))); } public boolean isBlocked(final Jid jid) { - return jid != null && blocklist.contains(jid.toBareJid()); + return jid != null && blocklist.contains(jid.asBareJid()); } public Collection<Jid> getBlocklist() { diff --git a/src/main/java/de/pixart/messenger/entities/Blockable.java b/src/main/java/de/pixart/messenger/entities/Blockable.java index f7484df8a..e735b4a73 100644 --- a/src/main/java/de/pixart/messenger/entities/Blockable.java +++ b/src/main/java/de/pixart/messenger/entities/Blockable.java @@ -1,6 +1,6 @@ package de.pixart.messenger.entities; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public interface Blockable { boolean isBlocked(); diff --git a/src/main/java/de/pixart/messenger/entities/Bookmark.java b/src/main/java/de/pixart/messenger/entities/Bookmark.java index 8074c9430..27997e750 100644 --- a/src/main/java/de/pixart/messenger/entities/Bookmark.java +++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java @@ -9,7 +9,7 @@ import java.util.Locale; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class Bookmark extends Element implements ListItem { @@ -58,7 +58,7 @@ public class Bookmark extends Element implements ListItem { return getBookmarkName().trim(); } else { Jid jid = this.getJid(); - String name = jid != null ? jid.getLocalpart() : getAttribute("jid"); + String name = jid != null ? jid.getLocal() : getAttribute("jid"); return name != null ? name : ""; } } diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index 63d8f6352..827840442 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -18,9 +18,8 @@ import de.pixart.messenger.Config; import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; import de.pixart.messenger.xmpp.pep.Avatar; +import rocks.xmpp.addr.Jid; public class Contact implements ListItem, Blockable { public static final String TABLENAME = "contacts"; @@ -93,8 +92,8 @@ public class Contact implements ListItem, Blockable { public static Contact fromCursor(final Cursor cursor) { final Jid jid; try { - jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(JID)), true); - } catch (final InvalidJidException e) { + jid = Jid.of(cursor.getString(cursor.getColumnIndex(JID))); + } catch (final IllegalArgumentException e) { // TODO: Borked DB... handle this somehow? return null; } @@ -121,10 +120,10 @@ public class Contact implements ListItem, Blockable { return this.serverName; } else if (this.presenceName != null && !this.presenceName.isEmpty() && mutualPresenceSubscription()) { return this.presenceName; - } else if (jid.hasLocalpart()) { + } else if (jid.getLocal() != null) { return JidHelper.localPartOrFallback(jid); } else { - return jid.getDomainpart(); + return jid.getDomain(); } } @@ -200,7 +199,7 @@ public class Contact implements ListItem, Blockable { values.put(ACCOUNT, accountUuid); values.put(SYSTEMNAME, systemName); values.put(SERVERNAME, serverName); - values.put(JID, jid.toPreppedString()); + values.put(JID, jid.toString()); values.put(OPTIONS, subscription); values.put(SYSTEMACCOUNT, systemAccount); values.put(PHOTOURI, photoUri); @@ -453,7 +452,7 @@ public class Contact implements ListItem, Blockable { } public Jid getServer() { - return getJid().toDomainJid(); + return Jid.ofDomain(getJid().getDomain()); } public boolean setAvatar(Avatar avatar) { @@ -507,20 +506,20 @@ public class Contact implements ListItem, Blockable { @Override public boolean isDomainBlocked() { - return getAccount().isBlocked(this.getJid().toDomainJid()); + return getAccount().isBlocked(Jid.ofDomain(this.getJid().getDomain())); } @Override public Jid getBlockedJid() { if (isDomainBlocked()) { - return getJid().toDomainJid(); + return Jid.ofDomain(getJid().getDomain()); } else { return getJid(); } } public boolean isSelf() { - return account.getJid().toBareJid().equals(getJid().toBareJid()); + return account.getJid().asBareJid().equals(getJid().asBareJid()); } public void setCommonName(String cn) { diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 9a856a738..e4ec95f3b 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -28,9 +28,8 @@ import de.pixart.messenger.crypto.PgpDecryptionService; import de.pixart.messenger.crypto.axolotl.AxolotlService; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; import de.pixart.messenger.xmpp.mam.MamReference; +import rocks.xmpp.addr.Jid; public class Conversation extends AbstractEntity implements Blockable, Comparable<Conversation> { @@ -384,7 +383,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public List<Jid> getAcceptedCryptoTargets() { if (mode == MODE_SINGLE) { - return Collections.singletonList(getJid().toBareJid()); + return Collections.singletonList(getJid().asBareJid()); } else { return getJidListAttribute(ATTRIBUTE_CRYPTO_TARGETS); } @@ -517,11 +516,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl if (generatedName != null) { return generatedName; } else { - return getJid().getUnescapedLocalpart(); + return getJid().getLocal(); } } } else if (isWithStranger()) { - return contactJid.toBareJid().toString(); + return contactJid.asBareJid().toString(); } else { return this.getContact().getDisplayName(); } @@ -583,7 +582,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl values.put(NAME, name); values.put(CONTACT, contactUuid); values.put(ACCOUNT, accountUuid); - values.put(CONTACTJID, contactJid.toPreppedString()); + values.put(CONTACTJID, contactJid.toString()); values.put(CREATED, created); values.put(STATUS, status); values.put(MODE, mode); @@ -594,8 +593,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public static Conversation fromCursor(Cursor cursor) { Jid jid; try { - jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(CONTACTJID)), true); - } catch (final InvalidJidException e) { + jid = Jid.of(cursor.getString(cursor.getColumnIndex(CONTACTJID))); + } catch (final IllegalArgumentException e) { // Borked DB.. jid = null; } @@ -626,7 +625,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl if (this.otrSession != null) { return this.otrSession; } else { - final SessionID sessionId = new SessionID(this.getJid().toBareJid().toString(), + final SessionID sessionId = new SessionID(this.getJid().asBareJid().toString(), presence, "xmpp"); this.otrSession = new SessionImpl(sessionId, getAccount().getOtrService()); @@ -907,7 +906,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public boolean setAttribute(String key, List<Jid> jids) { JSONArray array = new JSONArray(); for (Jid jid : jids) { - array.put(jid.toBareJid().toString()); + array.put(jid.asBareJid().toString()); } synchronized (this.attributes) { try { @@ -937,8 +936,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl JSONArray array = this.attributes.getJSONArray(key); for (int i = 0; i < array.length(); ++i) { try { - list.add(Jid.fromString(array.getString(i))); - } catch (InvalidJidException e) { + list.add(Jid.of(array.getString(i))); + } catch (IllegalArgumentException e) { //ignored } } @@ -1089,7 +1088,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public boolean isWithStranger() { return mode == MODE_SINGLE - && !getJid().equals(account.getJid().toDomainJid()) + && !getJid().equals(Jid.ofDomain(account.getJid().getDomain())) && !getContact().showInRoster() && sentMessagesCount() == 0; } diff --git a/src/main/java/de/pixart/messenger/entities/ListItem.java b/src/main/java/de/pixart/messenger/entities/ListItem.java index 3b27c1baa..df1ba75b0 100644 --- a/src/main/java/de/pixart/messenger/entities/ListItem.java +++ b/src/main/java/de/pixart/messenger/entities/ListItem.java @@ -4,7 +4,7 @@ import android.content.Context; import java.util.List; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public interface ListItem extends Comparable<ListItem> { String getDisplayName(); diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 859999309..501a394ad 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -23,8 +23,7 @@ import de.pixart.messenger.utils.GeoHelper; import de.pixart.messenger.utils.MimeUtils; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class Message extends AbstractEntity { @@ -117,7 +116,7 @@ public class Message extends AbstractEntity { public Message(Conversation conversation, String body, int encryption, int status) { this(conversation, java.util.UUID.randomUUID().toString(), conversation.getUuid(), - conversation.getJid() == null ? null : conversation.getJid().toBareJid(), + conversation.getJid() == null ? null : conversation.getJid().asBareJid(), null, body, System.currentTimeMillis(), @@ -172,11 +171,11 @@ public class Message extends AbstractEntity { try { String value = cursor.getString(cursor.getColumnIndex(COUNTERPART)); if (value != null) { - jid = Jid.fromString(value, true); + jid = Jid.of(value); } else { jid = null; } - } catch (InvalidJidException e) { + } catch (IllegalArgumentException e) { jid = null; } catch (IllegalStateException e) { return null; // message too long? @@ -185,11 +184,11 @@ public class Message extends AbstractEntity { try { String value = cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART)); if (value != null) { - trueCounterpart = Jid.fromString(value, true); + trueCounterpart = Jid.of(value); } else { trueCounterpart = null; } - } catch (InvalidJidException e) { + } catch (IllegalArgumentException e) { trueCounterpart = null; } return new Message(conversation, @@ -246,12 +245,12 @@ public class Message extends AbstractEntity { if (counterpart == null) { values.putNull(COUNTERPART); } else { - values.put(COUNTERPART, counterpart.toPreppedString()); + values.put(COUNTERPART, counterpart.toString()); } if (trueCounterpart == null) { values.putNull(TRUE_COUNTERPART); } else { - values.put(TRUE_COUNTERPART, trueCounterpart.toPreppedString()); + values.put(TRUE_COUNTERPART, trueCounterpart.toString()); } values.put(BODY, body.length() > Config.MAX_STORAGE_MESSAGE_CHARS ? body.substring(0,Config.MAX_STORAGE_MESSAGE_CHARS) : body); values.put(TIME_SENT, timeSent); @@ -439,7 +438,7 @@ public class Message extends AbstractEntity { public boolean addReadByMarker(ReadByMarker readByMarker) { if (readByMarker.getRealJid() != null) { - if (readByMarker.getRealJid().toBareJid().equals(trueCounterpart)) { + if (readByMarker.getRealJid().asBareJid().equals(trueCounterpart)) { Log.d(Config.LOGTAG, "trying to add read marker by " + readByMarker.getRealJid() + " to " + body); return false; } @@ -573,7 +572,7 @@ public class Message extends AbstractEntity { ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) && UIHelper.sameDay(message.getTimeSent(), this.getTimeSent()) && this.getReadByMarkers().equals(message.getReadByMarkers()) && - !this.conversation.getJid().toBareJid().toString().equals(Config.BUG_REPORTS) + !this.conversation.getJid().asBareJid().toString().equals(Config.BUG_REPORTS) ); } @@ -655,15 +654,15 @@ public class Message extends AbstractEntity { public boolean fixCounterpart() { Presences presences = conversation.getContact().getPresences(); - if (counterpart != null && presences.has(counterpart.getResourcepart())) { + if (counterpart != null && presences.has(counterpart.getResource())) { return true; } else if (presences.size() >= 1) { try { - counterpart = Jid.fromParts(conversation.getJid().getLocalpart(), - conversation.getJid().getDomainpart(), + counterpart = Jid.of(conversation.getJid().getLocal(), + conversation.getJid().getDomain(), presences.toResourceArray()[0]); return true; - } catch (InvalidJidException e) { + } catch (IllegalArgumentException e) { counterpart = null; return false; } diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index c1dca783c..25d059c93 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -15,9 +15,8 @@ import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.forms.Data; import de.pixart.messenger.xmpp.forms.Field; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; import de.pixart.messenger.xmpp.pep.Avatar; +import rocks.xmpp.addr.Jid; @SuppressLint("DefaultLocale") public class MucOptions { @@ -179,11 +178,11 @@ public class MucOptions { } public String getName() { - return fullJid == null ? null : fullJid.getResourcepart(); + return fullJid == null ? null : fullJid.getResource(); } public void setRealJid(Jid jid) { - this.realJid = jid != null ? jid.toBareJid() : null; + this.realJid = jid != null ? jid.asBareJid() : null; } public Role getRole() { @@ -319,7 +318,7 @@ public class MucOptions { } public boolean realJidMatchesAccount() { - return realJid != null && realJid.equals(options.account.getJid().toBareJid()); + return realJid != null && realJid.equals(options.account.getJid().asBareJid()); } @Override @@ -448,7 +447,7 @@ public class MucOptions { break; } } - boolean self = user.realJid != null && user.realJid.equals(account.getJid().toBareJid()); + boolean self = user.realJid != null && user.realJid.equals(account.getJid().asBareJid()); if (membersOnly() && nonanonymous() && user.affiliation.ranks(Affiliation.MEMBER) @@ -536,7 +535,7 @@ public class MucOptions { public User findUser(ReadByMarker readByMarker) { if (readByMarker.getRealJid() != null) { - User user = findUserByRealJid(readByMarker.getRealJid().toBareJid()); + User user = findUserByRealJid(readByMarker.getRealJid().asBareJid()); if (user == null) { user = new User(this, readByMarker.getFullJid()); user.setRealJid(readByMarker.getRealJid()); @@ -550,7 +549,7 @@ public class MucOptions { } public boolean isContactInRoom(Contact contact) { - return findUserByRealJid(contact.getJid().toBareJid()) != null; + return findUserByRealJid(contact.getJid().asBareJid()) != null; } public boolean isUserInRoom(Jid jid) { @@ -606,7 +605,7 @@ public class MucOptions { public List<User> getUsers(int max) { ArrayList<User> subset = new ArrayList<>(); HashSet<Jid> jids = new HashSet<>(); - jids.add(account.getJid().toBareJid()); + jids.add(account.getJid().asBareJid()); synchronized (users) { for(User user : users) { if (user.getRealJid() == null || jids.add(user.getRealJid())) { @@ -632,7 +631,7 @@ public class MucOptions { && !conversation.getBookmark().getNick().trim().isEmpty()) { return conversation.getBookmark().getNick().trim(); } else if (!conversation.getJid().isBareJid()) { - return conversation.getJid().getResourcepart(); + return conversation.getJid().getResource(); } else { return JidHelper.localPartOrFallback(account.getJid()); } @@ -768,15 +767,15 @@ public class MucOptions { public Jid createJoinJid(String nick) { try { - return Jid.fromString(this.conversation.getJid().toBareJid().toString() + "/" + nick); - } catch (final InvalidJidException e) { + return Jid.of(this.conversation.getJid().asBareJid().toString() + "/" + nick); + } catch (final IllegalArgumentException e) { return null; } } public Jid getTrueCounterpart(Jid jid) { if (jid.equals(getSelf().getFullJid())) { - return account.getJid().toBareJid(); + return account.getJid().asBareJid(); } User user = findUserByFullJid(jid); return user == null ? null : user.realJid; diff --git a/src/main/java/de/pixart/messenger/entities/ReadByMarker.java b/src/main/java/de/pixart/messenger/entities/ReadByMarker.java index 3162c26c6..ec2d1aa73 100644 --- a/src/main/java/de/pixart/messenger/entities/ReadByMarker.java +++ b/src/main/java/de/pixart/messenger/entities/ReadByMarker.java @@ -8,8 +8,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import de.pixart.messenger.xmpp.jid.InvalidJidException; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class ReadByMarker { @@ -52,14 +51,14 @@ public class ReadByMarker { JSONObject jsonObject = new JSONObject(); if (fullJid != null) { try { - jsonObject.put("fullJid", fullJid.toPreppedString()); + jsonObject.put("fullJid", fullJid.toString()); } catch (JSONException e) { //ignore } } if (realJid != null) { try { - jsonObject.put("realJid", realJid.toPreppedString()); + jsonObject.put("realJid", realJid.toString()); } catch (JSONException e) { //ignore } @@ -82,7 +81,7 @@ public class ReadByMarker { public static ReadByMarker from(Jid fullJid, Jid realJid) { final ReadByMarker marker = new ReadByMarker(); marker.fullJid = fullJid; - marker.realJid = realJid == null ? null : realJid.toBareJid(); + marker.realJid = realJid == null ? null : realJid.asBareJid(); return marker; } @@ -111,13 +110,13 @@ public class ReadByMarker { public static ReadByMarker fromJson(JSONObject jsonObject) { ReadByMarker marker = new ReadByMarker(); try { - marker.fullJid = Jid.fromString(jsonObject.getString("fullJid"), true); - } catch (JSONException | InvalidJidException e) { + marker.fullJid = Jid.of(jsonObject.getString("fullJid")); + } catch (JSONException | IllegalArgumentException e) { marker.fullJid = null; } try { - marker.realJid = Jid.fromString(jsonObject.getString("realJid"), true); - } catch (JSONException | InvalidJidException e) { + marker.realJid = Jid.of(jsonObject.getString("realJid")); + } catch (JSONException | IllegalArgumentException e) { marker.realJid = null; } return marker; @@ -142,7 +141,7 @@ public class ReadByMarker { public static boolean contains(ReadByMarker needle, Set<ReadByMarker> readByMarkers) { for(ReadByMarker marker : readByMarkers) { if (marker.realJid != null && needle.realJid != null) { - if (marker.realJid.toBareJid().equals(needle.realJid.toBareJid())) { + if (marker.realJid.asBareJid().equals(needle.realJid.asBareJid())) { return true; } } else if (marker.fullJid != null && needle.fullJid != null) { diff --git a/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java b/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java index 440f13d6f..1b7065d29 100644 --- a/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java +++ b/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java @@ -29,7 +29,7 @@ package de.pixart.messenger.entities; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class ReceiptRequest { @@ -43,7 +43,7 @@ public class ReceiptRequest { if (jid == null) { throw new IllegalArgumentException("jid must not be null"); } - this.jid = jid.toBareJid(); + this.jid = jid.asBareJid(); this.id = id; } diff --git a/src/main/java/de/pixart/messenger/entities/Roster.java b/src/main/java/de/pixart/messenger/entities/Roster.java index bdb7265f3..97ad41114 100644 --- a/src/main/java/de/pixart/messenger/entities/Roster.java +++ b/src/main/java/de/pixart/messenger/entities/Roster.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class Roster { final Account account; @@ -21,7 +21,7 @@ public class Roster { return null; } synchronized (this.contacts) { - Contact contact = contacts.get(jid.toBareJid()); + Contact contact = contacts.get(jid.asBareJid()); if (contact != null && contact.showInRoster()) { return contact; } else { @@ -32,13 +32,13 @@ public class Roster { public Contact getContact(final Jid jid) { synchronized (this.contacts) { - if (!contacts.containsKey(jid.toBareJid())) { - Contact contact = new Contact(jid.toBareJid()); + if (!contacts.containsKey(jid.asBareJid())) { + Contact contact = new Contact(jid.asBareJid()); contact.setAccount(account); - contacts.put(contact.getJid().toBareJid(), contact); + contacts.put(contact.getJid().asBareJid(), contact); return contact; } - return contacts.get(jid.toBareJid()); + return contacts.get(jid.asBareJid()); } } @@ -78,7 +78,7 @@ public class Roster { contact.setAccount(account); contact.setOption(Contact.Options.IN_ROSTER); synchronized (this.contacts) { - contacts.put(contact.getJid().toBareJid(), contact); + contacts.put(contact.getJid().asBareJid(), contact); } } |