make launching app shortcuts work with disabled accounts

This commit is contained in:
Daniel Gultsch 2017-06-05 10:18:02 +02:00
parent 012f60be56
commit f7f6e8dfd5

View file

@ -3619,7 +3619,7 @@ public class XmppConnectionService extends Service {
public List<Contact> findContacts(Jid jid, String accountJid) { public List<Contact> findContacts(Jid jid, String accountJid) {
ArrayList<Contact> contacts = new ArrayList<>(); ArrayList<Contact> contacts = new ArrayList<>();
for (Account account : getAccounts()) { for (Account account : getAccounts()) {
if (!account.isOptionSet(Account.OPTION_DISABLED) if ((!account.isOptionSet(Account.OPTION_DISABLED) || accountJid != null)
&& (accountJid == null || accountJid.equals(account.getJid().toBareJid().toString()))) { && (accountJid == null || accountJid.equals(account.getJid().toBareJid().toString()))) {
Contact contact = account.getRoster().getContactFromRoster(jid); Contact contact = account.getRoster().getContactFromRoster(jid);
if (contact != null) { if (contact != null) {