From 5024998a6fde593b86428fbcf039e3ef9e7177e8 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Wed, 1 Feb 2023 08:38:16 -0500 Subject: [PATCH] Improve clarity of screen lock timeout duration. --- .../settings/app/privacy/PrivacySettingsFragment.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt index 9960947ae..a518f05b9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt @@ -57,7 +57,6 @@ import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import org.thoughtcrime.securesms.util.navigation.safeNavigate import java.lang.Integer.max -import java.util.Locale import java.util.concurrent.TimeUnit private val TAG = Log.tag(PrivacySettingsFragment::class.java) @@ -387,13 +386,10 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac } private fun getScreenLockInactivityTimeoutSummary(timeoutSeconds: Long): String { - val hours = TimeUnit.SECONDS.toHours(timeoutSeconds) - val minutes = TimeUnit.SECONDS.toMinutes(timeoutSeconds) - hours * 60 - return if (timeoutSeconds <= 0) { getString(R.string.AppProtectionPreferenceFragment_none) } else { - String.format(Locale.getDefault(), "%02d:%02d", hours, minutes) + ExpirationUtil.getExpirationDisplayValue(requireContext(), timeoutSeconds.toInt()) } }