diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 20:05:38 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-09 20:05:38 +0100 |
commit | a45a343604ad1e85d873effc9c75c27b14b510ca (patch) | |
tree | c5b4af4db8a5305fecb0b863d38aa0835c1947b3 /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
parent | 56b4ac17517c37afa09c65239687a47c1a7c0f5b (diff) | |
parent | 385bea0fe364d5a9ab7d4a13b5c93eb46016ea9d (diff) |
Merge pull request #644 from SamWhited/barejidchecks
s/getResourcepart().isEmpty()/isBareJid()/ [EOM]
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 +} |