diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-09 23:08:40 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-09 23:08:40 +0200 |
| commit | c6f9b23def1684acd754e3db6712a7a5efbd5b42 (patch) | |
| tree | 37a35eaa8bc84bc329bb27a1161c241a5509a9fb | |
| parent | 47105a677a31dc312c288d8e40fc8d2c9e038df7 (diff) | |
fixed npes
| -rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 3 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java index 60afaa5de..b4c99dc1a 100644 --- a/src/eu/siacs/conversations/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -139,6 +139,9 @@ public class Conversation extends AbstractEntity { } public String getLatestMarkableMessageId() { + if (this.messages == null) { + return null; + } for(int i = this.messages.size() - 1; i >= 0; --i) { if (this.messages.get(i).getStatus() <= Message.STATUS_RECEIVED && this.messages.get(i).markable) { if (this.messages.get(i).isRead()) { diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 5aca9ce32..e6297f4ff 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -517,7 +517,8 @@ public class XmppConnectionService extends Service { MessagePacket packet = null; boolean saveInDb = true; boolean send = false; - if (account.getStatus() == Account.STATUS_ONLINE) { + if (account.getStatus() == Account.STATUS_ONLINE + && account.getXmppConnection() != null) { if (message.getType() == Message.TYPE_IMAGE) { if (message.getPresence() != null) { if (message.getEncryption() == Message.ENCRYPTION_OTR) { @@ -567,6 +568,10 @@ public class XmppConnectionService extends Service { send = true; } } + if (!account.getXmppConnection().getFeatures().sm() + && conv.getMode() != Conversation.MODE_MULTI) { + message.setStatus(Message.STATUS_SEND); + } } else { message.setStatus(Message.STATUS_WAITING); if (message.getType() == Message.TYPE_TEXT) { @@ -592,10 +597,6 @@ public class XmppConnectionService extends Service { } conv.getMessages().add(message); - if (!account.getXmppConnection().getFeatures().sm() - && conv.getMode() != Conversation.MODE_MULTI) { - message.setStatus(Message.STATUS_SEND); - } if (saveInDb) { if (message.getEncryption() == Message.ENCRYPTION_NONE || saveEncryptedMessages()) { |