From 904f839305bf63ea1f9704e4c3de1ae2ba455b99 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 31 Jan 2022 23:49:49 +0100 Subject: ignore ProviderApiManager test case for insecure flavor --- .../test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/src') diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java index 4b523edb..31d6ae89 100644 --- a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java +++ b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java @@ -439,7 +439,9 @@ public class ProviderApiManagerTest { @Test public void test_handleIntentSetupProvider_preseededCustomProviderAndCA_failedConfiguration() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException { - + if ("insecure".equals(BuildConfig.FLAVOR_implementation )) { + return; + } Provider provider = getConfiguredProvider(); mockProviderApiConnector(ERROR_CASE_MICONFIGURED_PROVIDER); -- cgit v1.2.3 From 43d997abba66cbf8ea6d78af75f6275cdb8c3157 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 31 Jan 2022 23:50:30 +0100 Subject: add missing import in DownloadNotificationManager --- .../se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java | 1 + 1 file changed, 1 insertion(+) (limited to 'app/src') diff --git a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java index 939ed852..e7e871fd 100644 --- a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java +++ b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java @@ -23,6 +23,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.os.Build; import androidx.annotation.NonNull; -- cgit v1.2.3 From 30cedf1f95f4f430ddc378d963e8cd46c1bd0903 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 31 Jan 2022 23:50:52 +0100 Subject: fix insecure builds --- .../se/leap/bitmaskclient/providersetup/ProviderApiManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/src') diff --git a/app/src/insecure/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java b/app/src/insecure/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java index dfb5346b..221871ef 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java +++ b/app/src/insecure/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java @@ -69,6 +69,7 @@ import static se.leap.bitmaskclient.base.utils.ConfigHelper.getProviderFormatted import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS; import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CERTIFICATE_PINNING; import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CORRUPTED_PROVIDER_JSON; +import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort; /** * Created by cyberta on 04.01.18. @@ -325,7 +326,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { String responseString; JSONObject errorJson = new JSONObject(); - OkHttpClient okHttpClient = clientGenerator.initCommercialCAHttpClient(errorJson); + OkHttpClient okHttpClient = clientGenerator.initCommercialCAHttpClient(errorJson, getProxyPort()); if (okHttpClient == null) { return errorJson.toString(); } @@ -360,7 +361,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { private String downloadFromUrlWithProviderCA(String urlString, Provider provider, boolean dangerOn) { String responseString; JSONObject errorJson = new JSONObject(); - OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), errorJson); + OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), errorJson); if (okHttpClient == null) { return errorJson.toString(); } @@ -395,7 +396,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { JSONObject initError = new JSONObject(); String responseString; - OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, initError); + OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, getProxyPort(), initError); if (okHttpClient == null) { return initError.toString(); } -- cgit v1.2.3