Refactorings/Deprecations

[PhilKes]

• There are quite a few calls of deprecated startActivityForResult which should be replaced with registerForActivityResult (see Migrate startActivityForResult and other minor deprecations #89)
• Currently many of the Preferences values are passed as String which is quite hard to maintain, should convert them into Enums