From 50c9d050f66c2a73443a37734d17a3b402e4fbdb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 17 Sep 2020 08:34:53 +0200
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 80d3736d56..d583af314a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2189,6 +2189,8 @@ public class FragmentCompose extends FragmentBase {
 
                 for (Uri uri : uris) {
                     EntityAttachment attachment = addAttachment(context, id, uri, image, resize, privacy);
+                    if (attachment == null)
+                        continue;
                     if (!image)
                         continue;
 
@@ -3089,6 +3091,9 @@ public class FragmentCompose extends FragmentBase {
             db.beginTransaction();
 
             EntityMessage draft = db.message().getMessage(id);
+            if (draft == null)
+                return null;
+
             Log.i("Attaching to id=" + id);
 
             attachment.message = draft.id;