fix(ts): add null to getCurrentTrack return type (#1681)

doublesymmetry · Sep 3, 2022 · 096ec68 · 096ec68
1 parent 6b25dfe
commit 096ec68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt b/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
@@ -466,8 +466,12 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM
     @ReactMethod
     fun getCurrentTrack(callback: Promise) = scope.launch {
         if (verifyServiceBoundOrReject(callback)) return@launch
-
-        callback.resolve(musicService.getCurrentTrackIndex())
+        val currentTrackIndex = musicService.getCurrentTrackIndex()
+        if (currentTrackIndex >= 0 || currentTrackIndex < musicService.tracks.size) {
+            callback.resolve(currentTrackIndex)
+        } else {
+            callback.resolve(null)
+        }
     }
 
     @ReactMethod

diff --git a/src/trackPlayer.ts b/src/trackPlayer.ts
@@ -276,7 +276,7 @@ async function getQueue(): Promise<Track[]> {
 /**
  * Gets the index of the current track.
  */
-async function getCurrentTrack(): Promise<number> {
+async function getCurrentTrack(): Promise<number | null> {
   return TrackPlayer.getCurrentTrack();
 }