Prevent crash

6 years ago · 375a97a724
parent c7aec6e727
commit 375a97a724
1 changed files with 6 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -574,8 +574,12 @@ class Core {
        if (TextUtils.isEmpty(message.msgid))
            if (message.uid == null)
                throw new IllegalArgumentException("Delete without ID");
-            else
-                imessages = new Message[]{ifolder.getMessageByUID(message.uid)};
+            else {
+                Message imessage = ifolder.getMessageByUID(message.uid);
+                if (imessage == null)
+                    throw new MessageRemovedException();
+                imessages = new Message[]{imessage};
+            }
        else
            imessages = ifolder.search(new MessageIDTerm(message.msgid));