Commit 17112aec authored by Grigory Fedorov's avatar Grigory Fedorov

VCardManager: fixed vCard requests on roster load.

parent e17cf999
...@@ -128,7 +128,7 @@ public class VCardManager implements OnLoadListener, OnPacketListener, ...@@ -128,7 +128,7 @@ public class VCardManager implements OnLoadListener, OnPacketListener,
String account = accountItem.getAccount(); String account = accountItem.getAccount();
if (!accountRequested.contains(account) && SettingsManager.connectionLoadVCard()) { if (!accountRequested.contains(account) && SettingsManager.connectionLoadVCard()) {
String bareAddress = Jid.getBareAddress(accountItem.getRealJid()); String bareAddress = Jid.getBareAddress(accountItem.getRealJid());
if (bareAddress != null) { if (bareAddress != null && !names.containsKey(bareAddress)) {
request(account, bareAddress); request(account, bareAddress);
accountRequested.add(account); accountRequested.add(account);
} }
...@@ -136,7 +136,7 @@ public class VCardManager implements OnLoadListener, OnPacketListener, ...@@ -136,7 +136,7 @@ public class VCardManager implements OnLoadListener, OnPacketListener,
// Request vCards for new contacts. // Request vCards for new contacts.
for (RosterContact contact : RosterManager.getInstance().getContacts()) { for (RosterContact contact : RosterManager.getInstance().getContacts()) {
if (account.equals(contact.getUser()) && !names.containsKey(contact.getUser())) { if (account.equals(contact.getAccount()) && !names.containsKey(contact.getUser())) {
request(account, contact.getUser()); request(account, contact.getUser());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment