From 1ac71c90812f7f5196ed38df2792001df7251005 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 29 Dec 2018 12:32:37 +0000 Subject: [PATCH] Prevent crash --- .../eu/faircode/email/FragmentMessages.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 9cd6792347..a195354fcc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1585,17 +1585,18 @@ public class FragmentMessages extends FragmentEx { try { db.beginTransaction(); - for (EntityMessage message : db.message().getMessageSeen(outbox)) { - EntityIdentity identity = db.identity().getIdentity(message.identity); - EntityFolder sent = db.folder().getFolderByType(identity.account, EntityFolder.SENT); - if (sent != null) { - message.folder = sent.id; - message.uid = null; - db.message().updateMessage(message); - Log.i("Appending sent msgid=" + message.msgid); - EntityOperation.queue(db, message, EntityOperation.ADD); // Could already exist + for (EntityMessage message : db.message().getMessageSeen(outbox)) + if (message.identity != null) { + EntityIdentity identity = db.identity().getIdentity(message.identity); + EntityFolder sent = db.folder().getFolderByType(identity.account, EntityFolder.SENT); + if (sent != null) { + message.folder = sent.id; + message.uid = null; + db.message().updateMessage(message); + Log.i("Appending sent msgid=" + message.msgid); + EntityOperation.queue(db, message, EntityOperation.ADD); // Could already exist + } } - } db.setTransactionSuccessful(); } finally {