Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 04:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shorten disappearing countdown description in message details.

Browse Source 
Fixes #10217
Closes #11265
This commit is contained in:
Sgn-32
2022-03-29 22:25:04 +02:00
committed by Alex Hart
parent d01df9f053
commit 4656cf4bef
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/test/java/org/thoughtcrime/securesms/util/ExpirationUtilTest.java
View File

@@ -76,31 +76,31 @@ public class ExpirationUtilTest {
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));
}
@@ -109,10 +109,10 @@ public class ExpirationUtilTest {
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));
}
@@ -121,7 +121,7 @@ public class ExpirationUtilTest {
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));
}