Save current track info on track change

Author: naveensingh

app/src/main/kotlin/com/simplemobiletools/musicplayer/interfaces/QueueItemsDao.kt

@@ -20,8 +20,11 @@ interface QueueItemsDao {
     @Query("SELECT * FROM queue_items WHERE is_current = 1")
     fun getCurrent(): QueueItem?
 
+    @Query("UPDATE queue_items SET is_current = 1 WHERE track_id = :trackId")
+    fun saveCurrentTrack(trackId: Long)
+    
     @Query("UPDATE queue_items SET is_current = 1, last_position = :lastPosition WHERE track_id = :trackId")
-    fun saveCurrentTrack(trackId: Long, lastPosition: Int)
+    fun saveCurrentTrackProgress(trackId: Long, lastPosition: Int)
 
     @Query("UPDATE queue_items SET track_order = :order WHERE track_id = :trackId")
     fun setOrder(trackId: Long, order: Int)

app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt

@@ -1100,13 +1100,17 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
     }
 
     private fun saveTrackProgress() {
-        if (mCurrTrack != null && getPosition() != 0) {
+        if (mCurrTrack != null) {
             ensureBackgroundThread {
                 val trackId = mCurrTrack?.mediaStoreId ?: return@ensureBackgroundThread
-                val position = getPosition() ?: return@ensureBackgroundThread
+                val position = getPosition()
                 queueDAO.apply {
                     resetCurrent()
-                    saveCurrentTrack(trackId, position)
+                    if (position == null || position == 0) {
+                        saveCurrentTrack(trackId)
+                    } else {
+                        saveCurrentTrackProgress(trackId, position)
+                    }
                 }
             }
         }