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

Fix adding new days to rule during blocked time area self limit adding

Browse source
This commit is contained in:
Jonas Lochmann 2023-05-01 02:00:00 +02:00
parent 01d5fce6cd
commit c92b24519d
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/io/timelimit/android/ui/model/managechild/ManageCategoryBlockedTimes.kt
View file

@ -47,7 +47,7 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import java.io.Serializable import java.io.Serializable
import kotlin.experimental.and import kotlin.experimental.or
object ManageCategoryBlockedTimes { object ManageCategoryBlockedTimes {
private const val LOG_TAG = "ManageBlockedTimes" private const val LOG_TAG = "ManageBlockedTimes"
@ -157,10 +157,13 @@ object ManageCategoryBlockedTimes {
if (existingRuleId == null) rulesToCreate.add(rule.value) if (existingRuleId == null) rulesToCreate.add(rule.value)
else rulesToUpdate.add(rule.value.copy(id = existingRuleId)) else rulesToUpdate.add(rule.value.copy(id = existingRuleId))
} else { } else {
if (!isChild || currentRule.dayMask and rule.value.dayMask == currentRule.dayMask) val targetDayMask =
if (currentRule.dayMask != rule.value.dayMask) rulesToUpdate.add( if (isChild) currentRule.dayMask or rule.value.dayMask
currentRule.copy(dayMask = rule.value.dayMask) else rule.value.dayMask
)
if (currentRule.dayMask != targetDayMask) rulesToUpdate.add(
currentRule.copy(dayMask = targetDayMask)
)
} }
} }