fix: patch react-native-track-player for Kotlin 2.x null safety

This commit is contained in:
Honey committed 2026-06-10 01:23:20 +02:00
1 parent fac3ab670d
commit 45ec25d257
3 files changed
+431 -2

No files matched your search

@@ -0,0 +1,22 @@
diff --git a/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt b/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
index b2409a0..82374e3 100644
--- a/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
+++ b/node_modules/react-native-track-player/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(Arguments.fromBundle(musicService.tracks[index].originalItem ?: android.os.Bundle()))
} else {
callback.resolve(null)
}
@@ -585,7 +585,7 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM
callback.resolve(
if (musicService.tracks.isEmpty()) null
else Arguments.fromBundle(
- musicService.tracks[musicService.getCurrentTrackIndex()].originalItem
+ musicService.tracks[musicService.getCurrentTrackIndex()].originalItem ?: android.os.Bundle()
)
)
}