diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/MucOptions.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java | 25 |
1 files changed, 12 insertions, 13 deletions
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; |