Adapt current item in DetailActivity if needed

Author: 1ud0v1c

Diff for: app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
 
         <service
             android:name=".player.MediaPlaybackService"
-            android:permission="false">
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>

Diff for: app/src/main/java/com/ludovic/vimont/deezeropenapi/helper/AudioHelper.kt

@@ -8,6 +8,7 @@ import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import com.ludovic.vimont.deezeropenapi.model.Album
 import com.ludovic.vimont.deezeropenapi.model.Track
+import com.ludovic.vimont.deezeropenapi.player.AudioSessionCallback
 
 /**
  * Simplify the interaction with MediaSession. We create the builder and keep it in memory like
@@ -51,9 +52,24 @@ object AudioHelper {
             .build()
     }
 
+
     fun getPlaybackState(playbackState: Int, positionInCurrentTrack: Long, actions: Long = fullPlaybackStateAction): PlaybackStateCompat? {
         return playbackStateCompatBuilder.setState(playbackState, positionInCurrentTrack, PLAYBACK_SPEED)
             .setActions(actions)
             .build()
     }
+
+    fun getPlaybackState(playbackState: Int,
+                         positionInCurrentTrack: Long,
+                         currentTrack: Int? = null,
+                         actions: Long = fullPlaybackStateAction): PlaybackStateCompat? {
+        val bundle = Bundle()
+        currentTrack?.let { track ->
+            bundle.putInt(AudioSessionCallback.KEY_CURRENT_TRACK, track)
+        }
+        return playbackStateCompatBuilder.setState(playbackState, positionInCurrentTrack, PLAYBACK_SPEED)
+            .setActions(actions)
+            .setExtras(bundle)
+            .build()
+    }
 }

Diff for: app/src/main/java/com/ludovic/vimont/deezeropenapi/player/AudioSessionCallback.kt

@@ -125,7 +125,7 @@ class AudioSessionCallback(private val service: MediaPlaybackService,
         setCurrentMetaData(currentIndex)
 
         val currentPlayBackState: Int = mediaSession.controller.playbackState.state
-        val playBackState: PlaybackStateCompat? = AudioHelper.getPlaybackState(PlaybackStateCompat.STATE_SKIPPING_TO_PREVIOUS, 0)
+        val playBackState: PlaybackStateCompat? = AudioHelper.getPlaybackState(PlaybackStateCompat.STATE_SKIPPING_TO_PREVIOUS, 0, currentIndex)
         mediaSession.setPlaybackState(playBackState)
         adaptPlayerState(currentPlayBackState)
     }
@@ -141,7 +141,7 @@ class AudioSessionCallback(private val service: MediaPlaybackService,
         setCurrentMetaData(currentIndex)
 
         val currentPlayBackState: Int = mediaSession.controller.playbackState.state
-        val playBackState: PlaybackStateCompat? = AudioHelper.getPlaybackState(PlaybackStateCompat.STATE_SKIPPING_TO_NEXT, 0)
+        val playBackState: PlaybackStateCompat? = AudioHelper.getPlaybackState(PlaybackStateCompat.STATE_SKIPPING_TO_NEXT, 0, currentIndex)
         mediaSession.setPlaybackState(playBackState)
         adaptPlayerState(currentPlayBackState)
     }

Diff for: app/src/main/java/com/ludovic/vimont/deezeropenapi/screens/detail/DetailMediaSessionHandler.kt

@@ -60,6 +60,13 @@ class DetailMediaSessionHandler(private val detailActivity: DetailActivity): Med
         val mediaController: MediaControllerCompat = MediaControllerCompat.getMediaController(detailActivity)
         mediaController.registerCallback(controllerCallback)
         detailActivity.computeQueue(mediaController)
+
+        mediaController.playbackState.extras?.let { bundle ->
+            if (bundle.containsKey(AudioSessionCallback.KEY_CURRENT_TRACK)) {
+                val newValue: Int = bundle.getInt(AudioSessionCallback.KEY_CURRENT_TRACK)
+                detailActivity.updateAdapterViewHolderState(newValue)
+            }
+        }
     }
 
     override fun onConnectionSuspended() {