Done for iOS, still need to change java file