Skip to content

usnatv2 #87

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

Open
chuff wants to merge 2 commits into
base: master
Choose a base branch
from
Open

usnatv2 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63a5ce
usnatv2
Feb 2, 2026
83d2337
Merge remote-tracking branch 'upstream/master' into usnatv2
Jun 4, 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
2 changes: 1 addition & 1 deletion iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/UsNat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public class UsNat extends AbstractLazilyEncodableSection {

public static int ID = 7;
public static int VERSION = 1;
public static int VERSION = 2;
public static String NAME = "usnat";

public UsNat() {
Expand Down
20 changes: 20 additions & 0 deletions iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/UsNatCoreSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.iab.gpp.encoder.datatype.EncodableFixedInteger;
import com.iab.gpp.encoder.datatype.EncodableFixedIntegerList;
import com.iab.gpp.encoder.error.DecodingException;
import com.iab.gpp.encoder.error.InvalidFieldException;
import com.iab.gpp.encoder.field.EncodableBitStringFields;
import com.iab.gpp.encoder.field.UsNatField;
import com.iab.gpp.encoder.section.UsNat;
Expand Down Expand Up @@ -84,6 +85,12 @@ protected EncodableBitStringFields initializeFields() {
@Override
protected String encodeSegment(EncodableBitStringFields fields) {
String bitString = bitStringEncoder.encode(fields, getFieldNames());

Integer version = (Integer)fields.get(UsNatField.VERSION).getValue();
if(version == 1) {
bitString = bitString.substring(0, 48) + bitString.substring(56, 60) + bitString.substring(62);
}

String encodedString = base64UrlEncoder.encode(bitString);
return encodedString;
}
Expand Down Expand Up @@ -114,4 +121,17 @@ else if (bitString.length() == 66) {
}
}

@Override
public Object getFieldValue(String fieldName) {
Object value = super.getFieldValue(fieldName);
Integer version = (Integer)super.getFieldValue(UsNatField.VERSION);
if(version == 1) {
if (fieldName.equals(UsNatField.SENSITIVE_DATA_PROCESSING)) {
value = ((List<Integer>) value).subList(0, 12);
} else if (fieldName.equals(UsNatField.KNOWN_CHILD_SENSITIVE_DATA_CONSENTS)) {
value = ((List<Integer>) value).subList(0, 2);
}
}
return value;
}
}
Loading
Loading