Prevent rare NPE

master
M66B 2 months ago
parent 77aa54bd4e
commit 1a65df8d28

@ -1901,11 +1901,12 @@ class Core {
itrash.open(READ_WRITE); itrash.open(READ_WRITE);
try { try {
List<Message> trashed = new ArrayList<>(); List<Message> trashed = new ArrayList<>();
for (EntityMessage message : messages) { for (EntityMessage message : messages)
Message[] itrashed = itrash.search(new MessageIDTerm(message.msgid)); if (!TextUtils.isEmpty(message.msgid)) {
if (itrashed != null && itrashed.length == 1) Message[] itrashed = itrash.search(new MessageIDTerm(message.msgid));
trashed.add(itrashed[0]); if (itrashed != null && itrashed.length == 1)
} trashed.add(itrashed[0]);
}
itrash.setFlags(trashed.toArray(new Message[0]), new Flags(Flags.Flag.DELETED), true); itrash.setFlags(trashed.toArray(new Message[0]), new Flags(Flags.Flag.DELETED), true);
if (perform_expunge) if (perform_expunge)

Loading…
Cancel
Save