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

Add support for end times for temporarily blocking

Browse source
This commit is contained in:
Jonas Lochmann 2020-01-27 01:00:00 +01:00
parent a81bc687fb
commit 1a695cfc96
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
26 changed files with 1555 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
View file

@ -303,6 +303,7 @@ object ApplyServerDataStatus {
blockedMinutesInWeek = newCategory.blockedMinutesInWeek,
extraTimeInMillis = newCategory.extraTimeInMillis,
temporarilyBlocked = newCategory.temporarilyBlocked,
temporarilyBlockedEndTime = newCategory.temporarilyBlockedEndTime,
blockAllNotifications = newCategory.blockAllNotifications,
baseVersion = newCategory.baseDataVersion,
assignedAppsVersion = "",
@ -320,6 +321,7 @@ object ApplyServerDataStatus {
blockedMinutesInWeek = newCategory.blockedMinutesInWeek,
extraTimeInMillis = newCategory.extraTimeInMillis,
temporarilyBlocked = newCategory.temporarilyBlocked,
temporarilyBlockedEndTime = newCategory.temporarilyBlockedEndTime,
blockAllNotifications = newCategory.blockAllNotifications,
baseVersion = newCategory.baseDataVersion,
parentCategoryId = newCategory.parentCategoryId,