Skip to content

Fix reading form metadata in forms containing multiple meta sections #7141

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
seadowg merged 5 commits into from
Mar 18, 2026
Merged

Fix reading form metadata in forms containing multiple meta sections #7141

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2b0a6e
Add a failing test
grzesiek2010 Mar 17, 2026
3431f99
Use the top-level meta block to read metadata
grzesiek2010 Mar 16, 2026
cb61789
Remove redundant code
grzesiek2010 Mar 16, 2026
34d6ff3
Improve variable names
grzesiek2010 Mar 16, 2026
03b73ff
Convert InstanceMetadata to kotlin
grzesiek2010 Mar 16, 2026
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
Prev Previous commit
Next Next commit
Use the top-level meta block to read metadata
  • Loading branch information
@grzesiek2010
grzesiek2010 committed Mar 17, 2026
commit 3431f993c880880676b8d5f55b2cd4e2b6c1bcb9
22 changes: 1 addition & 21 deletions ...ect_app/src/main/java/org/odk/collect/android/javarosawrapper/JavaRosaFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,25 +1010,6 @@ public ByteArrayPayload getSubmissionXml() throws IOException {
getSubmissionDataReference());
}

/**
* Traverse the submission looking for the first matching tag in depth-first order.
*/
private TreeElement findDepthFirst(TreeElement parent, String name) {
int len = parent.getNumChildren();
for (int i = 0; i < len; ++i) {
TreeElement e = parent.getChildAt(i);
if (name.equals(e.getName())) {
return e;
} else if (e.getNumChildren() != 0) {
TreeElement v = findDepthFirst(e, name);
if (v != null) {
return v;
}
}
}
return null;
}

public InstanceMetadata getSubmissionMetadata() {
FormDef formDef = formEntryController.getModel().getForm();
TreeElement rootElement = formDef.getInstance().getRoot();
Expand All @@ -1047,8 +1028,7 @@ public InstanceMetadata getSubmissionMetadata() {
}
}

// and find the depth-first meta block in this...
TreeElement e = findDepthFirst(trueSubmissionElement, "meta");
TreeElement e = trueSubmissionElement.getFirstChild("meta");

String instanceId = null;
String instanceName = null;
Expand Down