From 6df217e01d46c70eb53a90ba4cb333133b434a63 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 4 May 2021 19:14:16 +0200 Subject: [PATCH] Revert "Keep recipient focus" This reverts commit 4d5b7d3afae446f0baea745248e0f94f3b09b7fc. --- .../java/eu/faircode/email/FragmentCompose.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index c29101c20a..43a52cb523 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5193,15 +5193,9 @@ public class FragmentCompose extends FragmentBase { Log.i("Loaded action id=" + draft.id + " action=" + getActionName(action) + " encryption=" + needsEncryption); - String to = MessageHelper.formatAddressesCompose(draft.to); - String cc = MessageHelper.formatAddressesCompose(draft.cc); - String bcc = MessageHelper.formatAddressesCompose(draft.bcc); - if (!Objects.equals(etTo.getText().toString(), to)) - etTo.setText(to); - if (!Objects.equals(etCc.getText().toString(), cc)) - etCc.setText(cc); - if (!Objects.equals(etBcc.getText().toString(), bcc)) - etBcc.setText(bcc); + etTo.setText(MessageHelper.formatAddressesCompose(draft.to)); + etCc.setText(MessageHelper.formatAddressesCompose(draft.cc)); + etBcc.setText(MessageHelper.formatAddressesCompose(draft.bcc)); Bundle extras = args.getBundle("extras"); boolean show = extras.getBoolean("show"); @@ -5562,6 +5556,11 @@ public class FragmentCompose extends FragmentBase { public void run() { try { target.requestFocus(); + if (target.getId() != R.id.etSubject && target.getId() != R.id.etBody) { + EditText et = (EditText) target; + String text = et.getText().toString(); + et.setSelection(text.length()); + } Context context = target.getContext();