From 1a6753d2aa6c7acaf35cfc8a17e06e4e8aeb7d55 Mon Sep 17 00:00:00 2001 From: Nacho Date: Tue, 2 Sep 2025 04:54:08 +0200 Subject: [PATCH] Fixed date issues with TransformationHistory --- app/build.gradle.kts | 2 +- .../scanScreen/converters/ToNfcConverter.kt | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e1499af..22e08aa 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,7 @@ android { minSdk = 28 targetSdk = 35 versionCode = 1 - versionName = "Alpha 0.5.1" + versionName = "Alpha 0.5.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/ToNfcConverter.kt b/app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/ToNfcConverter.kt index 644e69e..624f87a 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/ToNfcConverter.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/screens/scanScreen/converters/ToNfcConverter.kt @@ -1,6 +1,7 @@ package com.github.nacabaro.vbhelper.screens.scanScreen.converters import android.icu.util.Calendar +import android.icu.util.TimeZone import android.util.Log import androidx.activity.ComponentActivity import com.github.cfogrady.vbnfc.be.BENfcCharacter @@ -243,16 +244,23 @@ class ToNfcConverter( .getTransformationHistory(characterId)!! .map { val date = Date(it.transformationDate) - val calendar = android.icu.util.GregorianCalendar() + val calendar = android.icu.util.GregorianCalendar(TimeZone.getTimeZone("UTC")) calendar.time = date + Log.d( + "TransformationHistory", + "Year: ${calendar.get(Calendar.YEAR)}, " + + "Month: ${calendar.get(Calendar.MONTH) + 1}, " + + "Day: ${calendar.get(Calendar.DAY_OF_MONTH)}" + ) + NfcCharacter.Transformation( toCharIndex = it.monIndex.toUByte(), year = calendar .get(Calendar.YEAR) .toUShort(), - month = calendar - .get(Calendar.MONTH) + month = (calendar + .get(Calendar.MONTH) + 1) .toUByte(), day = calendar .get(Calendar.DAY_OF_MONTH)