diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
commit | a1ac4910f062ca8aca06e0468fffef751d3bb714 (patch) | |
tree | 392a31c3627b88107ea30f25488989dcaf7a6c70 /app/src/insecure/java/se/leap/bitmaskclient | |
parent | 1a25b1dea9ab2d7e76cd79e8928d27f855ca9f2a (diff) | |
parent | 298c33b94c8aada449c98a24cdb2c687af40cbbd (diff) |
Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_provider
Diffstat (limited to 'app/src/insecure/java/se/leap/bitmaskclient')
-rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java (renamed from app/src/insecure/java/se/leap/bitmaskclient/ConfigurationWizard.java) | 2 | ||||
-rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java index 6481c9f5..823b5635 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -34,7 +34,7 @@ import se.leap.bitmaskclient.ProviderListContent.ProviderItem; * @author parmegv * @author cyberta */ -public class ConfigurationWizard extends BaseConfigurationWizard { +public class ProviderListActivity extends ProviderListBaseActivity { @Override protected void onItemSelectedLogic() { diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java index c8dfc092..88e31c9a 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListContent.java +++ b/app/src/insecure/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 */ |