From 40de4a8dc4925460766870cf05fffebd363f9a12 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Tue, 2 Mar 2021 21:10:14 +0100 Subject: [PATCH] Fix date parsing --- .../protect/card_locker/importexport/VoucherVaultImporter.java | 2 ++ app/src/test/java/protect/card_locker/ImportExportTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java index 837cddc59..317adb65a 100644 --- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java +++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java @@ -18,6 +18,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Currency; import java.util.Date; +import java.util.TimeZone; import protect.card_locker.DBHelper; import protect.card_locker.FormatException; @@ -53,6 +54,7 @@ public class VoucherVaultImporter implements DatabaseImporter Date expiry = null; if (!jsonCard.isNull("expires")) { @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); expiry = dateFormat.parse(jsonCard.getString("expires")); } diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java index e31e048ea..17823f253 100644 --- a/app/src/test/java/protect/card_locker/ImportExportTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportTest.java @@ -931,7 +931,7 @@ public class ImportExportTest assertEquals("Department Store", card.store); assertEquals("", card.note); - assertEquals(new Date(1616713200000L), card.expiry); + assertEquals(new Date(1616716800000L), card.expiry); assertEquals(new BigDecimal("3.5"), card.balance); assertEquals(Currency.getInstance("USD"), card.balanceType); assertEquals("26846363", card.cardId);