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

Commit ec9778ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix media removal issue when media is updated" into main

parents 0f5e3e3d 59d537b9
Loading
Loading
Loading
Loading
+19 −2
Original line number Diff line number Diff line
@@ -845,8 +845,25 @@ constructor(
        commonViewModels.addAll(viewModels)

        // Ensure we only show the needed UMOs in media carousel.
        val viewSet = viewModels.toHashSet()
        controllerByViewModel.filter { !viewSet.contains(it.key) }.forEach { onRemoved(it.key) }
        val viewIds =
            viewModels
                .map { mediaCommonViewModel ->
                    when (mediaCommonViewModel) {
                        is MediaCommonViewModel.MediaControl ->
                            mediaCommonViewModel.instanceId.toString()
                        is MediaCommonViewModel.MediaRecommendations -> mediaCommonViewModel.key
                    }
                }
                .toHashSet()
        controllerByViewModel
            .filter {
                when (val viewModel = it.key) {
                    is MediaCommonViewModel.MediaControl ->
                        !viewIds.contains(viewModel.instanceId.toString())
                    is MediaCommonViewModel.MediaRecommendations -> !viewIds.contains(viewModel.key)
                }
            }
            .forEach { onRemoved(it.key) }
    }

    private suspend fun getMediaLockScreenSetting(): Boolean {