diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 21:42:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 21:42:48 +0200 |
| commit | c32df497c0675c75c15f5bf0f5cdca08d2379d5c (patch) | |
| tree | e90d1411473ee505e58e99257e0e974cb734bd70 /src/main | |
| parent | c69ad3f6d245910d3af38bb2545cc13e9c296069 (diff) | |
| parent | 45cc33ca36566ed05691a7bf06cf42193e9a6c5e (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 9d44f20d5..b50b8eec7 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1790,6 +1790,7 @@ public class XmppConnectionService extends Service { } for (Account account : getAccounts()) { if (account.getStatus() == Account.State.ONLINE) { + account.deactivateGracePeriod(); XmppConnection connection = account.getXmppConnection(); if (connection != null && connection.getFeatures().csi()) { connection.sendActive(); |