diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-08 22:44:01 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-08 22:44:01 -0600 |
| commit | 8acc7febb78c5a6480aa0b326e9464592e792097 (patch) | |
| tree | c054c2ff90f0be4ed31cfcc32c9ac3d9ce28d2ec /src/se/leap/leapclient/Dashboard.java | |
| parent | 769344327d5cb16adbdc04db224ff6902b4a4771 (diff) | |
Fixed onPrepareOptionsMenu to not return prematurely.
Also implements ConfigHelper.getJsonFromSharedPref(), now
Diffstat (limited to 'src/se/leap/leapclient/Dashboard.java')
| -rw-r--r-- | src/se/leap/leapclient/Dashboard.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java index 6bdd74d2..f72af809 100644 --- a/src/se/leap/leapclient/Dashboard.java +++ b/src/se/leap/leapclient/Dashboard.java @@ -145,21 +145,19 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf @Override public boolean onPrepareOptionsMenu(Menu menu) { - String provider_json_string = ConfigHelper.getStringFromSharedPref(ConfigHelper.PROVIDER_KEY); + JSONObject provider_json; try { - JSONObject provider_json = new JSONObject(provider_json_string); + provider_json = ConfigHelper.getJsonFromSharedPref(ConfigHelper.PROVIDER_KEY); JSONObject service_description = provider_json.getJSONObject(ConfigHelper.SERVICE_KEY); if(service_description.getBoolean(ConfigHelper.ALLOW_REGISTRATION_KEY)) { menu.findItem(R.id.login_button).setVisible(true); menu.findItem(R.id.logout_button).setVisible(true); - return true; } } catch (JSONException e) { - menu.findItem(R.id.login_button).setVisible(false); - menu.findItem(R.id.logout_button).setVisible(false); - return false; - } - return false; + // TODO Auto-generated catch block + e.printStackTrace(); + } + return true; } @Override |