Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441b37ae authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Select the default clock if current clock id was not found 

Bug: 295371293
Test: Manually tested invalid clock ids
Change-Id: Iff766fdb9ef5c914eda5454686d8181562748dec
parent c8406412

src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt

+7 −6
Original line number Diff line number Diff line
@@ -53,11 +53,12 @@ class ClockPickerRepositoryImpl( 
    override val allClocks: Flow<List<ClockMetadataModel>> =

        callbackFlow {

                fun send() {

                    val activeClockId = registry.activeClockId

                    val allClocks =

                        registry

                            .getClocks()

                            .filter { "NOT_IN_USE" !in it.clockId }

                            .map { it.toModel(isSelected = it.clockId == registry.currentClockId) }

                        registry.getClocks().map {

                            it.toModel(isSelected = it.clockId == activeClockId)

                        }



                    trySend(allClocks)

                }
@@ -84,12 +85,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(

                                isSelected = true,

                                selectedColorId = metadata?.getSelectedColorId(),