summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2017-12-19 16:09:26 +0100
committerFup Duck <fupduck@sacknagel.com>2017-12-19 16:09:26 +0100
commit19a621a29e81929fac065afd36a498645401c345 (patch)
treee538b2d47d992434cf05645b08c291b30efeb070 /app/src/production
parentd1d34f0bf995f48dac7781711656b8cb8e387707 (diff)
parent7cd685e486e735c3994d59c01df98ac2f82dc0b2 (diff)
Merge branch '0.9.8/refactorDashboard' into asdf
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
index fadb03c3..a818e508 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -53,7 +53,7 @@ public class ProviderAPI extends ProviderApiBase {
/**
* Downloads a provider.json from a given URL, adding a new provider using the given name.
- *
+ */
* @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
* @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if the update was successful.
*/
@@ -224,7 +224,7 @@ public class ProviderAPI extends ProviderApiBase {
String[] pins = new String[] {ca_cert_fingerprint};
try {
URL url = new URL(url_string);
- HttpsURLConnection connection = PinningHelper.getPinnedHttpsURLConnection(Dashboard.getContext(), pins, url);
+ HttpsURLConnection connection = PinningHelper.getPinnedHttpsURLConnection(getApplicationContext(), pins, url);
connection.setConnectTimeout(seconds_of_timeout * 1000);
if (!LeapSRPSession.getToken().isEmpty())
connection.addRequestProperty(LeapSRPSession.AUTHORIZATION_HEADER, "Token token=" + LeapSRPSession.getToken());