diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-17 11:01:38 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-17 11:01:38 +0200 |
| commit | 3372e50155ac16c9eabce9a484914c2acbf391c8 (patch) | |
| tree | ad00d1e203d0adf56f27a44cd4a9e12301ac41dc /src/eu/siacs/conversations/parser | |
| parent | 5e3caf962696d3fe39e7ce70274530aa4f77d134 (diff) | |
made grace period on a per account basis
Diffstat (limited to 'src/eu/siacs/conversations/parser')
| -rw-r--r-- | src/eu/siacs/conversations/parser/MessageParser.java | 6 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/parser/PresenceParser.java | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index 486dd3892..4090ed39b 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -417,8 +417,7 @@ public class MessageParser extends AbstractParser implements message = this.parseCarbonMessage(packet, account); if (message != null) { if (message.getStatus() == Message.STATUS_SEND) { - mXmppConnectionService.getNotificationService() - .activateGracePeriod(); + account.activateGracePeriod(); notify = false; mXmppConnectionService.markRead( message.getConversation(), false); @@ -440,8 +439,7 @@ public class MessageParser extends AbstractParser implements } else { mXmppConnectionService.markRead(message.getConversation(), false); - mXmppConnectionService.getNotificationService() - .activateGracePeriod(); + account.activateGracePeriod(); notify = false; } } diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java index 2c3a7dbcc..d54ddca0c 100644 --- a/src/eu/siacs/conversations/parser/PresenceParser.java +++ b/src/eu/siacs/conversations/parser/PresenceParser.java @@ -58,8 +58,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 { |