diff options
author | fupduck <fupduck@riseup.net> | 2018-06-19 03:38:43 -0700 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-06-19 03:38:43 -0700 |
commit | 55c3972e9ac0796a801c64788eb364cbd0c9cf02 (patch) | |
tree | c3a06ca78102791f0126031dbf5b4bd801168fa9 /app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java | |
parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) | |
parent | 767862ceb2b5408be1ee0da5219b0921a35cbf03 (diff) |
Merge branch '#8885_testing_ProviderManager' into 'master'
#8885 testing provider manager
See merge request leap/bitmask_android!69
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java b/app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java index 76d38447..cca75bdf 100644 --- a/app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java +++ b/app/src/main/java/se/leap/bitmaskclient/TLSCompatSocketFactory.java @@ -22,6 +22,7 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; import okhttp3.OkHttpClient; +import se.leap.bitmaskclient.utils.ConfigHelper; /** * Created by cyberta on 24.10.17. |