Add PresenceTypeFilter
Use '==' in (IQ|Message|Presence)TypeFilter

instead of 'equals()'
Use switch-case for Presence.getType()