aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-04-09 11:53:37 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2016-04-09 11:53:37 +0200
commit2d762e55da92ef45576967c0d1befef55e7935ea (patch)
treea1a9e991817d8a6379c1146ae6b76b6078dee280 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
parent4edb805ba1d0e6de966692bbf0ba045fb11211e2 (diff)
downloadopen-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.tar.gz
open-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.tar.bz2
open-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.zip
Okhttp3 cleanups, docs, and fix timeouts for default client
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
index c23985ac0..77ed6fe0b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
@@ -19,8 +19,6 @@ package org.sufficientlysecure.keychain.util;
import android.content.res.AssetManager;
-
-import okhttp3.OkHttpClient;
import org.sufficientlysecure.keychain.Constants;
import java.io.ByteArrayInputStream;
@@ -93,7 +91,6 @@ public class TlsHelper {
* Therefore a builder that is pinned this way should be used to only make requests to URLs with passed certificate.
*
* @param certificate certificate to pin
- * @param builder OkHttpBuilder to enforce pinning on
* @throws TlsHelperException
* @throws IOException
*/
@@ -125,7 +122,6 @@ public class TlsHelper {
context.init(null, tmf.getTrustManagers(), null);
return context.getSocketFactory();
- //builder.sslSocketFactory(context.getSocketFactory());
} catch (CertificateException | KeyStoreException | KeyManagementException | NoSuchAlgorithmException e) {
throw new TlsHelperException(e);
}