Skip to content

Commit

Permalink
Shorten disappearing countdown description in message details.
Browse files Browse the repository at this point in the history 
Fixes #10217
Closes #11265
  • Loading branch information
@Sgn-32 @alex-signal
Sgn-32 authored and alex-signal committed Jul 11, 2022
1 parent d01df9f commit 4656cf4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 18 deletions.
21 changes: 15 additions & 6 deletions app/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java
View file
Expand Up @@ -26,19 +26,28 @@ public static String getExpirationDisplayValue(Context context, int expirationTi
int secondsRemaining = expirationTime;

int weeks = secondsRemaining / SECONDS_IN_WEEK;
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_weeks, weeks);
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_weeks, weeks);
secondsRemaining = secondsRemaining - weeks * SECONDS_IN_WEEK;

int days = secondsRemaining / SECONDS_IN_DAY;
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_days, days);
if (weeks > 0) {
return displayValue;
}
secondsRemaining = secondsRemaining - days * SECONDS_IN_DAY;

int hours = secondsRemaining / SECONDS_IN_HOUR;
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_hours, hours);
if (days > 0) {
return displayValue;
}
secondsRemaining = secondsRemaining - hours * SECONDS_IN_HOUR;

int minutes = secondsRemaining / SECONDS_IN_MINUTE;
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_minutes, minutes);
displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_minutes, minutes);
if (hours > 0) {
return displayValue;
}
secondsRemaining = secondsRemaining - minutes * SECONDS_IN_MINUTE;

displayValue = getDisplayValue(context, displayValue, R.plurals.expiration_seconds, secondsRemaining);
Expand Down Expand Up @@ -68,19 +77,19 @@ public static String getExpirationAbbreviatedDisplayValue(Context context, int e
int secondsRemaining = expirationTime;

int weeks = secondsRemaining / SECONDS_IN_WEEK;
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_weeks_abbreviated, weeks);
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_weeks_abbreviated, weeks);
secondsRemaining = secondsRemaining - weeks * SECONDS_IN_WEEK;

int days = secondsRemaining / SECONDS_IN_DAY;
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_days_abbreviated, days);
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_days_abbreviated, days);
secondsRemaining = secondsRemaining - days * SECONDS_IN_DAY;

int hours = secondsRemaining / SECONDS_IN_HOUR;
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_hours_abbreviated, hours);
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_hours_abbreviated, hours);
secondsRemaining = secondsRemaining - hours * SECONDS_IN_HOUR;

int minutes = secondsRemaining / SECONDS_IN_MINUTE;
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_minutes_abbreviated, minutes);
displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_minutes_abbreviated, minutes);
secondsRemaining = secondsRemaining - minutes * SECONDS_IN_MINUTE;

displayValue = getAbbreviatedDisplayValue(context, displayValue, R.string.expiration_seconds_abbreviated, secondsRemaining);
Expand Down
24 changes: 12 additions & 12 deletions app/src/test/java/org/thoughtcrime/securesms/util/ExpirationUtilTest.java
View file
Expand Up @@ -76,31 +76,31 @@ public void shouldFormatAsBreakdown_whenLargerThanWeek() {
assertEquals("1 week 1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_DAY));

assertEquals("1 week 1 hour",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_HOUR));

assertEquals("1 week 1 minute",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_MINUTE));

assertEquals("1 week 1 second",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + 1));

assertEquals("1 week 1 day 1 hour",
assertEquals("1 week 1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_DAY + SECONDS_IN_HOUR));

assertEquals("1 week 1 day 1 hour 1 minute",
assertEquals("1 week 1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_DAY + SECONDS_IN_HOUR + SECONDS_IN_MINUTE));

assertEquals("1 week 1 day 1 hour 1 minute 1 second",
assertEquals("1 week 1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_DAY + SECONDS_IN_HOUR + SECONDS_IN_MINUTE + 1));

assertEquals("1 week 1 hour 1 minute",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_HOUR + SECONDS_IN_MINUTE));

assertEquals("1 week 1 hour 1 minute 1 second",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_HOUR + SECONDS_IN_MINUTE + 1));

assertEquals("1 week 1 minute 1 second",
assertEquals("1 week",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_WEEK + SECONDS_IN_MINUTE + 1));
}

Expand All @@ -109,10 +109,10 @@ public void shouldFormatAsBreakdown_whenLargerThanDay() {
assertEquals("1 day 1 hour",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_DAY + SECONDS_IN_HOUR));

assertEquals("1 day 1 minute",
assertEquals("1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_DAY + SECONDS_IN_MINUTE));

assertEquals("1 day 1 second",
assertEquals("1 day",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_DAY + 1));
}

Expand All @@ -121,7 +121,7 @@ public void shouldFormatAsBreakdown_whenLargerThanHour() {
assertEquals("1 hour 1 minute",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_HOUR + SECONDS_IN_MINUTE));

assertEquals("1 hour 1 second",
assertEquals("1 hour",
ExpirationUtil.getExpirationDisplayValue(context, SECONDS_IN_HOUR + 1));
}

Expand Down

0 comments on commit 4656cf4

Please sign in to comment.