summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2025-03-27 02:54:16 +0100
committercyBerta <cyberta@riseup.net>2025-03-27 02:57:24 +0100
commit495252b807bbf2d5e27ed7f3d86e6ba571eeb391 (patch)
treebcbb4aa1d86528aebe9678ab741c84eaf4528056 /app/src/main/java
parent2640a2e5b7da2c308033a433ed5c8df0b3f7229c (diff)
fix updateServiceInfo() in v5, ensure the authentication token is used (if available) when fetching bridges or gateways
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
index d5640126..71394eda 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
@@ -130,12 +130,21 @@ public class ProviderApiManagerV5 extends ProviderApiManagerBase implements IPro
return eventSender.setErrorResult(currentDownload, R.string.config_error_found, null);
}
+ try {
+ if (provider.hasIntroducer()) {
+ bm.setIntroducer(provider.getIntroducer().toUrl());
+ }
+ } catch (Exception e) {
+ return eventSender.setErrorResult(currentDownload, R.string.config_error_found, null);
+ }
+
if (PreferenceHelper.getUseBridges()) {
try {
String bridgesJson = bm.getAllBridges("", "", "", "");
provider.setBridges(bridgesJson);
} catch (Exception e) {
// TODO: send failed to fetch bridges event
+ return eventSender.setErrorResult(currentDownload, R.string.config_error_found, null);
}
} else {
try {
@@ -147,7 +156,7 @@ public class ProviderApiManagerV5 extends ProviderApiManagerBase implements IPro
}
}
-
+ currentDownload.putBoolean(BROADCAST_RESULT_KEY, true);
return currentDownload;
}