modify android client
improve android client