[ANDROID] improve Batch listener