From 2d4dccb2a50040cc01dc11ebef7f67d5458fdc08 Mon Sep 17 00:00:00 2001 From: Jakob Malmo Date: Wed, 1 Oct 2025 23:19:04 +0200 Subject: [PATCH] fix(android): guard nullable originalItem before Arguments.fromBundle on v4 --- .../com/doublesymmetry/trackplayer/module/MusicModule.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 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 index b2409a099..28c987b1d 100644 --- a/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt +++ b/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt @@ -545,7 +545,7 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM if (verifyServiceBoundOrReject(callback)) return@launch if (index >= 0 && index < musicService.tracks.size) { - callback.resolve(Arguments.fromBundle(musicService.tracks[index].originalItem)) + callback.resolve(musicService.tracks[index].originalItem?.let { Arguments.fromBundle(it) }) } else { callback.resolve(null) } @@ -584,9 +584,8 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM if (verifyServiceBoundOrReject(callback)) return@launch callback.resolve( if (musicService.tracks.isEmpty()) null - else Arguments.fromBundle( - musicService.tracks[musicService.getCurrentTrackIndex()].originalItem - ) + else musicService.tracks[musicService.getCurrentTrackIndex()] + .originalItem?.let { Arguments.fromBundle(it) } ) }