refactor of adapter - scope issue fix
Android fixes - ensures oAuth token is read at proper stage
update