introduced code to verify omemo device keys with x509 certificates.

cleaned up TrustKeysActivity to automatically close if there is nothing to do

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f311688e..18667248 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -947,11 +947,10 @@ public class XmppConnection implements Runnable {
 							}
 						}
 						disco.put(jid, info);
-						if (account.getServer().equals(jid)) {
+						if ((jid.equals(account.getServer()) || jid.equals(account.getJid().toBareJid()))
+								&& disco.containsKey(account.getServer())
+								&& disco.containsKey(account.getJid().toBareJid())) {
 							enableAdvancedStreamFeatures();
-							for (final OnAdvancedStreamFeaturesLoaded listener : advancedStreamFeaturesLoadedListeners) {
-								listener.onAdvancedStreamFeaturesAvailable(account);
-							}
 						}
 					} else {
 						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not query disco info for "+jid.toString());
@@ -969,6 +968,9 @@ public class XmppConnection implements Runnable {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": Requesting block list");
 			this.sendIqPacket(getIqGenerator().generateGetBlockList(), mXmppConnectionService.getIqParser());
 		}
+		for (final OnAdvancedStreamFeaturesLoaded listener : advancedStreamFeaturesLoadedListeners) {
+			listener.onAdvancedStreamFeaturesAvailable(account);
+		}
 	}
 
 	private void sendServiceDiscoveryItems(final Jid server) {