diff options
author | cyBerta <cyberta@riseup.net> | 2022-08-07 18:05:20 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2022-08-07 18:05:20 +0200 |
commit | a457170cf50138104b5215d8affae0bc9874867c (patch) | |
tree | 90ab7bf0333d98ca477e22f532297b57858dccc8 /app/src/main/java/se/leap/bitmaskclient/providersetup/activities | |
parent | cc354bc34d4c801242eee89a416b088934f9935c (diff) |
set riseup's main_url to black.riseup.net while still showing riseup.net as domain in the UI
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup/activities')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/activities/CustomProviderSetupActivity.java | 6 |
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); |