Simplification

app/src/main/java/eu/faircode/email/FragmentAnswer.java

@@ -371,8 +371,12 @@ public class FragmentAnswer extends FragmentBase {
                     if (receipt)
                         db.answer().resetReceipt();
 
-                    if (id < 0) {
+                    EntityAnswer answer;
-                        EntityAnswer answer = new EntityAnswer();
+                    if (id < 0)
+                        answer = new EntityAnswer();
+                    else
+                        answer = db.answer().getAnswer(id);
+
                     answer.name = name;
                     answer.group = group;
                     answer.standard = standard;
@@ -381,19 +385,11 @@ public class FragmentAnswer extends FragmentBase {
                     answer.hide = hide;
                     answer.external = external;
                     answer.text = document.body().html();
+
+                    if (id < 0)
                         answer.id = db.answer().insertAnswer(answer);
-                    } else {
+                    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();
                         db.answer().updateAnswer(answer);
-                    }
 
                     db.setTransactionSuccessful();
                 } finally {