diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-11-23 12:58:45 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-11-23 12:58:45 +0100 |
| commit | 89b2a449294d10a74e7d5f5a396ca344104f5cf6 (patch) | |
| tree | 0e99e231920e29ebcc2363be3929bdb9b6813b42 /src/main/java/de/pixart/messenger/ui | |
| parent | 0290fa1b011c02698fc1313342ac0f8b5fd31d16 (diff) | |
use inContactList() instead inRoster() in the proper places
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShortcutActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 745ed67c7..fa83354c4 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -466,7 +466,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers this.mSelectedUser = user; String name; final Contact contact = user.getContact(); - if (contact != null && contact.showInRoster()) { + if (contact != null && contact.showInContactList()) { name = contact.getDisplayName(); } else if (user.getRealJid() != null) { name = user.getRealJid().asBareJid().toString(); diff --git a/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java b/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java index 52f87c5a3..ef5c296e0 100644 --- a/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java @@ -55,7 +55,7 @@ public class ShortcutActivity extends AbstractSearchableListItemActivity { for (final Account account : xmppConnectionService.getAccounts()) { if (account.getStatus() != Account.State.DISABLED) { for (final Contact contact : account.getRoster().getContacts()) { - if (contact.showInRoster() + if (contact.showInContactList() && contact.match(this, needle)) { getListItems().add(contact); } |