diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-22 20:19:58 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-22 20:19:58 +0100 |
| commit | a0d0ed34ae38f2377fdb3ad2c661b74b85f2df28 (patch) | |
| tree | 14e3755a0491c00f4ff125d02969ba5389659a8b /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | c20d8ac69eeade4d5337d958ada7910db0c6d3a0 (diff) | |
turned muc errors into enum. added error codes for service shutdown
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index b836e780a..24a728f7d 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1824,9 +1824,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa fetchConferenceConfiguration(conversation); } }); - + updateConversationUi(); } else { account.pendingConferenceJoins.add(conversation); + conversation.resetMucOptions(); + updateConversationUi(); } } |