This patch would be simpler if you kept the function signature the same and just modified the data object you're passing to the activity.  Please favor the more minimal change.