diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
| commit | 31e0ee7819ff6e852bc40f66858f0ac02659bf04 (patch) | |
| tree | 85969d750a2473a95603e07f256681ca46c746cd /src/se/leap/bitmaskclient/ConfigurationWizard.java | |
| parent | 8bc035e5785b8a14c26cdb6ab409242b66554992 (diff) | |
| parent | c500f60c9188c938b550b8741ca9a4f4939429e4 (diff) | |
Merge branch 'feature/token-based-auth' into develop
Conflicts:
src/se/leap/bitmaskclient/ConfigurationWizard.java
src/se/leap/bitmaskclient/Dashboard.java
src/se/leap/bitmaskclient/ProviderAPI.java
src/se/leap/bitmaskclient/ProviderListFragment.java
Diffstat (limited to 'src/se/leap/bitmaskclient/ConfigurationWizard.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index a4d8599f..694dbf7c 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -189,9 +189,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn // resetOldConnection();
ProviderItem selected_provider = getProvider(id);
int provider_index = getProviderIndex(id);
- startProgressBar(provider_index);
- provider_list_fragment.hideAllBut(provider_index); - setUpProvider(selected_provider.providerMainUrl(), true); + startProgressBar(provider_index); + provider_list_fragment.hideAllBut(provider_index);
+ setUpProvider(selected_provider.providerMainUrl(), true);
}
@Override
|