corresponding changes with uniqush/uniqush-client-java#3