diff options
| author | lookshe <github@lookshe.org> | 2016-03-22 00:16:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-22 00:16:54 +0100 |
| commit | c0267bb8f6cdbea4f4b42488b79a15a235dcf977 (patch) | |
| tree | 73c047e1bffe620988610e3a4326179caa5e49fc /src/main/java/de | |
| parent | 47b982524e21ac3a58d742092943eef3e8edb7e1 (diff) | |
Fixes FS#87 - Crash on load messages after delete account
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java index 3678288d..943c8dff 100644 --- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java @@ -1271,7 +1271,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa callback.onMoreMessagesLoaded(0, conversation); } } else { - Logging.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + " more messages left on server, mam " + ((account.getXmppConnection().getFeatures().mam()) ? "" : "not") + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + " online or connected)"); + Logging.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + + " more messages left on server, mam " + + ((account.isOnlineAndConnected() && account.getXmppConnection().getFeatures().mam()) ? "" : "not") + + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + + " online or connected)"); callback.onMoreMessagesLoaded(0, conversation); callback.informUser(R.string.no_more_history_on_server); } |