Skip to content

Backmerge Commcare 2.61.2 #3453

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

Merged
avazirna merged 4 commits into from
Dec 5, 2025
Merged

Backmerge Commcare 2.61.2 #3453

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3e2372
Automated hotfix version bump
avazirna Dec 4, 2025
87a1650
Don't dismiss Combobox dropdown during text changed event
avazirna Dec 4, 2025
b5d8b8e
Merge pull request #3452 from dimagi/hotfix-prevent-dropdown-dismiss-…
avazirna Dec 5, 2025
b63f6ae
Merge branch 'master' into commcare_2.61
avazirna Dec 5, 2025
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
12 changes: 10 additions & 2 deletions app/src/org/commcare/views/widgets/ComboboxWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class ComboboxWidget extends QuestionWidget {
private Vector<SelectChoice> choices;
private Vector<String> choiceTexts;
private Combobox comboBox;
private boolean wasWidgetChangedOnTextChanged = false;

public ComboboxWidget(Context context, FormEntryPrompt prompt, ComboboxFilterRule filterRule) {
super(context, prompt);
Expand Down Expand Up @@ -95,7 +96,12 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {

@Override
public void afterTextChanged(Editable s) {
widgetEntryChanged();
try {
wasWidgetChangedOnTextChanged = true;
widgetEntryChanged();
} finally {
wasWidgetChangedOnTextChanged = false;
}
}
});
}
Expand All @@ -115,7 +121,9 @@ private void fillInPreviousAnswer(FormEntryPrompt prompt) {
@Override
public IAnswerData getAnswer() {
// So that we can see any error message that gets shown as a result of this
comboBox.dismissDropDown();
if(!wasWidgetChangedOnTextChanged) {
comboBox.dismissDropDown();
}

comboBox.autoCorrectCapitalization();
String enteredText = comboBox.getText().toString();
Expand Down