mirror of
https://github.com/M66B/FairEmail.git
synced 2025-03-01 01:06:11 +00:00
Prevent NPE
This commit is contained in:
parent
2aaa3e96d4
commit
458997e4fa
1 changed files with 17 additions and 14 deletions
|
@ -1815,9 +1815,12 @@ class Core {
|
|||
IMAPFolder itrash = (IMAPFolder) istore.getFolder(trash.name);
|
||||
Message[] imessages = ifolder.getMessagesByUID(Helper.toLongArray(uids));
|
||||
|
||||
List<Message> imove = new ArrayList<>();
|
||||
if (imessages != null)
|
||||
for (Message imessage : imessages)
|
||||
if (imessage instanceof GmailMessage)
|
||||
try {
|
||||
imove.add(imessage);
|
||||
String[] labels = ((GmailMessage) imessage).getLabels();
|
||||
for (String label : labels)
|
||||
if (!folders.containsKey(label)) {
|
||||
|
@ -1829,7 +1832,7 @@ class Core {
|
|||
Log.e(ex);
|
||||
}
|
||||
|
||||
ifolder.moveMessages(imessages, itrash);
|
||||
ifolder.moveMessages(imove.toArray(new Message[0]), itrash);
|
||||
|
||||
itrash.open(READ_WRITE);
|
||||
try {
|
||||
|
|
Loading…
Reference in a new issue