mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 01:06:11 +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

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

@ -1815,21 +1815,24 @@ class Core {
IMAPFolder itrash = (IMAPFolder) istore.getFolder(trash.name);
Message[] imessages = ifolder.getMessagesByUID(Helper.toLongArray(uids));
for (Message imessage : imessages)
if (imessage instanceof GmailMessage)
try {
String[] labels = ((GmailMessage) imessage).getLabels();
for (String label : labels)
if (!folders.containsKey(label)) {
EntityFolder f = db.folder().getFolderByName(account.id, label);
if (f != null)
folders.put(f.name, f.id);
}
} catch (Throwable ex) {
Log.e(ex);
}
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)) {
EntityFolder f = db.folder().getFolderByName(account.id, label);
if (f != null)
folders.put(f.name, f.id);
}
} catch (Throwable ex) {
Log.e(ex);
}
ifolder.moveMessages(imessages, itrash);
ifolder.moveMessages(imove.toArray(new Message[0]), itrash);
itrash.open(READ_WRITE);
try {