Working Android :D

Updated location code