diff options
author | cyberta <cyberta@riseup.net> | 2018-02-13 04:07:25 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-02-13 04:07:25 -0800 |
commit | 9b6c368a25510c462ea357121c97edb6d0310021 (patch) | |
tree | d8de88328853ad9955e7afad77ff115f55b05186 /app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java | |
parent | ba1d730c12a5168c3a261604e0efd3b77ba3ec5b (diff) | |
parent | b5483d9a799d89c99dc2389379c7cceb1e148110 (diff) |
Merge branch '8827_handle_switch_provider' into '0.9.8'
8827 handle switch provider
See merge request leap/bitmask_android!38
Diffstat (limited to 'app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java')
-rw-r--r-- | app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java index 8403b046..725ede3e 100644 --- a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java +++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -16,12 +16,13 @@ */ package se.leap.bitmaskclient; -import android.content.Intent; -import android.os.Bundle; +import android.support.annotation.NonNull; import java.net.MalformedURLException; import java.net.URL; +import static se.leap.bitmaskclient.ProviderAPI.SET_UP_PROVIDER; + /** * Activity that builds and shows the list of known available providers. * <p/> @@ -61,42 +62,12 @@ public class ProviderListActivity extends ProviderListBaseActivity { */ public void setUpProvider() { mConfigState.setAction(SETTING_UP_PROVIDER); - Intent providerApiCommand = new Intent(this, ProviderAPI.class); - Bundle parameters = new Bundle(); - parameters.putString(Provider.MAIN_URL, provider.getMainUrl().toString()); - if (provider.hasCertificatePin()){ - parameters.putString(Provider.CA_CERT_FINGERPRINT, provider.certificatePin()); - } - if (provider.hasCaCert()) { - parameters.putString(Provider.CA_CERT, provider.getCaCert()); - } - if (provider.hasDefinition()) { - parameters.putString(Provider.KEY, provider.getDefinition().toString()); - } - - providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER); - providerApiCommand.putExtra(ProviderAPI.PARAMETERS, parameters); - - startService(providerApiCommand); + ProviderAPICommand.execute(this, SET_UP_PROVIDER, provider); } @Override - public void retrySetUpProvider() { - cancelSettingUpProvider(); - if (!ProviderAPI.caCertDownloaded()) { - addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl()); - } else { - showProgressBar(); - - Intent providerApiCommand = new Intent(this, ProviderAPI.class); - providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER); - providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, providerAPIResultReceiver); - Bundle parameters = new Bundle(); - parameters.putString(Provider.MAIN_URL, provider.getMainUrl().toString()); - providerApiCommand.putExtra(ProviderAPI.PARAMETERS, parameters); - - startService(providerApiCommand); - } + public void retrySetUpProvider(@NonNull Provider provider) { + ProviderAPICommand.execute(this, SET_UP_PROVIDER, provider); } } |