From fe062ecaa0ad103c33c8e60f11c889768417ccb6 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Fri, 25 Jan 2019 07:22:02 +0100 Subject: [PATCH] Rename SetCategoryForUnusedApps to SetCategoryForUnassignedApps --- .../main/java/io/timelimit/android/sync/actions/Actions.kt | 2 +- .../timelimit/android/sync/actions/dispatch/ParentAction.kt | 2 +- .../category/settings/ManageCategoryForUnassignedApps.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/timelimit/android/sync/actions/Actions.kt b/app/src/main/java/io/timelimit/android/sync/actions/Actions.kt index ce50d45..a8ad50c 100644 --- a/app/src/main/java/io/timelimit/android/sync/actions/Actions.kt +++ b/app/src/main/java/io/timelimit/android/sync/actions/Actions.kt @@ -126,7 +126,7 @@ data class UpdateCategoryTemporarilyBlockedAction(val categoryId: String, val bl IdGenerator.assertIdValid(categoryId) } } -data class SetCategoryForUnusedApps(val childId: String, val categoryId: String): ParentAction() { +data class SetCategoryForUnassignedApps(val childId: String, val categoryId: String): ParentAction() { // category id can be empty init { diff --git a/app/src/main/java/io/timelimit/android/sync/actions/dispatch/ParentAction.kt b/app/src/main/java/io/timelimit/android/sync/actions/dispatch/ParentAction.kt index 2f73e1f..3b898e2 100644 --- a/app/src/main/java/io/timelimit/android/sync/actions/dispatch/ParentAction.kt +++ b/app/src/main/java/io/timelimit/android/sync/actions/dispatch/ParentAction.kt @@ -264,7 +264,7 @@ object LocalDatabaseParentActionDispatcher { database.device().updateDeviceEntry(deviceEntry) } - is SetCategoryForUnusedApps -> { + is SetCategoryForUnassignedApps -> { DatabaseValidation.assertChildExists(database, action.childId) if (action.categoryId.isNotEmpty()) { diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/settings/ManageCategoryForUnassignedApps.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/settings/ManageCategoryForUnassignedApps.kt index fb1010a..8126f12 100644 --- a/app/src/main/java/io/timelimit/android/ui/manage/category/settings/ManageCategoryForUnassignedApps.kt +++ b/app/src/main/java/io/timelimit/android/ui/manage/category/settings/ManageCategoryForUnassignedApps.kt @@ -6,7 +6,7 @@ import io.timelimit.android.data.Database import io.timelimit.android.databinding.ManageCategoryForUnassignedAppsBinding import io.timelimit.android.livedata.ignoreUnchanged import io.timelimit.android.livedata.map -import io.timelimit.android.sync.actions.SetCategoryForUnusedApps +import io.timelimit.android.sync.actions.SetCategoryForUnassignedApps import io.timelimit.android.ui.main.ActivityViewModel object ManageCategoryForUnassignedApps { @@ -28,14 +28,14 @@ object ManageCategoryForUnassignedApps { if (chosen == true) { auth.tryDispatchParentAction( - SetCategoryForUnusedApps( + SetCategoryForUnassignedApps( childId = childId, categoryId = "" ) ) } else if (chosen == false) { auth.tryDispatchParentAction( - SetCategoryForUnusedApps( + SetCategoryForUnassignedApps( childId = childId, categoryId = categoryId )