From 2bc462edf063967fec6c226187141cddd35f47ca Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 1 Aug 2021 19:05:17 +0200
Subject: [PATCH] Simplification

---
 .../eu/faircode/email/FragmentAnswer.java     | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 30cba932d0..3719fa14f4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -371,29 +371,25 @@ public class FragmentAnswer extends FragmentBase {
                     if (receipt)
                         db.answer().resetReceipt();
 
-                    if (id < 0) {
-                        EntityAnswer answer = new EntityAnswer();
-                        answer.name = name;
-                        answer.group = group;
-                        answer.standard = standard;
-                        answer.receipt = receipt;
-                        answer.favorite = favorite;
-                        answer.hide = hide;
-                        answer.external = external;
-                        answer.text = document.body().html();
+                    EntityAnswer answer;
+                    if (id < 0)
+                        answer = new EntityAnswer();
+                    else
+                        answer = db.answer().getAnswer(id);
+
+                    answer.name = name;
+                    answer.group = group;
+                    answer.standard = standard;
+                    answer.receipt = receipt;
+                    answer.favorite = favorite;
+                    answer.hide = hide;
+                    answer.external = external;
+                    answer.text = document.body().html();
+
+                    if (id < 0)
                         answer.id = db.answer().insertAnswer(answer);
-                    } else {
-                        EntityAnswer answer = db.answer().getAnswer(id);
-                        answer.name = name;
-                        answer.group = group;
-                        answer.standard = standard;
-                        answer.receipt = receipt;
-                        answer.favorite = favorite;
-                        answer.hide = hide;
-                        answer.external = external;
-                        answer.text = document.body().html();
+                    else
                         db.answer().updateAnswer(answer);
-                    }
 
                     db.setTransactionSuccessful();
                 } finally {