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

Use renamed isAncestorOf() method #3536

Closed
wants to merge 1 commit into from
Closed

Use renamed isAncestorOf() method #3536

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
6 changes: 3 additions & 3 deletions collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ private void refreshView(boolean isGoingUp) {
// retrieve the current group
TreeReference curGroup = (visibleGroupRef == null) ? contextGroupRef : visibleGroupRef;

if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
if (curGroup != null && !curGroup.isAncestorOf(currentRef, false)) {
// We have left the current group
if (visibleGroupRef == null) {
// We are done.
Expand Down Expand Up @@ -611,7 +611,7 @@ private void refreshView(boolean isGoingUp) {
}

// Don't render other groups' children.
if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
if (contextGroupRef != null && !contextGroupRef.isAncestorOf(currentRef, false)) {
break;
}

Expand Down Expand Up @@ -643,7 +643,7 @@ private void refreshView(boolean isGoingUp) {
FormEntryCaption fc = formController.getCaptionPrompt();

// Don't render other groups' children.
if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
if (contextGroupRef != null && !contextGroupRef.isAncestorOf(currentRef, false)) {
break;
}

Expand Down