aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/services
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-02-22 20:15:37 +0100
committerChristian Schneppe <christian@pix-art.de>2017-02-22 20:49:04 +0100
commit13222d1b6a326b8477f2b80bfe583e41b2e33686 (patch)
tree4e9111e3b21b6fa51db278033233d038843797a3 /src/main/java/de/pixart/messenger/services
parent696a54b5f286679d7b77e47c1fedcff0f3c4e259 (diff)
npe checks
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java5
1 files changed, 4 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 43aa7c292..7736aa0ba 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3163,7 +3163,10 @@ public class XmppConnectionService extends Service {
disconnect(account, force || account.getTrueStatus().isError() || !hasInternet);
account.getRoster().clearPresences();
connection.resetEverything();
- account.getAxolotlService().resetBrokenness();
+ final AxolotlService axolotlService = account.getAxolotlService();
+ if (axolotlService != null) {
+ axolotlService.resetBrokenness();
+ }
if (!hasInternet) {
account.setStatus(Account.State.NO_INTERNET);
}