Fix dronie NPE

and other small fixes
I fixed the break statements on https://github.com/squilter/droidplanner/commit/d0aced12793dcdfb69c887491a2cfb650b370c6f