From fe224b097af3ff04d4feb148073085dcbd91d6af Mon Sep 17 00:00:00 2001 From: Antoine POPINEAU Date: Fri, 10 Jul 2020 18:46:49 +0200 Subject: [PATCH] Re-enabled media session on service start. Do not condition radio resumption to having a cookie, since those are only valid when authenticated anonymously. --- .../github/apognu/otter/playback/PlayerService.kt | 2 ++ .../github/apognu/otter/playback/RadioPlayer.kt | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt index 8777857..1af8731 100644 --- a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt +++ b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt @@ -97,6 +97,8 @@ class PlayerService : Service() { } } + Otter.get().mediaSession.active = true + mediaControlsManager = MediaControlsManager(this, scope, Otter.get().mediaSession.session) player = SimpleExoPlayer.Builder(this).build().apply { diff --git a/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt b/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt index a66536a..f40a016 100644 --- a/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt +++ b/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt @@ -35,14 +35,19 @@ class RadioPlayer(val context: Context, val scope: CoroutineScope) { private val favoritedRepository = FavoritedRepository(context) init { + Cache.get(context, "radio_type")?.readLine()?.log() + Cache.get(context, "radio_id")?.readLine()?.log() + Cache.get(context, "radio_session")?.readLine()?.log() + Cache.get(context, "radio_cookie")?.readLine()?.log() + Cache.get(context, "radio_type")?.readLine()?.let { radio_type -> Cache.get(context, "radio_id")?.readLine()?.toInt()?.let { radio_id -> Cache.get(context, "radio_session")?.readLine()?.toInt()?.let { radio_session -> - Cache.get(context, "radio_cookie")?.readLine()?.let { radio_cookie -> - currentRadio = Radio(radio_id, radio_type, "", "") - session = radio_session - cookie = radio_cookie - } + val cachedCookie = Cache.get(context, "radio_cookie")?.readLine() + + currentRadio = Radio(radio_id, radio_type, "", "") + session = radio_session + cookie = cachedCookie } } }