android-client refactiring