thunderbird#7618 focus subject or content field on external intent

LorenzHo · Feb 10, 2024 · 6210852 · 6210852
1 parent 98f0d4f
commit 6210852
Showing 1 changed file with 9 additions and 2 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
@@ -370,8 +370,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
             relatedMessageProcessed = savedInstanceState.getBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, false);
         }
 
-
-        if (initFromIntent(intent)) {
+        boolean startedByExternalIntent = initFromIntent(intent);
+        if (startedByExternalIntent) {
             action = Action.COMPOSE;
             changesMadeSinceLastSave = true;
         } else {
@@ -446,6 +446,13 @@ 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();