From e7a0040ec5423c92128f394d0655cbfa5889082e Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 11 Jul 2014 13:52:27 +0200 Subject: fixed #255 and made some other improvements to the subscription mgmt --- src/eu/siacs/conversations/entities/Contact.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/eu/siacs/conversations/entities') diff --git a/src/eu/siacs/conversations/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java index 248d41b7..a0f77f7c 100644 --- a/src/eu/siacs/conversations/entities/Contact.java +++ b/src/eu/siacs/conversations/entities/Contact.java @@ -272,9 +272,11 @@ public class Contact implements ListItem { } else if (subscription.equals("from")) { this.resetOption(Contact.Options.TO); this.setOption(Contact.Options.FROM); + this.resetOption(Contact.Options.PREEMPTIVE_GRANT); } else if (subscription.equals("both")) { this.setOption(Contact.Options.TO); this.setOption(Contact.Options.FROM); + this.resetOption(Contact.Options.PREEMPTIVE_GRANT); } else if (subscription.equals("none")) { this.resetOption(Contact.Options.FROM); this.resetOption(Contact.Options.TO); -- cgit v1.2.3