diff options
| -rw-r--r-- | src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt index be6c6cbd..370668ef 100644 --- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt +++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt @@ -52,11 +52,9 @@ class ClockPickerRepositoryImpl( override val allClocks: Flow<List<ClockMetadataModel>> = callbackFlow { fun send() { - val allClocks = - registry - .getClocks() - .filter { "NOT_IN_USE" !in it.clockId } - .map { it.toModel() } + val activeClockId = registry.activeClockId + val allClocks = registry.getClocks().map { it.toModel() } + trySend(allClocks) } @@ -83,12 +81,12 @@ class ClockPickerRepositoryImpl( override val selectedClock: Flow<ClockMetadataModel> = callbackFlow { fun send() { - val currentClockId = registry.currentClockId + val activeClockId = registry.activeClockId val metadata = registry.settings?.metadata val model = registry .getClocks() - .find { clockMetadata -> clockMetadata.clockId == currentClockId } + .find { clockMetadata -> clockMetadata.clockId == activeClockId } ?.toModel( selectedColorId = metadata?.getSelectedColorId(), colorTone = metadata?.getColorTone() |