mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-10 15:11:58 +01:00
keep main's setStar when resolving the rebase
The conflict resolution took my side of ItemActions.setStar, which still suspended and returned Result; main's rework made it a plain action the menu calls without a coroutine, with the star filled optimistically. Compiles again, and ItemContextMenuStarTest passes.
This commit is contained in:
@@ -131,7 +131,7 @@ class ItemActions(
|
||||
val downloadArtist: ((ArtistModel) -> Unit)? = null,
|
||||
val cancelArtistDownload: ((ArtistModel) -> Unit)? = null,
|
||||
val deleteArtistDownload: ((ArtistModel) -> Unit)? = null,
|
||||
val setStar: suspend (StarType, String, Boolean) -> Result<Unit> = { _, _, _ -> Result.success(Unit) },
|
||||
val setStar: (StarType, String, Boolean) -> Unit = { _, _, _ -> },
|
||||
val viewAlbum: ((String) -> Unit)? = null,
|
||||
val viewArtist: ((String) -> Unit)? = null,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user