android client code updated