aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-12-07 14:47:21 +0100
committerDaniel Gultsch <daniel@gultsch.de>2017-12-07 14:47:21 +0100
commit328c6dea0fb730aa7b01cca91cd8adec5cae15f5 (patch)
treeb5fca12519ea69a7ef95d1cfa19ebcee34b7e229
parenta4b44ee73013781afe20c1585938496e32b72eca (diff)
fixed workaround that allowed us to expire devices
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java15
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java3
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index 4acd467..f449b42 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -80,8 +80,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
private final SerialSingleThreadExecutor executor;
private int numPublishTriesOnEmptyPep = 0;
private boolean pepBroken = false;
+ private int lastDeviceListNotificationHash = 0;
- private AtomicBoolean ownPushPending = new AtomicBoolean(false);
private AtomicBoolean changeAccessMode = new AtomicBoolean(false);
@Override
@@ -350,7 +350,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
public void resetBrokenness() {
this.pepBroken = false;
- numPublishTriesOnEmptyPep = 0;
+ this.numPublishTriesOnEmptyPep = 0;
+ this.lastDeviceListNotificationHash = 0;
}
public void clearErrorsInFetchStatusMap(Jid jid) {
@@ -388,11 +389,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
}
public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
- boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
- if (me && ownPushPending.getAndSet(false)) {
- Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring own device update because of pending push");
+ final int hash = deviceIds.hashCode();
+ final boolean me = jid.toBareJid().equals(account.getJid().toBareJid());
+ if (me && hash == this.lastDeviceListNotificationHash) {
+ Log.d(Config.LOGTAG,account.getJid().toBareJid()+": ignoring duplicate own device id list");
return;
}
+ this.lastDeviceListNotificationHash = hash;
boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
if (me) {
deviceIds.remove(getOwnDeviceId());
@@ -527,7 +530,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
private void publishDeviceIdsAndRefineAccessModel(final Set<Integer> ids, final boolean firstAttempt) {
final Bundle publishOptions = account.getXmppConnection().getFeatures().pepPublishOptions() ? PublishOptions.openAccess() : null;
IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(ids, publishOptions);
- ownPushPending.set(true);
mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
@@ -551,7 +553,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
account.setOption(Account.OPTION_REQUIRES_ACCESS_MODE_CHANGE,false);
mXmppConnectionService.databaseBackend.updateAccount(account);
}
- ownPushPending.set(false);
if (packet.getType() == IqPacket.TYPE.ERROR) {
pepBroken = true;
Log.d(Config.LOGTAG, getLogprefix(account) + "Error received while publishing own device id" + packet.findChild("error"));
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 66ec661..77e435e 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -293,10 +293,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
mXmppConnectionService.updateAccountUi();
}
} else if (AxolotlService.PEP_DEVICE_LIST.equals(node)) {
-
Element item = items.findChild("item");
Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
- Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Received PEP device list (" + deviceIds + ") update from " + from + ", processing...");
+ Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Received PEP device list " + deviceIds + " update from " + from + ", processing... ");
AxolotlService axolotlService = account.getAxolotlService();
axolotlService.registerDevices(from, deviceIds);
mXmppConnectionService.updateAccountUi();