diff options
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index bceec639..8b6a7bd7 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -83,7 +83,7 @@ public class Account extends AbstractEntity { final String avatar) { this.uuid = uuid; this.jid = jid; - if (jid.getResourcepart().isEmpty()) { + if (jid.isBareJid()) { this.setResource("mobile"); } this.password = password; diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 166b6b68..e25c6b89 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -244,7 +244,7 @@ public class MucOptions { && conversation.getBookmark().getNick() != null) { return conversation.getBookmark().getNick(); } else { - if (!conversation.getContactJid().getResourcepart().isEmpty()) { + if (!conversation.getContactJid().isBareJid()) { return conversation.getContactJid().getResourcepart(); } else { return account.getUsername(); @@ -376,4 +376,4 @@ public class MucOptions { public Conversation getConversation() { return this.conversation; } -}
\ No newline at end of file +} |