From d813e8129bec0299d161cbbe035c303f1a1b63c1 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 5 Dec 2018 13:59:35 +0100 Subject: [PATCH] Prevent crash --- app/src/main/java/eu/faircode/email/ActivityView.java | 4 ++-- app/src/main/java/eu/faircode/email/Helper.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 275e3c70d8..01da7cdd7c 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -560,9 +560,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB draft.getAvatar(context); draft.id = db.message().insertMessage(draft); draft.write(context, body); - } - EntityOperation.queue(db, draft, EntityOperation.ADD); + EntityOperation.queue(db, draft, EntityOperation.ADD); + } db.setTransactionSuccessful(); } finally { diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 41cc72130c..f520229024 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -215,16 +215,16 @@ public class Helper { draft.getAvatar(context); draft.id = db.message().insertMessage(draft); draft.write(context, body); - } - EntityOperation.queue(db, draft, EntityOperation.ADD); + EntityOperation.queue(db, draft, EntityOperation.ADD); + } db.setTransactionSuccessful(); } finally { db.endTransaction(); } - return draft.id; + return (draft == null ? null : draft.id); } @Override