This should be handled in the Adapter .. maybe we can use the Adapter directly as the listener.