mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Improve clarity of screen lock timeout duration.

main
Cody Henthorne 2023-02-01 08:38:16 -05:00 zatwierdzone przez Greyson Parrelli
rodzic 43cde19071
commit 5024998a6f
1 zmienionych plików z 1 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
Wyświetl plik

@ -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.adapter.mapping.MappingAdapter
import org.thoughtcrime.securesms.util.navigation.safeNavigate import org.thoughtcrime.securesms.util.navigation.safeNavigate
import java.lang.Integer.max import java.lang.Integer.max
import java.util.Locale
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
private val TAG = Log.tag(PrivacySettingsFragment::class.java) 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 { private fun getScreenLockInactivityTimeoutSummary(timeoutSeconds: Long): String {
val hours = TimeUnit.SECONDS.toHours(timeoutSeconds)
val minutes = TimeUnit.SECONDS.toMinutes(timeoutSeconds) - hours * 60
return if (timeoutSeconds <= 0) { return if (timeoutSeconds <= 0) {
getString(R.string.AppProtectionPreferenceFragment_none) getString(R.string.AppProtectionPreferenceFragment_none)
} else { } else {
String.format(Locale.getDefault(), "%02d:%02d", hours, minutes) ExpirationUtil.getExpirationDisplayValue(requireContext(), timeoutSeconds.toInt())
} }
} }