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

explicitly fetch device ids before building sessions in single mode conversation

Browse source
This commit is contained in:
Daniel Gultsch 2017-06-28 11:34:53 +02:00
parent 25e993693f
commit f7258d16e1
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View file

@ -865,7 +865,15 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
return !hasAny(jid) && (!deviceIds.containsKey(jid) || deviceIds.get(jid).isEmpty()); return !hasAny(jid) && (!deviceIds.containsKey(jid) || deviceIds.get(jid).isEmpty());
} }
public interface OnDeviceIdsFetched {
void fetched(Set<Integer> deviceIds);
}
public void fetchDeviceIds(final Jid jid) { public void fetchDeviceIds(final Jid jid) {
fetchDeviceIds(jid,null);
}
public void fetchDeviceIds(final Jid jid, final OnDeviceIdsFetched callback) {
Log.d(Config.LOGTAG,"fetching device ids for "+jid); Log.d(Config.LOGTAG,"fetching device ids for "+jid);
IqPacket packet = mXmppConnectionService.getIqGenerator().retrieveDeviceIds(jid); IqPacket packet = mXmppConnectionService.getIqGenerator().retrieveDeviceIds(jid);
mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() { mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
@ -875,9 +883,16 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
Element item = mXmppConnectionService.getIqParser().getItem(packet); Element item = mXmppConnectionService.getIqParser().getItem(packet);
Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item); Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
registerDevices(jid,deviceIds); registerDevices(jid,deviceIds);
if (callback != null) {
callback.fetched(deviceIds);
}
} else { } else {
Log.d(Config.LOGTAG,packet.toString()); Log.d(Config.LOGTAG,packet.toString());
if (callback != null) {
callback.fetched(null);
}
} }
} }
}); });
} }
@ -1013,6 +1028,28 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
} }
public boolean createSessionsIfNeeded(final Conversation conversation) { public boolean createSessionsIfNeeded(final Conversation conversation) {
final Jid jid = conversation.getJid().toBareJid();
if (conversation.getMode() == Conversation.MODE_SINGLE && hasEmptyDeviceList(jid)) {
final SignalProtocolAddress placeholder = new SignalProtocolAddress(jid.toPreppedString(), Integer.MIN_VALUE);
FetchStatus status = fetchStatusMap.get(placeholder);
if (status == null || status == FetchStatus.TIMEOUT) {
fetchStatusMap.put(placeholder, FetchStatus.PENDING);
}
fetchDeviceIds(conversation.getJid().toBareJid(), new OnDeviceIdsFetched() {
@Override
public void fetched(Set<Integer> deviceIds) {
createSessionsIfNeededActual(conversation);
fetchStatusMap.put(placeholder,deviceIds != null && !deviceIds.isEmpty() ? FetchStatus.SUCCESS : FetchStatus.ERROR);
finishBuildingSessionsFromPEP(placeholder);
}
});
return true;
} else {
return createSessionsIfNeededActual(conversation);
}
}
private boolean createSessionsIfNeededActual(final Conversation conversation) {
Log.i(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Creating axolotl sessions if needed..."); Log.i(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Creating axolotl sessions if needed...");
boolean newSessions = false; boolean newSessions = false;
Set<SignalProtocolAddress> addresses = findDevicesWithoutSession(conversation); Set<SignalProtocolAddress> addresses = findDevicesWithoutSession(conversation);