diff options
| author | Christian S <christian@pix-art.de> | 2016-04-07 20:24:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-07 20:24:29 +0200 |
| commit | 6291c64dd743e36539d06a0dbc242a25475989f9 (patch) | |
| tree | 807c79fc6f1752edebd144531d54ac11f9100ba9 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 9317ea212cbf4f1bd739ed37c7702b52791c11a5 (diff) | |
| parent | ecaf75e5ecf785dbe83a4d1ec5f9a76d22e688ad (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
| -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 669178324..878b4334f 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2581,6 +2581,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa disconnect(account, force); account.getRoster().clearPresences(); connection.resetEverything(); + account.getAxolotlService().resetBrokenness(); } } } |