fix(app): remove thread-synchronisation from Player volume update

fixes #594 fixes #593
trynoice · Apr 23, 2021 · 14f45e9 · 14f45e9
1 parent cd43a45
commit 14f45e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/PresetFragment.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/PresetFragment.kt
@@ -3,6 +3,7 @@ package com.github.ashutoshgngwr.noice.fragment
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -85,14 +86,8 @@ class PresetFragment : Fragment() {
   fun onPlayerManagerUpdate(event: MediaPlayerService.OnPlayerManagerUpdateEvent) {
     val oldPresetPos = activePresetPos
     activePresetPos = Preset.from("", event.players.values).let { dataSet.indexOf(it) }
-
-    if (activePresetPos != oldPresetPos) {
-      adapter?.notifyItemChanged(oldPresetPos)
-
-      if (activePresetPos > -1) {
-        adapter?.notifyItemChanged(activePresetPos)
-      }
-    }
+    adapter?.notifyItemChanged(oldPresetPos)
+    adapter?.notifyItemChanged(activePresetPos)
   }
 
   private fun updateEmptyListIndicatorVisibility() {

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/sound/player/Player.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/sound/player/Player.kt
@@ -44,10 +44,8 @@ class Player(val soundKey: String, playbackStrategyFactory: PlaybackStrategyFact
    * Sets the volume for the [Player] using current [PlaybackStrategy].
    */
   fun setVolume(volume: Int) {
-    handler.post {
-      this.volume = volume
-      this.playbackStrategy.setVolume(volume.toFloat() / MAX_VOLUME)
-    }
+    this.volume = volume
+    this.playbackStrategy.setVolume(volume.toFloat() / MAX_VOLUME)
   }
 
   /**

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
@@ -286,12 +286,11 @@ class PlayerManager(private val context: Context) :
       handler.removeCallbacksAndMessages(DELAYED_STOP_CALLBACK_TOKEN)
       state = State.PLAYING
       players.values.forEach { it.play() }
+      notifyChanges()
     } else if (!playbackDelayed) {
       // request audio focus only if audio focus is not delayed from any previous requests
       requestAudioFocus()
     }
-
-    notifyChanges()
   }
 
   /**
@@ -372,6 +371,6 @@ class PlayerManager(private val context: Context) :
     }
 
     mediaSession.setPlaybackState(playbackStateBuilder.build())
-    onPlayerUpdateListener()
+    onPlayerUpdateListener.invoke()
   }
 }
diff --git a/app/src/test/java/com/github/ashutoshgngwr/noice/sound/player/PlayerTest.kt b/app/src/test/java/com/github/ashutoshgngwr/noice/sound/player/PlayerTest.kt
@@ -47,7 +47,6 @@ class PlayerTest {
   @Test
   fun testSetVolume() {
     player.setVolume(16)
-    ShadowLooper.runUiThreadTasks()
     verify(exactly = 1) { mockPlaybackStrategy.setVolume(16f / Player.MAX_VOLUME) }
     assertEquals(16, player.volume)
   }