diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
| commit | f2c1a80059af89caeb299a5cc02c401da6b4b138 (patch) | |
| tree | c868409a94abdee41313e4509c8625701bfdd4ff /src/eu/siacs/conversations/parser/PresenceParser.java | |
| parent | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (diff) | |
| parent | 7b4f3637db8c99d84fe3c825d583bfc0fa91fada (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/parser/PresenceParser.java')
| -rw-r--r-- | src/eu/siacs/conversations/parser/PresenceParser.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java index 2c3a7dbc..4e90cda8 100644 --- a/src/eu/siacs/conversations/parser/PresenceParser.java +++ b/src/eu/siacs/conversations/parser/PresenceParser.java @@ -29,6 +29,7 @@ public class PresenceParser extends AbstractParser implements if (before != muc.getMucOptions().online()) { mXmppConnectionService.updateConversationUi(); } + mXmppConnectionService.getAvatarService().clear(muc); } } else if (packet.hasChild("x", "http://jabber.org/protocol/muc")) { Conversation muc = mXmppConnectionService.find(account, packet @@ -39,6 +40,7 @@ public class PresenceParser extends AbstractParser implements if (before != muc.getMucOptions().online()) { mXmppConnectionService.updateConversationUi(); } + mXmppConnectionService.getAvatarService().clear(muc); } } } @@ -58,8 +60,7 @@ public class PresenceParser extends AbstractParser implements Presences.parseShow(packet.findChild("show"))); } else if (type.equals("unavailable")) { account.removePresence(fromParts[1]); - mXmppConnectionService.getNotificationService() - .deactivateGracePeriod(); + account.deactivateGracePeriod(); } } } else { |