yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 09:49:25 +02:00
Code Issues Projects Releases Wiki Activity

Allow shorter default user timeout

Browse source
This commit is contained in:
Jonas L 2019-04-22 00:00:00 +00:00
parent ba01d1eed6
commit c37e2e5d1c
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/ManageDeviceDefaultUser.kt
View file

@ -81,7 +81,13 @@ object ManageDeviceDefaultUser {
view.defaultUserSwitchText = if (defaultUserTimeout == 0)
context.getString(R.string.manage_device_default_user_timeout_off)
else
context.getString(R.string.manage_device_default_user_timeout_on, TimeTextUtil.time(defaultUserTimeout, context))
context.getString(
R.string.manage_device_default_user_timeout_on,
if (defaultUserTimeout < 1000 * 60)
TimeTextUtil.seconds(defaultUserTimeout / 1000, context)
else
TimeTextUtil.time(defaultUserTimeout, context)
)
})
auth.logic.fullVersion.shouldProvideFullVersionFunctions.observe(lifecycleOwner, Observer { fullVersion ->

3
app/src/main/java/io/timelimit/android/ui/manage/device/manage/defaultuser/SetDeviceDefaultUserTimeoutDialogFragment.kt
View file

@ -41,6 +41,7 @@ class SetDeviceDefaultUserTimeoutDialogFragment: BottomSheetDialogFragment() {
private const val DIALOG_TAG = "sddutdf"
private val OPTIONS = listOf(
0,
1000 * 5,
1000 * 60,
1000 * 60 * 5,
1000 * 60 * 15,
@ -97,6 +98,8 @@ class SetDeviceDefaultUserTimeoutDialogFragment: BottomSheetDialogFragment() {
buildRow().let { row ->
row.text = if (option == 0)
getString(R.string.manage_device_default_user_timeout_dialog_disable)
else if (option < 1000 * 60)
TimeTextUtil.seconds(option / 1000, context!!)
else
TimeTextUtil.time(option, context!!)