diff options
author | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
commit | a719b004a5159461b320cfbe808837708149f266 (patch) | |
tree | bc32fb50b59c415097804fd7bbdb296641310cde /app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java | |
parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
parent | 1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (diff) |
Merge branch '8826_custom_provider' into '0.9.8'
8826 custom provider
See merge request leap/bitmask_android!34
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java index cfc6e49d..8117fb99 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java @@ -163,12 +163,16 @@ public abstract class ProviderApiManagerBase { if (action.equals(UPDATE_PROVIDER_DETAILS)) { resetProviderDetails(); Bundle task = new Bundle(); - task.putString(MAIN_URL, lastProviderMainUrl); + String mainUrl = parameters.getString(Provider.MAIN_URL); + if (mainUrl == null) { + mainUrl = lastProviderMainUrl; + } + task.putString(MAIN_URL, mainUrl); Bundle result = setUpProvider(task); if (result.getBoolean(RESULT_KEY)) { - receiver.send(PROVIDER_OK, result); + sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result); } else { - receiver.send(PROVIDER_NOK, result); + sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result); } } else if (action.equalsIgnoreCase(SET_UP_PROVIDER)) { Bundle result = setUpProvider(parameters); @@ -222,7 +226,7 @@ public abstract class ProviderApiManagerBase { } else if (action.equalsIgnoreCase(PROVIDER_SET_UP)) { if(EIP_SERVICE_JSON_DOWNLOADED && CA_CERT_DOWNLOADED && PROVIDER_JSON_DOWNLOADED ) { if(receiver!= null) { - receiver.send(PROVIDER_OK, Bundle.EMPTY); + sendToReceiverOrBroadcast(receiver, PROVIDER_OK, Bundle.EMPTY); } } } |