diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-29 03:19:07 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-29 03:19:07 +0100 |
| commit | f3352afc0b3e6c509863479f44d8427f44f7d0ba (patch) | |
| tree | ca780c59d30b67799a84b18c29a8f9fd53db1c6c /src | |
| parent | ebeaf64b7a337d8e654abf97432cee8613bc6d29 (diff) | |
| parent | 975180694ea18561ec82c5e56c1bb5950fe793af (diff) | |
Merge branch 'develop' into release-0.5.1
Diffstat (limited to 'src')
| -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();
}
|