From 6fadebe4e29afe86c1f4c7e9abf88e2dfcbbdefc Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 18 Jan 2023 11:16:35 -0300 Subject: [PATCH] [app] Show more precise relative last updated dates --- app/src/main/java/org/fdroid/fdroid/Utils.java | 6 +++--- app/src/test/java/org/fdroid/fdroid/UtilsTest.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index 2c0e8ac32..7ebed45db 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -623,11 +623,11 @@ public final class Utils { if (days < 1) { return res.getString(R.string.details_last_updated_today); - } else if (weeks < 1) { + } else if (weeks < 3) { return res.getQuantityString(R.plurals.details_last_update_days, (int) days, days); - } else if (months < 1) { + } else if (months < 2) { return res.getQuantityString(R.plurals.details_last_update_weeks, (int) weeks, weeks); - } else if (years < 1) { + } else if (years < 2) { return res.getQuantityString(R.plurals.details_last_update_months, (int) months, months); } else { return res.getQuantityString(R.plurals.details_last_update_years, (int) years, years); diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java index 7cacced83..3960062c5 100644 --- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java @@ -191,5 +191,13 @@ public class UtilsTest { "Updated 3 days ago", Utils.formatLastUpdated(res, now - 234834870L) ); + assertEquals( + "Updated 13 days ago", + Utils.formatLastUpdated(res, now - DateUtils.DAY_IN_MILLIS * 13 - offset) + ); + assertEquals( + "Updated 7 months ago", + Utils.formatLastUpdated(res, now - DateUtils.DAY_IN_MILLIS * 30 * 7 + offset) + ); } }