Changed the id-based signatures in the listener to uri-based

For whatever reason, the very same code that didn't seem to work
at work, works just fine on the emulator at home. I'm tempted to
try it out on the tablet. It's getting late.