Added the code for the Android client