mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-25 12:08:00 +01:00
Merge pull request #575 from Flowdalic/fix-npe-in-fillableform
[xdata] Fix NPE in FillableForm
This commit is contained in:
commit
b117d8c3d4
1 changed files with 7 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2020 Florian Schmaus
|
||||
* Copyright 2020-2024 Florian Schmaus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -54,6 +54,7 @@ public class FillableForm extends FilledForm {
|
|||
}
|
||||
|
||||
Set<String> requiredFields = new HashSet<>();
|
||||
List<FormField> requiredFieldsWithDefaultValue = new ArrayList<>();
|
||||
for (FormField formField : dataForm.getFields()) {
|
||||
if (formField.isRequired()) {
|
||||
String fieldName = formField.getFieldName();
|
||||
|
@ -61,13 +62,17 @@ public class FillableForm extends FilledForm {
|
|||
|
||||
if (formField.hasValueSet()) {
|
||||
// This is a form field with a default value.
|
||||
write(formField);
|
||||
requiredFieldsWithDefaultValue.add(formField);
|
||||
} else {
|
||||
missingRequiredFields.add(fieldName);
|
||||
}
|
||||
}
|
||||
}
|
||||
this.requiredFields = Collections.unmodifiableSet(requiredFields);
|
||||
|
||||
for (FormField field : requiredFieldsWithDefaultValue) {
|
||||
write(field);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeListMulti(String fieldName, List<? extends CharSequence> values) {
|
||||
|
|
Loading…
Reference in a new issue