Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 10:17:56 +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

21
app/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java
View File

@@ -26,19 +26,28 @@ public final class ExpirationUtil {
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);
@@ -68,19 +77,19 @@ public final class ExpirationUtil {
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);