My app is mostly just an edited ripoff of the standard one but I’d agree the timing stuff is useless. If you’re having update problems, maybe take a look at my device type first.
EDIT: I decided to edit it quite a bit to rip all of that out to avoid confusion and then combined in a couple things from yours that I liked.