mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 09:16:00 +00:00
Code Issues Releases Wiki Activity

Prevent NPE

Browse source
This commit is contained in:
M66B 2024-07-28 09:47:51 +02:00
parent 2aaa3e96d4
commit 458997e4fa
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/Core.java
View file

@ -1815,9 +1815,12 @@ class Core {
IMAPFolder itrash = (IMAPFolder) istore.getFolder(trash.name); IMAPFolder itrash = (IMAPFolder) istore.getFolder(trash.name);
Message[] imessages = ifolder.getMessagesByUID(Helper.toLongArray(uids)); Message[] imessages = ifolder.getMessagesByUID(Helper.toLongArray(uids));
List<Message> imove = new ArrayList<>();
if (imessages != null)
for (Message imessage : imessages) for (Message imessage : imessages)
if (imessage instanceof GmailMessage) if (imessage instanceof GmailMessage)
try { try {
imove.add(imessage);
String[] labels = ((GmailMessage) imessage).getLabels(); String[] labels = ((GmailMessage) imessage).getLabels();
for (String label : labels) for (String label : labels)
if (!folders.containsKey(label)) { if (!folders.containsKey(label)) {
@ -1829,7 +1832,7 @@ class Core {
Log.e(ex); Log.e(ex);
} }
ifolder.moveMessages(imessages, itrash); ifolder.moveMessages(imove.toArray(new Message[0]), itrash);
itrash.open(READ_WRITE); itrash.open(READ_WRITE);
try { try {