capacitor-plugin-playlist 0.11.1 → 0.11.4

package/android/build.gradle

@@ -25,7 +25,13 @@ ext {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+
+// AGP 9+ (consuming apps) provides built-in Kotlin; applying kotlin-android there fails.
+// Standalone `./gradlew test` (CI) still uses AGP 8.x from this module's buildscript.
+def agpMajorVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
+if (agpMajorVersion < 9) {
+    apply plugin: 'kotlin-android'
+}
 
 android {
     namespace = "org.dwbn.plugins.playlist"
@@ -40,7 +46,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     lintOptions {
@@ -52,9 +58,11 @@ android {
     }
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_21
+if (agpMajorVersion < 9) {
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_21
+        }
     }
 }
 

package/android/src/main/java/org/dwbn/plugins/playlist/PlaylistPlugin.kt

@@ -311,13 +311,16 @@ public class PlaylistPlugin : Plugin(), OnStatusReportListener {
         Handler(Looper.getMainLooper()).post {
             val id: String = call.getString("id")!!
             if ("" != id) {
-                val code = id.hashCode()
-                val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
-                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
-                val handler = audioPlayerImpl!!.playlistManager.playlistHandler
-                val alreadyPlaying = handler?.currentMediaPlayer?.isPlaying == true
-                if (!audioPlayerImpl!!.tryResumeVideoHandoffInPlace(seekPosition) && !alreadyPlaying) {
-                    audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
+                val playlistManager = audioPlayerImpl!!.playlistManager
+                val position = playlistManager.findTrackPosition(id)
+                if (position >= 0) {
+                    val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
+                    playlistManager.currentPosition = position
+                    val handler = playlistManager.playlistHandler
+                    val alreadyPlaying = handler?.currentMediaPlayer?.isPlaying == true
+                    if (!audioPlayerImpl!!.tryResumeVideoHandoffInPlace(seekPosition) && !alreadyPlaying) {
+                        playlistManager.beginPlayback(seekPosition, false)
+                    }
                 }
             }
 
@@ -351,13 +354,13 @@ public class PlaylistPlugin : Plugin(), OnStatusReportListener {
         Handler(Looper.getMainLooper()).post {
             val id: String = call.getString("id")!!
             if ("" != id) {
-                // alternatively we could search for the item and set the current index to that item.
-                val code = id.hashCode()
-                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
-
-                val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
-
-                audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
+                val playlistManager = audioPlayerImpl!!.playlistManager
+                val position = playlistManager.findTrackPosition(id)
+                if (position >= 0) {
+                    val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
+                    playlistManager.currentPosition = position
+                    playlistManager.beginPlayback(seekPosition, true)
+                }
             }
             call.resolve()
 

package/android/src/main/java/org/dwbn/plugins/playlist/data/AudioTrack.kt

@@ -5,8 +5,15 @@ import com.devbrackets.android.playlistcore.api.PlaylistItem
 import com.devbrackets.android.playlistcore.manager.BasePlaylistManager
 import org.json.JSONException
 import org.json.JSONObject
+import java.util.concurrent.atomic.AtomicLong
 
 class AudioTrack (private val config: JSONObject) : PlaylistItem {
+    companion object {
+        private val nextPlaylistId = AtomicLong(1)
+    }
+
+    override val id: Long = nextPlaylistId.getAndIncrement()
+
     var bufferPercentFloat = 0f
         set(buff) {
             // There is a bug in MediaProgress where if bufferPercent == 100 it sets bufferPercentFloat
@@ -38,12 +45,6 @@ class AudioTrack (private val config: JSONObject) : PlaylistItem {
         return info
     }
 
-    override val id: Long
-        get() =
-            if (trackId == null) {
-                0
-            } else trackId.hashCode().toLong()
-
     val isStream: Boolean
         get() = config.optBoolean("isStream", false)
 

package/android/src/main/java/org/dwbn/plugins/playlist/manager/PlaylistManager.kt

@@ -104,28 +104,22 @@ class PlaylistManager(application: Application) :
      * List management
      */
     fun setAllItems(items: List<AudioTrack>?, options: PlaylistItemOptions) {
+        val seekStart = when {
+            options.playFromPosition >= 0 -> options.playFromPosition
+            options.retainPosition -> currentProgress?.position ?: 0
+            else -> 0
+        }
+
         clearItems()
         addAllItems(items)
         currentPosition = 0
-        // If the options said to start from a specific position, do so.
-        var seekStart: Long = 0
-        if (options.playFromPosition > 0) {
-            seekStart = options.playFromPosition
-        } else if (options.retainPosition) {
-            val progress = currentProgress
-            if (progress != null) {
-              seekStart = progress.position
-            }
-        }
 
-        // If the options said to start from a specific id, do so.
-        var idStart: String? = null
-        if (options.playFromId != null) {
-            idStart = options.playFromId
-        }
-        if (idStart != null && "" != idStart) {
-            val code = idStart.hashCode()
-            setCurrentItem(code.toLong())
+        // If the requested id exists, start there; otherwise keep the first track.
+        options.playFromId?.let { trackId ->
+            val position = findTrackPosition(trackId)
+            if (position != INVALID_POSITION) {
+                currentPosition = position
+            }
         }
 
         // We assume that if the playlist is fully loaded in one go,
@@ -307,18 +301,16 @@ class PlaylistManager(application: Application) :
     }
 
     private fun resolveItemPosition(trackIndex: Int, trackId: String): Int {
-        var resolvedPosition = -1
-        if (trackIndex >= 0 && trackIndex < audioTracks.size) {
-            resolvedPosition = trackIndex
-        } else if ("" != trackId) {
-            val itemPos = getPositionForItem(trackId.hashCode().toLong())
-            if (itemPos != INVALID_POSITION) {
-                resolvedPosition = itemPos
-            }
+        return when {
+            trackIndex in audioTracks.indices -> trackIndex
+            trackId.isNotEmpty() -> findTrackPosition(trackId)
+            else -> INVALID_POSITION
         }
-        return resolvedPosition
     }
 
+    internal fun findTrackPosition(trackId: String): Int =
+        audioTracks.indexOfFirst { it.trackId == trackId }
+
     fun getVolumeLeft(): Float {
         return volumeLeft
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-playlist",
-  "version": "0.11.1",
+  "version": "0.11.4",
   "description": "Playlist ",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",