diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-03-11 12:08:30 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-03-11 20:14:57 +0100 |
| commit | 3e932930713e1dfaf141878dfb6dea8fea23ab7a (patch) | |
| tree | cf69f4ef2f0c364624f58216f11d8a7af00de328 /src/main/java/de/pixart/messenger/services | |
| parent | 4980a39d8c8c250e3559926ee4f0034ec9d86e6f (diff) | |
send and parse Chat States to and from conferences
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index a97a0d78b..48c816f03 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -2239,7 +2239,11 @@ public class XmppConnectionService extends Service { private void switchToForeground() { final boolean broadcastLastActivity = broadcastLastActivity(); for (Conversation conversation : getConversations()) { - conversation.setIncomingChatState(ChatState.ACTIVE); + if (conversation.getMode() == Conversation.MODE_MULTI) { + conversation.getMucOptions().resetChatState(); + } else { + conversation.setIncomingChatState(Config.DEFAULT_CHATSTATE); + } } for (Account account : getAccounts()) { if (account.getStatus() == Account.State.ONLINE) { |