remove omemo devices from annoucement after 7 days of inactivity

2 files changed, 54 insertions, 24 deletions

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 8c9b5a7bb..8a38ce20d 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.entities.Account;
@@ -75,6 +76,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     private final SerialSingleThreadExecutor executor;
     private int numPublishTriesOnEmptyPep = 0;
     private boolean pepBroken = false;
+    private AtomicBoolean ownPushPending = new AtomicBoolean(false);
 
     @Override
     public void onAdvancedStreamFeaturesAvailable(Account account) {
@@ -302,15 +304,15 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     public Collection<XmppAxolotlSession> findOwnSessions() {
         AxolotlAddress ownAddress = getAddressForJid(account.getJid().toBareJid());
         ArrayList<XmppAxolotlSession> s = new ArrayList<>(this.sessions.getAll(ownAddress).values());
-        		Collections.sort(s);
-        		return s;
+        Collections.sort(s);
+        return s;
     }
 
     public Collection<XmppAxolotlSession> findSessionsForContact(Contact contact) {
         AxolotlAddress contactAddress = getAddressForJid(contact.getJid());
         ArrayList<XmppAxolotlSession> s = new ArrayList<>(this.sessions.getAll(contactAddress).values());
-        		Collections.sort(s);
-        		return s;
+        Collections.sort(s);
+        return s;
     }
 
     private Set<XmppAxolotlSession> findSessionsForConversation(Conversation conversation) {
@@ -354,23 +356,14 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
-        if (jid.toBareJid().equals(account.getJid().toBareJid())) {
-            if (!deviceIds.isEmpty()) {
-                Log.d(Config.LOGTAG, getLogprefix(account) + "Received non-empty own device list. Resetting publish attempts and pepBroken status.");
-                pepBroken = false;
-                numPublishTriesOnEmptyPep = 0;
-            }
-            if (deviceIds.contains(getOwnDeviceId())) {
-                deviceIds.remove(getOwnDeviceId());
-            } else {
-                publishOwnDeviceId(deviceIds);
-            }
-            for (Integer deviceId : deviceIds) {
-                AxolotlAddress ownDeviceAddress = new AxolotlAddress(jid.toBareJid().toPreppedString(), deviceId);
-                if (sessions.get(ownDeviceAddress) == null) {
-                    buildSessionFromPEP(ownDeviceAddress);
-                }
-            }
+        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");
+            return;
+        }
+        boolean needsPublishing = me && !deviceIds.contains(getOwnDeviceId());
+        if (me) {
+            deviceIds.remove(getOwnDeviceId());
         }
         Set<Integer> expiredDevices = new HashSet<>(axolotlStore.getSubDeviceSessions(jid.toBareJid().toPreppedString()));
         expiredDevices.removeAll(deviceIds);
@@ -389,10 +382,25 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
             XmppAxolotlSession session = sessions.get(address);
             if (session != null && session.getFingerprint() != null) {
                 if (!session.getTrust().isActive()) {
+                    Log.d(Config.LOGTAG,"reactivating device with fingprint "+session.getFingerprint());
                     session.setTrust(session.getTrust().toActive());
                 }
             }
         }
+        if (me) {
+            if (Config.OMEMO_AUTO_EXPIRY != 0) {
+                needsPublishing |= deviceIds.removeAll(getExpiredDevices());
+            }
+            for (Integer deviceId : deviceIds) {
+                AxolotlAddress ownDeviceAddress = new AxolotlAddress(jid.toBareJid().toPreppedString(), deviceId);
+                if (sessions.get(ownDeviceAddress) == null) {
+                    buildSessionFromPEP(ownDeviceAddress);
+                }
+            }
+            if (needsPublishing) {
+                publishOwnDeviceId(deviceIds);
+            }
+        }
         this.deviceIds.put(jid, deviceIds);
         mXmppConnectionService.keyStatusUpdated(null);
     }
@@ -427,14 +435,30 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
                 } else {
                     Element item = mXmppConnectionService.getIqParser().getItem(packet);
                     Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
-                    if (!deviceIds.contains(getOwnDeviceId())) {
-                        publishOwnDeviceId(deviceIds);
-                    }
+                    registerDevices(account.getJid().toBareJid(),deviceIds);
                 }
             }
         });
     }
 
+    private Set<Integer> getExpiredDevices() {
+        Set<Integer> devices = new HashSet<>();
+        for(XmppAxolotlSession session : findOwnSessions()) {
+            if (session.getTrust().isActive()) {
+                long diff = System.currentTimeMillis() - session.getTrust().getLastActivation();
+                if (diff > Config.OMEMO_AUTO_EXPIRY) {
+                    long lastMessageDiff = System.currentTimeMillis() - mXmppConnectionService.databaseBackend.getLastTimeFingerprintUsed(account,session.getFingerprint());
+                    if (lastMessageDiff > Config.OMEMO_AUTO_EXPIRY) {
+                        devices.add(session.getRemoteAddress().getDeviceId());
+                        session.setTrust(session.getTrust().toInactive());
+                        Log.d(Config.LOGTAG, "added own device " + session.getFingerprint() + " to list of expired devices. Last message received "+(lastMessageDiff/1000)+"s ago");
+                    }
+                }
+            }
+        }
+        return devices;
+    }
+
     public void publishOwnDeviceId(Set<Integer> deviceIds) {
         Set<Integer> deviceIdsCopy = new HashSet<>(deviceIds);
         if (!deviceIdsCopy.contains(getOwnDeviceId())) {
@@ -453,9 +477,11 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
             }
             deviceIdsCopy.add(getOwnDeviceId());
             IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(deviceIdsCopy);
+            ownPushPending.set(true);
             mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
                 @Override
                 public void onIqPacketReceived(Account account, IqPacket packet) {
+                    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/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java b/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
index bffb94e1f..0614b759f 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/FingerprintStatus.java
@@ -156,6 +156,10 @@ public class FingerprintStatus implements Comparable<FingerprintStatus> {
         }
     }
 
+    public long getLastActivation() {
+        return lastActivation;
+    }
+
     public enum Trust {
         COMPROMISED,
         UNDECIDED,