railbird/react-native-video
10
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix null-safety-checks and f bounded polymorphism

Browse Source
This commit is contained in:
Loewy
2025-11-26 13:17:41 -07:00
parent 7a6afd52a3
commit 2d953c4c46
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt
View File

@@ -24,7 +24,7 @@ class SideLoadedTextTrackList {
} }
val sideLoadedTextTrackList = SideLoadedTextTrackList() val sideLoadedTextTrackList = SideLoadedTextTrackList()
for (i in 0 until src.size()) { for (i in 0 until src.size()) {
val textTrack: ReadableMap = src.getMap(i) val textTrack: ReadableMap = src.getMap(i) ?: continue
sideLoadedTextTrackList.tracks.add(SideLoadedTextTrack.parse(textTrack)) sideLoadedTextTrackList.tracks.add(SideLoadedTextTrack.parse(textTrack))
} }
return sideLoadedTextTrackList return sideLoadedTextTrackList

2
android/src/main/java/com/brentvatne/common/api/Source.kt
View File

@@ -228,7 +228,7 @@ class Source {
if (propSrcHeadersArray != null) { if (propSrcHeadersArray != null) {
if (propSrcHeadersArray.size() > 0) { if (propSrcHeadersArray.size() > 0) {
for (i in 0 until propSrcHeadersArray.size()) { for (i in 0 until propSrcHeadersArray.size()) {
val current = propSrcHeadersArray.getMap(i) val current = propSrcHeadersArray.getMap(i) ?: continue
val key = if (current.hasKey("key")) current.getString("key") else null val key = if (current.hasKey("key")) current.getString("key") else null
val value = if (current.hasKey("value")) current.getString("value") else null val value = if (current.hasKey("value")) current.getString("value") else null
if (key != null && value != null) { if (key != null && value != null) {

20
android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt
View File

@@ -288,12 +288,22 @@ class VideoEventEmitter {
} }
} }
private class VideoEvent(
surfaceId: Int,
viewId: Int,
private val name: String,
private val data: WritableMap?
) : Event<VideoEvent>(surfaceId, viewId) {
override fun getEventName() = name
override fun getEventData() = data
}
private class EventBuilder(private val surfaceId: Int, private val viewId: Int, private val dispatcher: EventDispatcher) { private class EventBuilder(private val surfaceId: Int, private val viewId: Int, private val dispatcher: EventDispatcher) {
fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) = fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) {
dispatcher.dispatchEvent(object : Event<Event<*>>(surfaceId, viewId) { val eventName = "top${event.eventName.removePrefix("on")}"
override fun getEventName() = "top${event.eventName.removePrefix("on")}" val eventData = Arguments.createMap().apply(paramsSetter ?: {})
override fun getEventData() = Arguments.createMap().apply(paramsSetter ?: {}) dispatcher.dispatchEvent(VideoEvent(surfaceId, viewId, eventName, eventData))
}) }
} }
private fun audioTracksToArray(audioTracks: java.util.ArrayList<Track>?): WritableArray = private fun audioTracksToArray(audioTracks: java.util.ArrayList<Track>?): WritableArray =