fix null-safety-checks and f bounded polymorphism

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

@@ -24,7 +24,7 @@ class SideLoadedTextTrackList {
             }
             val sideLoadedTextTrackList = SideLoadedTextTrackList()
             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))
             }
             return sideLoadedTextTrackList

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

@@ -228,7 +228,7 @@ class Source {
                 if (propSrcHeadersArray != null) {
                     if (propSrcHeadersArray.size() > 0) {
                         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 value = if (current.hasKey("value")) current.getString("value") else null
                             if (key != null && value != null) {

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

@@ -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) {
-        fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) =
-            dispatcher.dispatchEvent(object : Event<Event<*>>(surfaceId, viewId) {
-                override fun getEventName() = "top${event.eventName.removePrefix("on")}"
-                override fun getEventData() = Arguments.createMap().apply(paramsSetter ?: {})
-            })
+        fun dispatch(event: EventTypes, paramsSetter: (WritableMap.() -> Unit)? = null) {
+            val eventName = "top${event.eventName.removePrefix("on")}"
+            val eventData = Arguments.createMap().apply(paramsSetter ?: {})
+            dispatcher.dispatchEvent(VideoEvent(surfaceId, viewId, eventName, eventData))
+        }
     }
 
     private fun audioTracksToArray(audioTracks: java.util.ArrayList<Track>?): WritableArray =

src/Video.web.tsx

@@ -91,6 +91,7 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
       onError,
       onReadyForDisplay,
       onSeek,
+      onSeekComplete,
       onVolumeChange,
       onEnd,
       onPlaybackStateChanged,
@@ -488,7 +489,16 @@ const Video = forwardRef<VideoRef, ReactVideoProps>(
           })
         }
         onSeeking={() => (isSeeking.current = true)}
-        onSeeked={() => (isSeeking.current = false)}
+        onSeeked={() => {
+                (isSeeking.current = false)
+
+                onSeekComplete?.({
+                    currentTime: (nativeRef.current?.currentTime || 0.0) - cropStartSeconds,
+                    seekTime: 0.0,
+                    target: 0.0,
+
+                })
+            }}
         onVolumeChange={() => {
           if (!nativeRef.current) {
             return;