diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-29 03:16:38 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-29 03:16:38 +0100 |
| commit | 975180694ea18561ec82c5e56c1bb5950fe793af (patch) | |
| tree | 8c700caab8621acc19d12749aa060f96e0ccfce5 /src/se/leap | |
| parent | b816947d796bd30cfde0c326b568102c472e9445 (diff) | |
| parent | 6af3ab8a56bcb18ed6ebb15218aa647632e2a7f0 (diff) | |
Merge branch 'bug/cannot-configure-Calyx-nor-dev.bm-#5397' into develop
Diffstat (limited to 'src/se/leap')
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index 1c839389..e992c836 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -159,8 +159,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD mProgressBar.incrementProgressBy(1);
mProgressBar.setVisibility(ProgressBar.GONE);
progressbar_description.setVisibility(TextView.GONE);
- setResult(RESULT_OK);
- setting_up_provider = false; + setResult(RESULT_OK); showProviderDetails(getCurrentFocus());
} } else if(resultCode == ProviderAPI.PROVIDER_NOK) {
@@ -529,12 +528,14 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD Intent ask_login = new Intent();
ask_login.putExtra(LogInDialog.VERB, LogInDialog.VERB);
setResult(RESULT_OK, ask_login);
+ setting_up_provider = false;
finish();
}
@Override
public void use_anonymously() {
setResult(RESULT_OK);
+ setting_up_provider = false;
finish();
}
|