From ca0191d050b3dac6e65815ad5662ed8e796ef9d9 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:44:07 +0100 Subject: fix for the Android Java SDK bug in getDeclaredFields nor providing the field order --- src/org/uic/barcode/dynamicFrame/Level1DataType.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/org/uic/barcode/dynamicFrame/Level1DataType.java') diff --git a/src/org/uic/barcode/dynamicFrame/Level1DataType.java b/src/org/uic/barcode/dynamicFrame/Level1DataType.java index ac48ba8..796c44f 100644 --- a/src/org/uic/barcode/dynamicFrame/Level1DataType.java +++ b/src/org/uic/barcode/dynamicFrame/Level1DataType.java @@ -5,6 +5,7 @@ import org.uic.ticket.api.utils.UicEncoderUtils; import net.gcdc.asn1.datatypes.Asn1Optional; import net.gcdc.asn1.datatypes.CharacterRestriction; +import net.gcdc.asn1.datatypes.FieldOrder; import net.gcdc.asn1.datatypes.IntRange; import net.gcdc.asn1.datatypes.RestrictedString; import net.gcdc.asn1.datatypes.Sequence; @@ -22,20 +23,24 @@ public class Level1DataType { * numeric codes 1 ...32000 * * */ + @FieldOrder(order = 0) @IntRange(minValue=1,maxValue=32000) @Asn1Optional public Long securityProviderNum; /** The security provider alphanumeric codes. */ + @FieldOrder(order = 1) @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String securityProviderIA5; /** The key id. */ + @FieldOrder(order = 2) @IntRange(minValue=1,maxValue=99999) @Asn1Optional public Long keyId; /** The data. */ + @FieldOrder(order = 3) public SequenceOfDataType data; /** @@ -50,10 +55,11 @@ public class Level1DataType { * * */ + @FieldOrder(order = 4) @RestrictedString(CharacterRestriction.ObjectIdentifier) @Asn1Optional public String level1KeyAlg; - + @FieldOrder(order = 5) @RestrictedString(CharacterRestriction.ObjectIdentifier) @Asn1Optional public String level2KeyAlg; @@ -69,14 +75,17 @@ public class Level1DataType { * * */ + @FieldOrder(order = 6) @RestrictedString(CharacterRestriction.ObjectIdentifier) @Asn1Optional public String level1SigningAlg; + @FieldOrder(order = 7) @RestrictedString(CharacterRestriction.ObjectIdentifier) @Asn1Optional public String level2SigningAlg; /** The level 2 public key*/ + @FieldOrder(order = 8) @Asn1Optional public OctetString level2publicKey; -- cgit v1.2.3