mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Cache known gateways

Browse source 
(cherry picked from commit 3ed3e18b3850c6b06e5fcec8a9f614771dfabdd4)
This commit is contained in:
Stephen Paul Weber 2024-09-14 22:19:02 -05:00 • committed by Arne
parent 7a592117db
commit 0723a399fb
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import androidx.core.graphics.ColorUtils;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.HashMultimap;
import org.json.JSONException;
import org.json.JSONObject;
@ -112,6 +113,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
private String fastMechanism;
private String fastToken;
private Integer color = null;
private final HashMultimap<String, Contact> gateways = HashMultimap.create();
public Account(final Jid jid, final String password) {
this(
@ -649,6 +651,25 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
return this.roster;
}
public void refreshCapsFor(Contact contact) {
for (final var k : gateways.keySet()) {
gateways.remove(k, contact);
}
for (final var p : contact.getPresences().getPresences()) {
final var disco = p.getServiceDiscoveryResult();
if (disco == null) continue;
for (final var identity : disco.getIdentities()) {
if ("gateway".equals(identity.getCategory())) {
gateways.put(identity.getType(), contact);
}
}
}
}
public Set<Contact> getGateways(final String type) {
return gateways.get(type);
}
public Collection<Bookmark> getBookmarks() {
synchronized (this.bookmarks) {
return ImmutableList.copyOf(this.bookmarks.values());

6
src/main/java/eu/siacs/conversations/entities/Contact.java
View file

@ -298,11 +298,13 @@ public class Contact implements ListItem, Blockable {
public void removePresence(final String resource) {
this.presences.removePresence(resource);
refreshCaps();
}
public void clearPresences() {
this.presences.clearPresences();
this.resetOption(Options.PENDING_SUBSCRIPTION_REQUEST);
refreshCaps();
}
public Presence.Status getShownStatus() {
@ -737,6 +739,10 @@ public class Contact implements ListItem, Blockable {
return !Objects.equals(previous, this.rtpCapability);
}
public void refreshCaps() {
account.refreshCapsFor(this);
}
public RtpCapability.Capability getRtpCapability() {
return this.rtpCapability == null ? RtpCapability.Capability.NONE : this.rtpCapability;
}

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

@ -5649,6 +5649,7 @@ public class XmppConnectionService extends Service {
if (contact.refreshRtpCapability()) {
syncRoster(account);
}
contact.refreshCaps();
if (disco.hasIdentity("gateway", "pstn")) {
contact.registerAsPhoneAccount(this);
mQuickConversationsService.considerSyncBackground(false);
@ -5716,6 +5717,7 @@ public class XmppConnectionService extends Service {
}
if (serviceDiscoverySet) {
rosterNeedsSync |= contact.refreshRtpCapability();
contact.refreshCaps();
}
}
if (rosterNeedsSync) {