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;