diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-11 13:52:27 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-11 13:52:27 +0200 |
| commit | e7a0040ec5423c92128f394d0655cbfa5889082e (patch) | |
| tree | be7f9c46438db62a01c43ed6a48f5525a2cea36d /src/eu/siacs/conversations/entities | |
| parent | 8ebd14cef4e140b6873155de7dbfb66d91711ead (diff) | |
fixed #255 and made some other improvements to the subscription mgmt
Diffstat (limited to 'src/eu/siacs/conversations/entities')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Contact.java | 2 |
1 files changed, 2 insertions, 0 deletions
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); |