From 63292f07c593ee7e7398ad04cba26f073dd2d2b2 Mon Sep 17 00:00:00 2001 From: Ryan Harg <3821-ryan_harg@users.noreply.dev.funkwhale.audio> Date: Wed, 8 Sep 2021 07:51:49 +0000 Subject: [PATCH] #90: Use correct radio identifier for user radio --- app/src/main/java/audio/funkwhale/ffa/adapters/RadiosAdapter.kt | 2 +- app/src/main/java/audio/funkwhale/ffa/playback/RadioPlayer.kt | 1 + changes/changelog.d/90.bugfix | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/90.bugfix diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/RadiosAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/RadiosAdapter.kt index fb24a52..12b88b1 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/RadiosAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/RadiosAdapter.kt @@ -56,7 +56,7 @@ class RadiosAdapter( else -> listOf( Radio( 0, - "actor_content", + "actor-content", context.getString(R.string.radio_your_content_title), context.getString(R.string.radio_your_content_description), username diff --git a/app/src/main/java/audio/funkwhale/ffa/playback/RadioPlayer.kt b/app/src/main/java/audio/funkwhale/ffa/playback/RadioPlayer.kt index 35a9c86..8f299da 100644 --- a/app/src/main/java/audio/funkwhale/ffa/playback/RadioPlayer.kt +++ b/app/src/main/java/audio/funkwhale/ffa/playback/RadioPlayer.kt @@ -105,6 +105,7 @@ class RadioPlayer(val context: Context, val scope: CoroutineScope) { prepareNextTrack(true) } catch (e: Exception) { + e.logError() withContext(Main) { context.toast(context.getString(R.string.radio_playback_error)) } diff --git a/changes/changelog.d/90.bugfix b/changes/changelog.d/90.bugfix new file mode 100644 index 0000000..1b787f2 --- /dev/null +++ b/changes/changelog.d/90.bugfix @@ -0,0 +1 @@ +Use correct radio identifier for user radio (#90) \ No newline at end of file