Merge branch 'bugfix_branch' into 'master'

Bugfixes and more

Closes #9110

See merge request leap/bitmask_android!205

1 files changed, 4 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/CustomProviderSetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/CustomProviderSetupActivity.java
index b90d14f8..0fff1ee2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/CustomProviderSetupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/CustomProviderSetupActivity.java
@@ -31,6 +31,7 @@ import java.io.IOException;
 import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.base.utils.ConfigHelper;
 import se.leap.bitmaskclient.providersetup.ProviderAPICommand;
 
 import static se.leap.bitmaskclient.BuildConfig.customProviderApiIp;
@@ -72,8 +73,9 @@ public class CustomProviderSetupActivity extends ProviderSetupBaseActivity {
         try {
             AssetManager assetsManager = getAssets();
             Provider customProvider = new Provider(customProviderUrl, geoipUrl, customProviderIp, customProviderApiIp);
-            String certificate = loadInputStreamAsString(assetsManager.open(customProvider.getDomain() + EXT_PEM));
-            String providerDefinition = loadInputStreamAsString(assetsManager.open(customProvider.getDomain() + EXT_JSON));
+            String domain = ConfigHelper.getDomainFromMainURL(customProviderUrl);
+            String certificate = loadInputStreamAsString(assetsManager.open(domain + EXT_PEM));
+            String providerDefinition = loadInputStreamAsString(assetsManager.open(domain + EXT_JSON));
             customProvider.setCaCert(certificate);
             customProvider.define(new JSONObject(providerDefinition));
             setProvider(customProvider);