From b9f71a875a8ead9fa77e043e12a5eac4d7f5317c Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 21 Jul 2019 12:20:27 +0200 Subject: [PATCH] Refactoring --- .../main/java/eu/faircode/email/FragmentCompose.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 3fdbfa302a..279489f4d0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -2078,6 +2078,12 @@ public class FragmentCompose extends FragmentBase { draft.subject = context.getString(R.string.title_subject_reply, subject); else draft.subject = ref.subject; + } else if ("forward".equals(action)) { + String fwd = context.getString(R.string.title_subject_forward, ""); + if (!prefix_once || !subject.startsWith(fwd.trim())) + draft.subject = context.getString(R.string.title_subject_forward, subject); + else + draft.subject = ref.subject; } else if ("editasnew".equals(action)) { draft.subject = ref.subject; if (ref.content) { @@ -2086,12 +2092,6 @@ public class FragmentCompose extends FragmentBase { if (document.body() != null) body = document.body().html(); } - } else if ("forward".equals(action)) { - String fwd = context.getString(R.string.title_subject_forward, ""); - if (!prefix_once || !subject.startsWith(fwd.trim())) - draft.subject = context.getString(R.string.title_subject_forward, subject); - else - draft.subject = ref.subject; } else if ("list".equals(action)) { draft.subject = ref.subject; } else if ("receipt".equals(action)) {