Merge pull request #7644 from thunderbird/revert_focus_patch

Revert "#7618 focus subject or content field on external intent"
thunderbird · Feb 15, 2024 · 2f0f2a2 · 2f0f2a2
2 parents 571ade5 + 0dbba54
commit 2f0f2a2
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -372,8 +372,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
             relatedMessageProcessed = savedInstanceState.getBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, false);
         }
 
-        boolean startedByExternalIntent = initFromIntent(intent);
-        if (startedByExternalIntent) {
+
+        if (initFromIntent(intent)) {
             action = Action.COMPOSE;
             changesMadeSinceLastSave = true;
         } else {
@@ -452,13 +452,6 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 action == Action.EDIT_DRAFT) {
             //change focus to message body.
             messageContentView.requestFocus();
-        } else if (startedByExternalIntent) {
-            // If started by external intent, focus "Subject" or content field (Issue #7618)
-            if (subjectView.getText().length() == 0) {
-                subjectView.requestFocus();
-            } else {
-                messageContentView.requestFocus();
-            }
         } else {
             // Explicitly set focus to "To:" input field (see issue 2998)
             recipientMvpView.requestFocusOnToField();