From 8874d58e68f251bb3a9367caa686e6ef08e55ce8 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 24 Jun 2017 10:05:30 +0200
Subject: also check for hostname in in certs if hostname is from trusted
 source

---
 .../java/de/pixart/messenger/http/HttpConnectionManager.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/http/HttpConnectionManager.java')

diff --git a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
index 20213521f..340bc6d7a 100644
--- a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java
@@ -58,19 +58,11 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 
     public void setupTrustManager(final HttpsURLConnection connection, final boolean interactive) {
         final X509TrustManager trustManager;
-        final HostnameVerifier hostnameVerifier;
+        final HostnameVerifier hostnameVerifier = mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier(), interactive);
         if (interactive) {
             trustManager = mXmppConnectionService.getMemorizingTrustManager().getInteractive();
-            hostnameVerifier = mXmppConnectionService
-                    .getMemorizingTrustManager().wrapHostnameVerifier(
-                            new StrictHostnameVerifier());
         } else {
-            trustManager = mXmppConnectionService.getMemorizingTrustManager()
-                    .getNonInteractive();
-            hostnameVerifier = mXmppConnectionService
-                    .getMemorizingTrustManager()
-                    .wrapHostnameVerifierNonInteractive(
-                            new StrictHostnameVerifier());
+            trustManager = mXmppConnectionService.getMemorizingTrustManager().getNonInteractive();
         }
         try {
             final SSLSocketFactory sf = new TLSSocketFactory(new X509TrustManager[]{trustManager}, mXmppConnectionService.getRNG());
-- 
cgit v1.2.3