Refactored Android app to support new API
Added some preliminary error handling