Prevent crash

5 years ago · df2005dfc1
parent 454f113478
commit df2005dfc1
1 changed files with 5 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@ -3674,6 +3674,11 @@ public class FragmentCompose extends FragmentBase {
            db.message().liveMessage(id).observe(getViewLifecycleOwner(), new Observer<TupleMessageEx>() {
                @Override
                public void onChanged(TupleMessageEx draft) {
+                    if (draft == null) {
+                        dismiss();
+                        return;
+                    }
+
                    int plus = (draft.cc == null ? 0 : draft.cc.length) +
                            (draft.bcc == null ? 0 : draft.bcc.length);
                    tvTo.setText(MessageHelper.formatAddressesShort(draft.to) + (plus > 0 ? " +" + plus : ""));