diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
commit | 7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch) | |
tree | bdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java | |
parent | ce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff) | |
parent | 9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff) |
Merge branch '#8886_add_provider' into 'master'
#8886 add provider
See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java')
-rw-r--r-- | app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java index cf1d1aa6..172c9e61 100644 --- a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java +++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -39,34 +39,18 @@ public class ProviderListActivity extends ProviderListBaseActivity { setUpProvider(); } - @Override - public void showAndSelectProvider(String provider_main_url) { - try { - provider = new Provider(new URL((provider_main_url))); - autoSelectProvider(provider); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - - private void autoSelectProvider(Provider provider) { - this.provider = provider; - onItemSelectedLogic(); - showProgressBar(); - } - /** * Asks ProviderAPI to download a new provider.json file * */ public void setUpProvider() { - mConfigState.setAction(SETTING_UP_PROVIDER); + configState.setAction(SETTING_UP_PROVIDER); ProviderAPICommand.execute(this, SET_UP_PROVIDER, provider); } @Override public void retrySetUpProvider(@NonNull Provider provider) { - mConfigState.setAction(SETTING_UP_PROVIDER); + configState.setAction(SETTING_UP_PROVIDER); ProviderAPICommand.execute(this, SET_UP_PROVIDER, provider); } |