Handle uid not found

4 years ago · 9c13f2d97f
parent e6f7063dd9
commit 9c13f2d97f
1 changed files with 4 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -752,6 +752,8 @@ class Core {
            if (imessages != null && imessages.length > 0)
                try {
                    Message imessage = ifolder.getMessageByUID(message.uid);
+                    if (imessage == null)
+                        throw new MessageRemovedException();
                    imessage.setFlag(Flags.Flag.DELETED, true);
                    ifolder.expunge();
                } catch (MessagingException ex) {
@ -1032,6 +1034,8 @@ class Core {
                            if (uid != null) {
                                if (draft) {
                                    Message icopy = itarget.getMessageByUID(uid);
+                                    if (icopy == null)
+                                        continue;

                                    // Mark read
                                    if (seen && !icopy.isSet(Flags.Flag.SEEN) && flags.contains(Flags.Flag.SEEN))