summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-01-28 17:45:28 +0100
committerFup Duck <fupduck@sacknagel.com>2018-01-28 17:45:28 +0100
commita1ac4910f062ca8aca06e0468fffef751d3bb714 (patch)
tree392a31c3627b88107ea30f25488989dcaf7a6c70 /app/src/production
parent1a25b1dea9ab2d7e76cd79e8928d27f855ca9f2a (diff)
parent298c33b94c8aada449c98a24cdb2c687af40cbbd (diff)
Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_provider
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java (renamed from app/src/production/java/se/leap/bitmaskclient/ConfigurationWizard.java)3
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java
index 4e16647a..8403b046 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java
@@ -30,7 +30,7 @@ import java.net.URL;
* @author parmegv
* @author cyberta
*/
-public class ConfigurationWizard extends BaseConfigurationWizard {
+public class ProviderListActivity extends ProviderListBaseActivity {
@Override
@@ -52,6 +52,7 @@ public class ConfigurationWizard extends BaseConfigurationWizard {
private void autoSelectProvider(Provider provider) {
this.provider = provider;
onItemSelectedLogic();
+ showProgressBar();
}
/**
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java
index 6466e769..d9e1d1a9 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListContent.java
@@ -20,7 +20,7 @@ import java.util.*;
import java.net.*;
/**
- * Models the provider list shown in the ConfigurationWizard.
+ * Models the provider list shown in the ProviderListActivity.
*
* @author parmegv
*/