diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
commit | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch) | |
tree | 9a2152390f39c4a9c79490a0938f57fe728140f2 /src/eu/siacs/conversations/entities/Roster.java | |
parent | ae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff) | |
parent | 331be08859d68fa6a034b39c674fd7bb929c4a5c (diff) |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/entities/Roster.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Roster.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/entities/Roster.java b/src/eu/siacs/conversations/entities/Roster.java index f11f0250..b6908793 100644 --- a/src/eu/siacs/conversations/entities/Roster.java +++ b/src/eu/siacs/conversations/entities/Roster.java @@ -14,13 +14,18 @@ public class Roster { this.account = account; } - public boolean hasContact(String jid) { - String cleanJid = jid.split("/",2)[0]; - return contacts.containsKey(cleanJid); + public Contact getContactAsShownInRoster(String jid) { + String cleanJid = jid.split("/", 2)[0]; + Contact contact = contacts.get(cleanJid); + if (contact != null && contact.showInRoster()) { + return contact; + } else { + return null; + } } public Contact getContact(String jid) { - String cleanJid = jid.split("/",2)[0].toLowerCase(Locale.getDefault()); + String cleanJid = jid.split("/", 2)[0].toLowerCase(Locale.getDefault()); if (contacts.containsKey(cleanJid)) { return contacts.get(cleanJid); } else { |