Misc clean enh

Misc clean and little enh. or fixes.

SyncManage is not call in android as far as I remember, but I'm not sure it's even available at all. So please put back again the if android and just clean the desktop part :) (and if no SyncManager is call, you can remove the else: part too :D