summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java3
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java
index a4b3e491..1783135d 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java
@@ -67,7 +67,6 @@ public class ProviderApiManager extends ProviderApiManagerBase {
*/
@Override
protected Bundle setUpProvider(Provider provider, Bundle task) {
- int progress = 0;
Bundle currentDownload = new Bundle();
if (isEmpty(provider.getMainUrlString()) || provider.getMainUrl().isDefault()) {
@@ -260,7 +259,7 @@ public class ProviderApiManager extends ProviderApiManagerBase {
String responseString;
JSONObject errorJson = new JSONObject();
String baseUrl = getApiUrl(providerDefinition);
- OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(errorJson, caCert);
+ OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, errorJson);
if (okHttpClient == null) {
return errorJson.toString();
}
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java
index 67c04f13..2df0ffa1 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java
@@ -18,6 +18,7 @@ package se.leap.bitmaskclient;
import android.content.Intent;
import android.os.Bundle;
+import android.support.annotation.NonNull;
import java.net.MalformedURLException;
import java.net.URL;
@@ -67,7 +68,7 @@ public class ProviderListActivity extends ProviderListBaseActivity {
}
@Override
- public void retrySetUpProvider(Provider provider) {
+ public void retrySetUpProvider(@NonNull Provider provider) {
cancelSettingUpProvider();
if (!provider.hasCaCert()) {
addAndSelectNewProvider(provider.getMainUrlString());