add support for RFC7711 to MTM

3 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
index c6f1d02ec..20213521f 100644
--- a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
@@ -60,7 +60,7 @@ public class HttpConnectionManager extends AbstractConnectionManager {
         final X509TrustManager trustManager;
         final HostnameVerifier hostnameVerifier;
         if (interactive) {
-            trustManager = mXmppConnectionService.getMemorizingTrustManager();
+            trustManager = mXmppConnectionService.getMemorizingTrustManager().getInteractive();
             hostnameVerifier = mXmppConnectionService
                     .getMemorizingTrustManager().wrapHostnameVerifier(
                             new StrictHostnameVerifier());
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 8f83851bd..99167fa94 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1816,7 +1816,7 @@ public class XmppConnectionService extends Service {
                         callback.onAccountCreated(account);
                         if (Config.X509_VERIFICATION) {
                             try {
-                                getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
+                                getMemorizingTrustManager().getNonInteractive(account.getJid().getDomainpart()).checkClientTrusted(chain, "RSA");
                             } catch (CertificateException e) {
                                 callback.informUser(R.string.certificate_chain_is_not_trusted);
                             }
@@ -1844,7 +1844,7 @@ public class XmppConnectionService extends Service {
                 databaseBackend.updateAccount(account);
                 if (Config.X509_VERIFICATION) {
                     try {
-                        getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
+                        getMemorizingTrustManager().getNonInteractive(account.getJid().getDomainpart()).checkClientTrusted(chain, "RSA");
                     } catch (CertificateException e) {
                         showErrorToastInUi(R.string.certificate_chain_is_not_trusted);
                     }
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index dd78a3eab..676a498ac 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -524,7 +524,8 @@ public class XmppConnection implements Runnable {
         } else {
             keyManager = null;
         }
-        sc.init(keyManager, new X509TrustManager[]{mInteractive ? trustManager : trustManager.getNonInteractive()}, mXmppConnectionService.getRNG());
+        String domain = account.getJid().getDomainpart();
+        sc.init(keyManager, new X509TrustManager[]{mInteractive ? trustManager.getInteractive(domain) : trustManager.getNonInteractive(domain)}, mXmppConnectionService.getRNG());
         final SSLSocketFactory factory = sc.getSocketFactory();
         final HostnameVerifier verifier;
         if (mInteractive) {