Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "#7618 focus subject or content field on external intent" #7644

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Revert "#7618 focus subject or content field on external intent" #7644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
Expand Down