msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Prevent NPE

Browse Source
pull/215/head
M66B 8 months ago
parent 2aaa3e96d4
commit 458997e4fa
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -1815,21 +1815,24 @@ 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));
for (Message imessage : imessages) List<Message> imove = new ArrayList<>();
if (imessage instanceof GmailMessage) if (imessages != null)
try { for (Message imessage : imessages)
String[] labels = ((GmailMessage) imessage).getLabels(); if (imessage instanceof GmailMessage)
for (String label : labels) try {
if (!folders.containsKey(label)) { imove.add(imessage);
EntityFolder f = db.folder().getFolderByName(account.id, label); String[] labels = ((GmailMessage) imessage).getLabels();
if (f != null) for (String label : labels)
folders.put(f.name, f.id); if (!folders.containsKey(label)) {
} EntityFolder f = db.folder().getFolderByName(account.id, label);
} catch (Throwable ex) { if (f != null)
Log.e(ex); 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); itrash.open(READ_WRITE);
try { try {

Write Preview
Loading…
Cancel
Save