diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-11-19 18:02:43 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-11-19 18:02:43 +0100 |
| commit | f52bc57e04f573e3a6ecda0d763f221b0eab5fb9 (patch) | |
| tree | c89c4a2b08c2b33b0dccfb7124e919e4f529f9d8 | |
| parent | a28b1b8514f116e7053b553b80c10c22676b45d8 (diff) | |
Successfully rebased onto 0.2.2
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 14 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/Dashboard.java | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index 0e44dd04..267fcd42 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -141,10 +141,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)){
@@ -156,15 +152,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);
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index dab8742a..2f4c78a0 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -103,7 +103,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf protected void onActivityResult(int requestCode, int resultCode, Intent data){ if ( requestCode == CONFIGURE_LEAP ) { if ( resultCode == RESULT_OK){ - ConfigHelper.saveSharedPref(EIP.AUTHED, authed_eip); + ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip); startService( new Intent(EIP.ACTION_UPDATE_EIP_SERVICE) ); buildDashboard(); if(data != null && data.hasExtra(LogInDialog.VERB)) { |