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

Use category for Apps without category

Browse source
This commit is contained in:
Jonas L 2019-01-24 20:36:54 +01:00
parent 0c60d0be42
commit bb918eac7a
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
View file

@ -185,6 +185,7 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
} else if (foregroundAppPackageName != null) { } else if (foregroundAppPackageName != null) {
val appCategory = appCategories.get(Pair(foregroundAppPackageName, categories.map { it.id })).waitForNullableValue() val appCategory = appCategories.get(Pair(foregroundAppPackageName, categories.map { it.id })).waitForNullableValue()
val category = categories.find { it.id == appCategory?.categoryId } val category = categories.find { it.id == appCategory?.categoryId }
?: categories.find { it.id == deviceUserEntry.categoryForNotAssignedApps }
if (category == null) { if (category == null) {
usedTimeUpdateHelper?.commit(appLogic) usedTimeUpdateHelper?.commit(appLogic)

11
app/src/main/java/io/timelimit/android/logic/BlockingReason.kt
View file

@ -120,7 +120,18 @@ class BlockingReasonUtil(private val appLogic: AppLogic) {
categoryEntry -> categoryEntry ->
if (categoryEntry == null) { if (categoryEntry == null) {
val defaultCategory = if (child.categoryForNotAssignedApps.isEmpty())
liveDataFromValue(null as Category?)
else
appLogic.database.category().getCategoryByChildIdAndId(child.id, child.categoryForNotAssignedApps)
defaultCategory.switchMap { categoryEntry2 ->
if (categoryEntry2 == null) {
liveDataFromValue(BlockingReason.NotPartOfAnCategory) liveDataFromValue(BlockingReason.NotPartOfAnCategory)
} else {
getBlockingReasonStep4Point5(categoryEntry2, child, timeZone)
}
}
} else if (categoryEntry.temporarilyBlocked) { } else if (categoryEntry.temporarilyBlocked) {
liveDataFromValue(BlockingReason.TemporarilyBlocked) liveDataFromValue(BlockingReason.TemporarilyBlocked)
} else { } else {