beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Show a better error in InterUriScreen

Browse source
This commit is contained in:
vfsfitvnm 2022-06-19 11:28:44 +02:00
parent 6c15889360
commit a3332d8f06
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt
View file

@ -87,7 +87,7 @@ fun IntentUriScreen(uri: Uri) {
} }
} ?: uri.getQueryParameter("v")?.let { videoId -> } ?: uri.getQueryParameter("v")?.let { videoId ->
YouTube.song(videoId).toNullable()?.map { listOf(it) } YouTube.song(videoId).toNullable()?.map { listOf(it) }
} ?: Outcome.Error.Network } ?: Outcome.Error.Unhandled(Error("Missing URL parameters"))
} }
} }

10
youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/Outcome.kt
View file

@ -57,9 +57,13 @@ fun <T> Outcome<T>?.toNotNull(): Outcome<T?> {
} }
} }
fun <T> Outcome<T?>.toNullable(): Outcome<T>? { fun <T> Outcome<T?>.toNullable(error: Outcome.Error? = null): Outcome<T>? {
return valueOrNull?.let { return when (this) {
Outcome.Success(it) is Outcome.Success -> value?.let { Outcome.Success(it) } ?: error
is Outcome.Recovered -> value?.let { Outcome.Success(it) } ?: error
is Outcome.Initial -> this
is Outcome.Loading -> this
is Outcome.Error -> this
} }
} }