Rejigged logic for ios7/8 notification differences