fix(app): pause with a delayed stop callback on becoming noisy

resolves #426
trynoice · Dec 4, 2020 · 15acf89 · 15acf89
1 parent b9686a3
commit 15acf89
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt
@@ -109,7 +109,7 @@ class MediaPlayerService : Service() {
     override fun onReceive(context: Context?, intent: Intent?) {
       if (intent?.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) {
         Log.i(TAG, "Becoming noisy... Pause playback!")
-        playerManager.pause()
+        playerManager.pauseAndWaitBeforeStop()
       }
     }
   }

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/sound/player/PlayerManager.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/sound/player/PlayerManager.kt
@@ -245,11 +245,12 @@ class PlayerManager(private val context: Context) :
     notifyChanges()
   }
 
-  private fun pauseAndWaitBeforeStop() {
+  fun pauseAndWaitBeforeStop() {
     pause()
-    Log.d(TAG, "scheduling pauseAndWaitBeforeStop callback")
+    Log.d(TAG, "scheduling stop callback")
+    handler.removeCallbacksAndMessages(DELAYED_STOP_CALLBACK_TOKEN) // clear previous callbacks
     HandlerCompat.postDelayed(
-      handler, this::stop, DELAYED_STOP_CALLBACK_TOKEN, TimeUnit.MINUTES.toMillis(1)
+      handler, this::stop, DELAYED_STOP_CALLBACK_TOKEN, TimeUnit.MINUTES.toMillis(5)
     )
   }
 
@@ -345,7 +346,6 @@ class PlayerManager(private val context: Context) :
         PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN,
         0f
       )
-
     }
 
     mediaSession.setPlaybackState(playbackStateBuilder.build())

diff --git a/app/src/test/java/com/github/ashutoshgngwr/noice/sound/player/PlayerManagerTest.kt b/app/src/test/java/com/github/ashutoshgngwr/noice/sound/player/PlayerManagerTest.kt
@@ -30,6 +30,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowLooper
 
 @RunWith(RobolectricTestRunner::class)
 @Config(shadows = [ShadowMediaSession::class, ShadowMediaSessionCompat::class])
@@ -171,6 +172,21 @@ class PlayerManagerTest {
     verify(exactly = 1) { players.getValue("test").pause() }
   }
 
+  @Test
+  fun testPauseAndWaitBeforeStop() {
+    playerManager.pauseAndWaitBeforeStop()
+
+    assertEquals(PlayerManager.State.PAUSED, playerManager.state)
+    assertEquals(PlaybackStateCompat.STATE_PAUSED, ShadowMediaSessionCompat.getLastPlaybackState())
+    assertEquals(1, playerManager.players.size)
+    verify(exactly = 1) { players.getValue("test").pause() }
+
+    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
+    assertEquals(PlayerManager.State.STOPPED, playerManager.state)
+    assertEquals(PlaybackStateCompat.STATE_STOPPED, ShadowMediaSessionCompat.getLastPlaybackState())
+    assertEquals(0, playerManager.players.size)
+  }
+
   @Test
   fun testResumePlayback_whenAudioFocusRequestFails() {
     mockkStatic(AudioManagerCompat::class)