Refactor SwrveGcmIntentService