diff options
author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2022-01-25 13:33:37 +0100 |
---|---|---|
committer | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2022-01-25 13:33:37 +0100 |
commit | 7af6c4ca50322258bbd23214920c4c9122482966 (patch) | |
tree | 83be3be35d497fbdc00bc5c10a7dc0bad2bd8aad /src/main/java/org/uic/barcode/dynamicFrame/v2 | |
parent | signature validation changed to work with teh dynamic header version 2. (diff) | |
download | UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar.gz UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar.bz2 UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar.lz UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar.xz UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.tar.zst UIC-barcode-7af6c4ca50322258bbd23214920c4c9122482966.zip |
Diffstat (limited to 'src/main/java/org/uic/barcode/dynamicFrame/v2')
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java | 25 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java index bdaa31a..de475a9 100644 --- a/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java +++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/DynamicFrameCoderV2.java @@ -120,7 +120,7 @@ public class DynamicFrameCoderV2 { DynamicFrame asnFrame = new DynamicFrame();
- frame.setFormat(frame.getFormat());
+ asnFrame.setFormat(frame.getFormat());
if (frame.getLevel2Signature() != null && frame.getLevel2Signature().length > 0) {
asnFrame.setLevel2Signature(new OctetString(frame.getLevel2Signature()));
diff --git a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java index 1dff709..63db364 100644 --- a/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java +++ b/src/main/java/org/uic/barcode/dynamicFrame/v2/Level1DataType.java @@ -100,16 +100,16 @@ public class Level1DataType { /** The End of validity year. */
@FieldOrder(order = 9)
@IntRange(minValue=2016,maxValue=2269)
- public Long EndOfValidityYear;
+ @Asn1Optional public Long EndOfValidityYear;
/** The End of validity day. */
@FieldOrder(order = 10)
@IntRange(minValue=1,maxValue=366)
- public Long EndOfValidityDay;
+ @Asn1Optional public Long EndOfValidityDay;
/** The End of validity time. */
@FieldOrder(order = 11)
- @IntRange(minValue=0,maxValue=1440)
+ @IntRange(minValue=0,maxValue=1439)
@Asn1Optional public Long EndOfValidityTime;
@@ -309,25 +309,26 @@ public class Level1DataType { }
/**
- * Sets the end of validity date. The validity date has to be provided in UTC.
- *
+ * Sets the end of validity date.
* @param date the new end of validity date
*/
public void setEndOfValidityDate(Date date){
- if (date == null) {
- date = Calendar.getInstance().getTime();
- }
+ if (date == null) return;
+ TimeZone local = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+
Calendar cal = Calendar.getInstance();
cal.setTime(date);
-
+
this.EndOfValidityYear = new Long( cal.get(Calendar.YEAR));
this.EndOfValidityDay = new Long (cal.get(Calendar.DAY_OF_YEAR));
int time = cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE);
if (time >= 0) {
this.EndOfValidityTime = new Long (time );
}
+ TimeZone.setDefault(local);
}
@@ -340,6 +341,9 @@ public class Level1DataType { if (this.EndOfValidityYear == null || this.EndOfValidityDay == null) return null;
+ TimeZone local = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+
Calendar cal = Calendar.getInstance();
cal.clear();
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -356,6 +360,9 @@ public class Level1DataType { }
Date d = cal.getTime();
+
+ TimeZone.setDefault(local);
+
return d;
}
|