[DEV] rework android