From 3729d0a9eb0c77bc225b2f4f5fc841fdf7fd1597 Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Thu, 22 Oct 2026 18:28:22 +0200 Subject: [PATCH 1/2] Fixed tests: they computed the resulting value in the same way as the code they tested, so they didn't fail (relative minutes test was returning %dm and not failing) Signed-off-by: daniele-verducci --- .../nextcloud/android/common/core/utils/DateFormatterTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt index 7731dfb6..669a4d6e 100644 --- a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt +++ b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt @@ -53,7 +53,7 @@ class DateFormatterTest { val calendar = Calendar.getInstance() calendar.add(Calendar.MINUTE, -5) val formattedDate = dateFormatter.getConditionallyRelativeFormattedTimeSpan(calendar) - val expected = context.resources.getQuantityString(R.plurals.date_formatting_relative_minutes, 5) + val expected = "5m" assertEquals(expected, formattedDate) } @@ -62,7 +62,7 @@ class DateFormatterTest { val calendar = Calendar.getInstance() calendar.add(Calendar.HOUR, -3) val formattedDate = dateFormatter.getConditionallyRelativeFormattedTimeSpan(calendar) - val expected = context.resources.getQuantityString(R.plurals.date_formatting_relative_hours, 3, 3) + val expected = "3h" assertEquals(expected, formattedDate) } From f476ced707c48ab99143c65a1f1c614f9f54ee7d Mon Sep 17 00:00:00 2001 From: daniele-verducci Date: Thu, 22 Oct 2026 18:31:49 +0200 Subject: [PATCH 2/2] Fixed date formatter: it was always reporting %dm instead of the values in minutes (i.e.: 5m) Signed-off-by: daniele-verducci --- .../com/nextcloud/android/common/core/utils/DateFormatter.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt index b6ce886e..2872de77 100644 --- a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt +++ b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt @@ -60,10 +60,12 @@ class DateFormatter(private val context: Context) { // less than 1h span < ONE_HOUR_IN_MILLIS -> { + val minutes: Int = span.toInt() / ONE_MINUTE_IN_MILLIS context.resources .getQuantityString( R.plurals.date_formatting_relative_minutes, - span.toInt() / ONE_MINUTE_IN_MILLIS + minutes, + minutes ) }