show 'clear devices' button underneath own devices

2 files changed, 6 insertions, 23 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 bc293ea1f..13c80ef96 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -301,7 +301,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
         return new HashSet<>(this.sessions.getAll(ownAddress).values());
     }
 
-    private Set<XmppAxolotlSession> findSessionsForContact(Contact contact) {
+    public Set<XmppAxolotlSession> findSessionsForContact(Contact contact) {
         AxolotlAddress contactAddress = getAddressForJid(contact.getJid());
         return new HashSet<>(this.sessions.getAll(contactAddress).values());
     }
@@ -314,22 +314,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
         return sessions;
     }
 
-    public Set<String> getFingerprintsForOwnSessions() {
-        Set<String> fingerprints = new HashSet<>();
-        for (XmppAxolotlSession session : findOwnSessions()) {
-            fingerprints.add(session.getFingerprint());
-        }
-        return fingerprints;
-    }
-
-    public Set<String> getFingerprintsForContact(final Contact contact) {
-        Set<String> fingerprints = new HashSet<>();
-        for (XmppAxolotlSession session : findSessionsForContact(contact)) {
-            fingerprints.add(session.getFingerprint());
-        }
-        return fingerprints;
-    }
-
     private boolean hasAny(Jid jid) {
         return sessions.hasAny(getAddressForJid(jid));
     }
@@ -415,12 +399,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
         deviceIds.add(getOwnDeviceId());
         IqPacket publish = mXmppConnectionService.getIqGenerator().publishDeviceIds(deviceIds);
         Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Wiping all other devices from Pep:" + publish);
-        mXmppConnectionService.sendIqPacket(account, publish, new OnIqPacketReceived() {
-            @Override
-            public void onIqPacketReceived(Account account, IqPacket packet) {
-                // TODO: implement this!
-            }
-        });
+        mXmppConnectionService.sendIqPacket(account, publish, null);
     }
 
     public void purgeKey(final String fingerprint) {
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
index 27647fb66..f1e5589bf 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
@@ -132,4 +132,8 @@ public class XmppAxolotlSession {
             return null;
         }
     }
+
+    public Account getAccount() {
+        return account;
+    }
 }