I'm okay with leaving this in, however I still think this should be handled by the method that launches the app, similar to how you had it before.