summaryrefslogtreecommitdiff
path: root/app/src/insecure/java
diff options
context:
space:
mode:
authorlalottacontinua <loddatio@posteo.de>2018-06-27 22:44:33 +0200
committerlalottacontinua <loddatio@posteo.de>2018-06-27 22:44:33 +0200
commitd63dd4b36701f2f993e671f8cc3c5424b787e43a (patch)
tree486a8c3a1a688e76c7da7f5d9f8dfddbcc0b58aa /app/src/insecure/java
parent277f0f12ca505797daec42a5211885ac07b909f9 (diff)
parent8c9879145e588e985e5305ee2f88dfc1b6bf1d10 (diff)
Merge branch 'master' into add_provider
Diffstat (limited to 'app/src/insecure/java')
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
index 61ae790b..e3fb549f 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
@@ -46,6 +46,7 @@ import javax.net.ssl.X509TrustManager;
import okhttp3.OkHttpClient;
import se.leap.bitmaskclient.eip.EIP;
+import se.leap.bitmaskclient.utils.ConfigHelper;
import static android.text.TextUtils.isEmpty;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;