From 874b79d0d52cd68740d3fe66969baa8eccf9f2dc Mon Sep 17 00:00:00 2001 From: Antoine POPINEAU Date: Sun, 21 Jun 2020 16:15:52 +0200 Subject: [PATCH] Fixed blocking issue when leaving MainActivity where playback state would no longer be reflected in Now Playing. --- .../github/apognu/otter/activities/MainActivity.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt index 280475b..d6c9ec4 100644 --- a/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt +++ b/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt @@ -73,16 +73,16 @@ class MainActivity : AppCompatActivity() { .replace(R.id.container, BrowseFragment()) .commit() - if (bus == null) { - watchEventBus() - } - CommandBus.send(Command.RefreshService) } override fun onResume() { super.onResume() + if (bus == null) { + watchEventBus() + } + CommandBus.send(Command.RefreshService) startService(Intent(this, PlayerService::class.java)) @@ -150,9 +150,7 @@ class MainActivity : AppCompatActivity() { // CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.cast) - menu?.let { - menu.findItem(R.id.nav_only_my_music).isChecked = Settings.getScope() == "me" - } + menu?.findItem(R.id.nav_only_my_music)?.isChecked = Settings.getScope() == "me" return true }