Update android code
Change switches case to else if.