diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-10-03 11:23:29 +0200 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-11-13 17:14:52 -0800 |
| commit | cc794fbbb09b2ff9fdcaaf199dbaa4816a92df87 (patch) | |
| tree | 18239a3067ebb1f6f1bec4fe891c7059167a55d5 | |
| parent | 077524b41aab453ea5895eff4bc394fec7430671 (diff) | |
Fixed a typo in the rebase.
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 1 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderAPI.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index 92e637b8..c03d7c9e 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -145,7 +145,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn }
else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_JSON_FILES) {
//Toast.makeText(getApplicationContext(), R.string.incorrectly_downloaded_json_files_message, Toast.LENGTH_LONG).show(); - mProgressDialog.dismiss(); String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);
showDownloadFailedDialog(getCurrentFocus(), reason_to_fail); setResult(RESULT_CANCELED, mConfigState);
diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java index f0938310..1408efc8 100644 --- a/src/se/leap/bitmaskclient/ProviderAPI.java +++ b/src/se/leap/bitmaskclient/ProviderAPI.java @@ -517,7 +517,7 @@ public class ProviderAPI extends IntentService { if(provider_json.has(ERRORS)) { String reason_to_fail = provider_json.getString(ERRORS); result.putString(ERRORS, reason_to_fail); - result.putBoolean(ERRORS, false); + result.putBoolean(RESULT_KEY, false); } else { ConfigHelper.saveSharedPref(Provider.KEY, provider_json); ConfigHelper.saveSharedPref(ProviderItem.DANGER_ON, danger_on); @@ -533,6 +533,7 @@ public class ProviderAPI extends IntentService { } } catch (JSONException e) { result.putBoolean(RESULT_KEY, false); + result.putString(ERRORS, "Corrupt download"); } return result; |