diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-11-19 18:02:43 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-12-10 18:12:33 +0100 |
| commit | 6c586abf63ea033fbc24451748f7103f54816625 (patch) | |
| tree | 2d6d0c9d28f5ee3815d4fd083a264d67187c1a55 | |
| parent | 6c46af29a115f930e5efa2411c2dbdc08a0702fe (diff) | |
Successfully rebased onto 0.2.2
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index b35123b0..a4d8599f 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -142,10 +142,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn @Override
public void onReceiveResult(int resultCode, Bundle resultData) {
if(resultCode == ProviderAPI.PROVIDER_OK) {
- JSONObject provider_json;
- try {
- provider_json = new JSONObject(resultData.getString(Provider.KEY));
- boolean danger_on = resultData.getBoolean(ProviderItem.DANGER_ON);
mConfigState.setAction(PROVIDER_SET);
if (ConfigHelper.getBoolFromSharedPref(EIP.ALLOWED_ANON)){
@@ -157,15 +153,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn progressbar_description.setVisibility(TextView.GONE);
setResult(RESULT_OK);
showProviderDetails(getCurrentFocus());
- }
- } catch (JSONException e) {
- e.printStackTrace();
- mProgressBar.setVisibility(ProgressBar.GONE);
- progressbar_description.setVisibility(TextView.GONE);
- //refreshProviderList(0);
- //Toast.makeText(this, getResources().getString(R.string.config_error_parsing), Toast.LENGTH_LONG);
- setResult(RESULT_CANCELED, mConfigState);
- } + } } else if(resultCode == ProviderAPI.PROVIDER_NOK) {
//refreshProviderList(0); String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);
|