narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed concurrent modification when iterating over presences

Browse source
This commit is contained in:
Daniel Gultsch 2020-05-30 10:57:22 +02:00
parent 8603d24bcb
commit 8edfc61346
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Account.java
View file

@ -432,7 +432,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
public int activeDevicesWithRtpCapability() {
int i = 0;
for(Presence presence : getSelfContact().getPresences().getPresences().values()) {
for(Presence presence : getSelfContact().getPresences().getPresences()) {
if (RtpCapability.check(presence) != RtpCapability.Capability.NONE) {
i++;
}

12
src/main/java/eu/siacs/conversations/entities/Presences.java
View file

@ -11,8 +11,16 @@ import java.util.Map;
public class Presences {
private final Hashtable<String, Presence> presences = new Hashtable<>();
public Hashtable<String, Presence> getPresences() {
return this.presences;
public List<Presence> getPresences() {
synchronized (this.presences) {
return new ArrayList<>(this.presences.values());
}
}
public Presence get(String resource) {
synchronized (this.presences) {
return this.presences.get(resource);
}
}
public void updatePresence(String resource, Presence presence) {

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -4468,8 +4468,8 @@ public class XmppConnectionService extends Service {
}
private void injectServiceDiscoveryResult(Roster roster, String hash, String ver, ServiceDiscoveryResult disco) {
for (Contact contact : roster.getContacts()) {
for (Presence presence : contact.getPresences().getPresences().values()) {
for (final Contact contact : roster.getContacts()) {
for (final Presence presence : contact.getPresences().getPresences()) {
if (hash.equals(presence.getHash()) && ver.equals(presence.getVer())) {
presence.setServiceDiscoveryResult(disco);
}

2
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
View file

@ -417,7 +417,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
final Jid jid = this.id.with;
String resource = jid != null ? jid.getResource() : null;
if (resource != null) {
Presence presence = this.id.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
Presence presence = this.id.account.getRoster().getContact(jid).getPresences().get(resource);
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
return result == null ? Collections.emptyList() : result.getFeatures();
} else {

2
src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
View file

@ -40,7 +40,7 @@ public class RtpCapability {
public static Capability check(final Contact contact) {
final Presences presences = contact.getPresences();
Capability result = Capability.NONE;
for(Presence presence : presences.getPresences().values()) {
for(Presence presence : presences.getPresences()) {
Capability capability = check(presence);
if (capability == Capability.VIDEO) {
result = capability;