Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Make java version android-friendly #162

Merged
merged 3 commits into from
Apr 14, 2015
Merged

Make java version android-friendly #162

merged 3 commits into from
Apr 14, 2015

Conversation

felixhack
Copy link
Contributor

  • Replace gson with org.json.JSONObject api. Note that android includes org.json in the framework, so if deploying keyczar to android don't bundle org.json. Deleted unused fields and methods on some enums. In general, I tried to be forgiving while converting objects to JSON (as that's how toString() is often implemented, which should not crash since we need that for debugging), but strict while parsing JSON.
  • Remove all java logging.

Tests still pass. :-)

Note: previously, errors during JSON parsing threw unchecked gson exceptions. Now we throw RuntimeExceptions wrapping checked JSONException.

I don't know how to test Eclipse/Maven project integration.

- Replace gson with org.json.JSONObject api. Note that android includes org.json in the framework, so if deploying keyczar to android don't bundle the org.json lib.

- Remove all java logging.

Previously, errors during JSON parsing threw unchecked gson exceptions. Now we throw RuntimeExceptions wrapping checked JSONException.
- Replace gson with org.json.JSONObject api. Note that android includes org.json in the framework, so if deploying keyczar to android don't bundle the org.json lib.

- Remove all java logging.

Previously, errors during JSON parsing threw unchecked gson exceptions. Now we throw RuntimeExceptions wrapping checked JSONException.
divegeek added a commit that referenced this pull request Apr 14, 2015
Make java version android-friendly
@divegeek divegeek merged commit af5ed5e into google:master Apr 14, 2015
@felixhack felixhack deleted the work branch April 14, 2015 20:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants