aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
diff options
context:
space:
mode:
authorMichal Kepkowski <michal.kepkowski@sagiton.pl>2016-04-06 19:25:10 +0200
committerMichal Kepkowski <michal.kepkowski@sagiton.pl>2016-04-06 19:25:10 +0200
commit26bfe06d80f4114da298a7e7e05a59db823a8d40 (patch)
treec57f309d7f9d52dc990572c2e035ee12a6ccf294 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
parentd9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd (diff)
downloadopen-keychain-26bfe06d80f4114da298a7e7e05a59db823a8d40.tar.gz
open-keychain-26bfe06d80f4114da298a7e7e05a59db823a8d40.tar.bz2
open-keychain-26bfe06d80f4114da298a7e7e05a59db823a8d40.zip
cleaning
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OkHttpKeybaseClient.java1
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java13
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OkHttpKeybaseClient.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OkHttpKeybaseClient.java
index e9fe7f724..4700da5f3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OkHttpKeybaseClient.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OkHttpKeybaseClient.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.net.Proxy;
import java.net.URL;
import java.net.URLConnection;
-import java.util.concurrent.TimeUnit;
/**
* Wrapper for Keybase Lib
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 d1b8f768b..c23985ac0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
@@ -44,12 +44,6 @@ import javax.net.ssl.TrustManagerFactory;
public class TlsHelper {
- public static class TlsHelperException extends Exception {
- public TlsHelperException(Exception e) {
- super(e);
- }
- }
-
private static Map<String, byte[]> sPinnedCertificates = new HashMap<>();
/**
@@ -87,7 +81,6 @@ public class TlsHelper {
for (String host : sPinnedCertificates.keySet()) {
if (url.getHost().endsWith(host)) {
return pinCertificate(sPinnedCertificates.get(host));
- //return true;
}
}
}
@@ -138,4 +131,10 @@ public class TlsHelper {
}
}
+ public static class TlsHelperException extends Exception {
+ public TlsHelperException(Exception e) {
+ super(e);
+ }
+ }
+
}