Merge pull request #7644 from thunderbird/revert_focus_patch

Revert "#7618 focus subject or content field on external intent"
This commit is contained in:
cketti 2024-02-15 12:37:38 +01:00 committed by GitHub
commit 2f0f2a2792
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -372,8 +372,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
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 class MessageCompose extends K9Activity implements OnClickListener,
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();