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 new fields

Browse source
This commit is contained in:
Jonas L 2019-06-03 00:00:00 +00:00
parent f8ddbd7d91
commit fe1e5962c5
10 changed files with 828 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,8 @@ object ApplyServerDataStatus {
highestOverlayPermission = newDevice.highestOverlayPermission,
accessibilityServiceEnabled = newDevice.accessibilityServiceEnabled,
wasAccessibilityServiceEnabled = newDevice.wasAccessibilityServiceEnabled,
enableActivityLevelBlocking = newDevice.enableActivityLevelBlocking
enableActivityLevelBlocking = newDevice.enableActivityLevelBlocking,
qOrLater = newDevice.qOrLater
))
} else {
// eventually update old entry
@ -193,7 +194,8 @@ object ApplyServerDataStatus {
highestOverlayPermission = newDevice.highestOverlayPermission,
accessibilityServiceEnabled = newDevice.accessibilityServiceEnabled,
wasAccessibilityServiceEnabled = newDevice.wasAccessibilityServiceEnabled,
enableActivityLevelBlocking = newDevice.enableActivityLevelBlocking
enableActivityLevelBlocking = newDevice.enableActivityLevelBlocking,
qOrLater = newDevice.qOrLater
)
if (updatedDeviceEntry != oldDeviceEntry) {
@ -304,7 +306,8 @@ object ApplyServerDataStatus {
assignedAppsVersion = "",
timeLimitRulesVersion = "",
usedTimesVersion = "",
parentCategoryId = newCategory.parentCategoryId
parentCategoryId = newCategory.parentCategoryId,
timeWarnings = newCategory.timeWarnings
))
} else {
val updatedCategory = oldCategory.copy(
@ -315,7 +318,8 @@ object ApplyServerDataStatus {
temporarilyBlocked = newCategory.temporarilyBlocked,
blockAllNotifications = newCategory.blockAllNotifications,
baseVersion = newCategory.baseDataVersion,
parentCategoryId = newCategory.parentCategoryId
parentCategoryId = newCategory.parentCategoryId,
timeWarnings = newCategory.timeWarnings
)
if (updatedCategory != oldCategory) {