no longer use ConcurrentHashMap in favor of synchronize on a final HashMap
This commit is contained in:
parent
4f4eff2353
commit
f338d89753
|
@ -1,14 +1,14 @@
|
||||||
package eu.siacs.conversations.entities;
|
package eu.siacs.conversations.entities;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
import eu.siacs.conversations.xmpp.jid.Jid;
|
import eu.siacs.conversations.xmpp.jid.Jid;
|
||||||
|
|
||||||
public class Roster {
|
public class Roster {
|
||||||
final Account account;
|
final Account account;
|
||||||
final ConcurrentHashMap<String, Contact> contacts = new ConcurrentHashMap<>();
|
final HashMap<String, Contact> contacts = new HashMap<>();
|
||||||
private String version = null;
|
private String version = null;
|
||||||
|
|
||||||
public Roster(Account account) {
|
public Roster(Account account) {
|
||||||
|
@ -19,23 +19,27 @@ public class Roster {
|
||||||
if (jid == null) {
|
if (jid == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final Contact contact = contacts.get(jid.toBareJid().toString());
|
synchronized (this.contacts) {
|
||||||
if (contact != null && contact.showInRoster()) {
|
Contact contact = contacts.get(jid.toBareJid().toString());
|
||||||
return contact;
|
if (contact != null && contact.showInRoster()) {
|
||||||
} else {
|
return contact;
|
||||||
return null;
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Contact getContact(final Jid jid) {
|
public Contact getContact(final Jid jid) {
|
||||||
final Jid bareJid = jid.toBareJid();
|
synchronized (this.contacts) {
|
||||||
if (contacts.containsKey(bareJid.toString())) {
|
final Jid bareJid = jid.toBareJid();
|
||||||
return contacts.get(bareJid.toString());
|
if (contacts.containsKey(bareJid.toString())) {
|
||||||
} else {
|
return contacts.get(bareJid.toString());
|
||||||
final Contact contact = new Contact(bareJid);
|
} else {
|
||||||
contact.setAccount(account);
|
Contact contact = new Contact(bareJid);
|
||||||
contacts.put(bareJid.toString(), contact);
|
contact.setAccount(account);
|
||||||
return contact;
|
contacts.put(bareJid.toString(), contact);
|
||||||
|
return contact;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,13 +50,13 @@ public class Roster {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void markAllAsNotInRoster() {
|
public void markAllAsNotInRoster() {
|
||||||
for (final Contact contact : getContacts()) {
|
for (Contact contact : getContacts()) {
|
||||||
contact.resetOption(Contact.Options.IN_ROSTER);
|
contact.resetOption(Contact.Options.IN_ROSTER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearSystemAccounts() {
|
public void clearSystemAccounts() {
|
||||||
for (final Contact contact : getContacts()) {
|
for (Contact contact : getContacts()) {
|
||||||
contact.setPhotoUri(null);
|
contact.setPhotoUri(null);
|
||||||
contact.setSystemName(null);
|
contact.setSystemName(null);
|
||||||
contact.setSystemAccount(null);
|
contact.setSystemAccount(null);
|
||||||
|
@ -60,13 +64,17 @@ public class Roster {
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Contact> getContacts() {
|
public List<Contact> getContacts() {
|
||||||
return new ArrayList<>(this.contacts.values());
|
synchronized (this.contacts) {
|
||||||
|
return new ArrayList<>(this.contacts.values());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initContact(final Contact contact) {
|
public void initContact(final Contact contact) {
|
||||||
contact.setAccount(account);
|
contact.setAccount(account);
|
||||||
contact.setOption(Contact.Options.IN_ROSTER);
|
contact.setOption(Contact.Options.IN_ROSTER);
|
||||||
contacts.put(contact.getJid().toBareJid().toString(), contact);
|
synchronized (this.contacts) {
|
||||||
|
contacts.put(contact.getJid().toBareJid().toString(), contact);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setVersion(String version) {
|
public void setVersion(String version) {
|
||||||
|
|
Loading…
Reference in New Issue