From f3214fa65f470bf16ee986e2e78a1fac007187ed Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 30 Mar 2019 10:18:16 +0000 Subject: [PATCH] Special case --- .../eu/faircode/email/FragmentCompose.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 047e5327bc..6934677d0a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1717,19 +1717,24 @@ public class FragmentCompose extends FragmentBase { draft.thread = ref.thread; // Special case - String from = null; - String to = null; - String me = Helper.canonicalAddress(Helper.myAddress().getAddress()); - if (ref.from != null && ref.from.length > 0) - from = Helper.canonicalAddress(((InternetAddress) ref.from[0]).getAddress()); - if (ref.to != null && ref.to.length > 0) - to = Helper.canonicalAddress(((InternetAddress) ref.to[0]).getAddress()); - if (from != null && from.equals(me)) { - if (to != null && to.equals(me)) - draft.to = ref.reply; - else - draft.to = ref.to; - draft.from = ref.from; + if (BuildConfig.DEBUG) { + String from = null; + String to = null; + String me = Helper.canonicalAddress(Helper.myAddress().getAddress()); + if (ref.from != null && ref.from.length > 0) + from = Helper.canonicalAddress(((InternetAddress) ref.from[0]).getAddress()); + if (ref.to != null && ref.to.length > 0) + to = Helper.canonicalAddress(((InternetAddress) ref.to[0]).getAddress()); + if (from != null && from.equals(me)) { + if (to != null && to.equals(me)) + draft.to = ref.reply; + else + draft.to = ref.to; + draft.from = ref.from; + } else { + draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply); + draft.from = ref.to; + } } else { draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply); draft.from = ref.to;