Fix date parsing

This commit is contained in:
Sylvia van Os
2021-03-02 21:10:14 +01:00
parent db22703ec0
commit 40de4a8dc4
2 changed files with 3 additions and 1 deletions

View File

@@ -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"));
}

View File

@@ -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);