For 1 we should leave the old implementation as an option. Not having your activity die during log in is a good feature and the dialog is the easiest way I can think of it and it keeps it from being a breaking change.

I think 2 will work as well, but I am less fond of it. I tried somethign similar when working on the authz library, but I don't remember why I ultimately didn't like it.