@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.9 → 0.17.6

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/parser/SourceParser.kt

@@ -0,0 +1,89 @@
+package com.twentyfouri.tvbridge.webview.parser
+
+import com.twentyfouri.player.base.*
+import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
+import org.json.JSONException
+import org.json.JSONObject
+import java.net.URI
+import java.util.UUID
+
+object SourceParser {
+    private val sourceSerializer = DefaultSourceSerializer()
+
+    fun stringToJson(jsonString: String?): Source? {
+        if (jsonString.isNullOrEmpty()) return null
+        if (jsonString.startsWith("http://") || jsonString.startsWith("https://")) {
+            return Source {
+                url = URI(jsonString)
+            }
+        }
+
+        try {
+            val jsonSource = JSONObject(jsonString)
+            if (jsonSource.has("streamUrl")) {
+                return parseContentModel(jsonSource)
+            }
+            return sourceSerializer.toSource(jsonSource)
+
+        } catch (e: JSONException) {
+            return null
+        }
+    }
+
+    private fun parseContentModel(jsonSource: JSONObject): Source? {
+        return Source {
+            val streamUrl = jsonSource.getString("streamUrl", null)
+            if (streamUrl.isNullOrEmpty()) return null
+            url = URI(streamUrl)
+
+            mimeType = jsonSource.getString("streamType", null)
+                ?.let { MimeType.parse(it) }
+
+            jsonSource.getObject("drmConfig") { parseDrmModel(it) }
+                ?.also { drm.add(it) }
+        }
+    }
+
+    private fun parseDrmModel(jsonDrm: JSONObject): SourceDrm? {
+        val drmSchemeUuid = jsonDrm.getString("drmSchemeUuid", null)
+        val drmLicenseUri = jsonDrm.getString("drmLicenseUrl", null)
+            ?.let { URI(it) }
+        val drmCustomData = jsonDrm.getObject("drmCustomData") { parseSourceAuthorization (it) }
+        val overrideDrmCallback = jsonDrm.getBoolean("overrideDrmCallback")
+
+        return if (overrideDrmCallback) {
+            SourceDrmOverridden {
+                packageName = when (drmSchemeUuid) {
+                    "widevine", WIDEVINE_UUID -> DrmWidevine.packageName
+                    "playready", PLAYREADY_UUID -> DrmPlayready.packageName
+                    else -> null
+                }
+                licenseServer = drmLicenseUri
+                authorization = drmCustomData
+            }
+        } else {
+            when (drmSchemeUuid) {
+                "widevine", WIDEVINE_UUID -> SourceDrmWidevine {
+                    licenseServer = drmLicenseUri
+                    authorization = drmCustomData
+                }
+                "playready", PLAYREADY_UUID -> SourceDrmPlayready {
+                    licenseServer = drmLicenseUri
+                    authorization = drmCustomData
+                }
+                else -> null
+            }
+        }
+    }
+
+    private fun parseSourceAuthorization(jsonMap: JSONObject): SourceAuthorization? {
+        return SourceAuthorizationHeaders {
+            jsonMap.keys().forEach { key ->
+                headers[key] = jsonMap.getString(key)
+            }
+        }
+    }
+
+    val WIDEVINE_UUID = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"
+    val PLAYREADY_UUID = "9a04f079-9840-4286-ab92-e65be0885f95"
+}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/Mainview.kt

@@ -1,7 +1,5 @@
 package com.twentyfouri.tvbridge.webview.view
 
-import com.twentyfouri.player.base.PlayerBase
-
 /**
  * Created by destivar on 15/02/16.
  */
@@ -9,7 +7,6 @@ interface Mainview {
     fun loadUrl(url: String?)
     fun goFullscreen()
     fun exitFullscreen(width: Int, height: Int, left: Int, top: Int)
-    fun setUrlToView(urlString: String?)
     fun setBlackCurtainVisibility(visibility: Int)
     fun showMessage(message: String?)
     fun requestAudioFocus(): Int

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/PlayerCache.kt

@@ -1,6 +1,6 @@
 package com.twentyfouri.tvbridge.webview.view
 
-import com.twentyfouri.tvbridge.webview.model.ContentModel
+import com.twentyfouri.player.base.Source
 
 class PlayerCache {
     enum class PlayerState {
@@ -11,5 +11,5 @@ class PlayerCache {
     var savedPlayerPosition: Double = 0.0
     var savedPlayerDuration: Double = 0.0
     var savedPlayerState: PlayerState? = null
-    var savedContentModel: ContentModel? = null
+    var savedSource: Source? = null
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/WebViewActivity.kt

@@ -2,9 +2,6 @@ package com.twentyfouri.tvbridge.webview.view
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.graphics.Point
 import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
@@ -14,10 +11,9 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.webkit.WebChromeClient
-import android.webkit.WebView
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -25,7 +21,6 @@ import androidx.databinding.DataBindingUtil
 import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
-import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.R
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.databinding.ActivityWebViewBinding
@@ -76,36 +71,14 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             CookieHandler.setDefault(defaultCookieManager)
         }
 
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_web_view)
-        binding.viewModel = viewModel
-        binding.exoplayerView.playerFactory = viewModel.playerFactory
+        binding = ActivityWebViewBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.playerView.playerFactory = viewModel.playerFactory
         viewModel.attachView(this)
         viewModel.configureWebView(binding.webview)
-        viewModel.player = binding.exoplayerView.player
+        viewModel.player = binding.playerView.player
 
-        binding.url.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                viewModel.appUrl = s.toString()
-            }
-
-            override fun afterTextChanged(s: Editable) {}
-        })
-
-        val appUrl = config.baseUrl
-        if (config.customizableUrl) {
-            viewModel.urlSetterVisible = true
-            viewModel.appUrl = appUrl
-            setUrlToView(appUrl)
-        } else {
-            viewModel.urlSetterVisible = false
-            loadUrl(appUrl)
-        }
-
-        binding.root.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View, newFocus: View ->
-            Log.v("FOCUS", "global focus changed old = $oldFocus")
-            Log.v("FOCUS", "global focus changed new = $newFocus")
-        }
+        loadUrl(config.baseUrl)
 
         initialized = true
     }
@@ -170,13 +143,12 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     public override fun onDestroy() {
         if (initialized) {
             viewModel.releasePlayer()
-            binding.unbind()
         }
         super.onDestroy()
     }
 
     override fun goFullscreen() {
-        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = -1
         layoutParams.height = -1
         layoutParams.leftMargin = 0
@@ -187,8 +159,12 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         display.getSize(size)
         val width = size.x
         val height = size.y
-        binding.exoplayerView.layoutParams = layoutParams
-        binding.exoplayerView.layout(width, height, 0, 0)
+        binding.playerView.layoutParams = layoutParams
+        binding.playerView.measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        binding.playerView.layout(width, height, 0, 0)
     }
 
     override fun launchIapPurchase(sku: String) {
@@ -196,37 +172,22 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     override fun exitFullscreen(width: Int, height: Int, left: Int, top: Int) {
-        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = width
         layoutParams.height = height
         layoutParams.leftMargin = left
         layoutParams.topMargin = top
 
         //set the layout inner and outer sizes
-        binding.exoplayerView.layoutParams = layoutParams
-        binding.exoplayerView.layout(width, height, left, top)
-    }
-
-    override fun setUrlToView(urlString: String?) {
-        binding.url.requestFocus()
-        binding.url.setText(urlString)
-        binding.url.setSelection(urlString?.length ?: 0)
+        binding.playerView.layoutParams = layoutParams
+        binding.playerView.layout(width, height, left, top)
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         when (event.keyCode) {
-            KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_LEFT -> changeFocus()
             KeyEvent.KEYCODE_DPAD_CENTER -> goToUrl()
-            KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_MENU, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
-                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-                    // Send these key presses to the WebView, through a JavaScript bridge.
-                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
-                }
-            }
             else -> {
-                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
-                }
+                viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
             }
         }
         return super.onKeyDown(keyCode, event)
@@ -254,35 +215,19 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     private fun goToUrl() {
-        if (binding.buttonGo.hasFocus()) {
-            viewModel.onClickGo()
-        }
-    }
-
-    private fun changeFocus() {
-        if (binding.url.hasFocus()) {
-            binding.buttonGo.requestFocus()
-        } else if (binding.buttonGo.hasFocus()) {
-            binding.url.requestFocus()
-        }
+        viewModel.onClickGo()
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-            // Send these key presses to the WebView, through a JavaScript bridge.
-            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
-            return true
-        }
-        return super.onKeyUp(keyCode, event)
+        // Send these key presses to the WebView, through a JavaScript bridge.
+        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
+        return true
     }
 
     override fun onKeyLongPress(keyCode: Int, event: KeyEvent): Boolean {
-        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-            // Send these key presses to the WebView, through a JavaScript bridge.
-            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
-            return true
-        }
-        return super.onKeyLongPress(keyCode, event)
+        // Send these key presses to the WebView, through a JavaScript bridge.
+        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
+        return true
     }
 
     override fun loadUrl(url: String?) {
@@ -294,10 +239,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         }
     }
 
-    override fun onBackPressed() {
-        super.onBackPressed()
-    }
-
     companion object {
         private val defaultCookieManager: CookieManager = CookieManager().apply {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.view.KeyEvent
@@ -13,15 +12,9 @@ import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
-import androidx.databinding.BaseObservable
-import androidx.databinding.Bindable
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.SeekParameters
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
-import com.twentyfouri.player.exoplayer.PlayerExoPlayer
-import com.twentyfouri.tvbridge.BR
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript
@@ -29,14 +22,12 @@ import com.twentyfouri.tvbridge.bridge.BridgeToJavaScript
 import com.twentyfouri.tvbridge.common.*
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
+import com.twentyfouri.tvbridge.global.utils.PlayerFactoryVersion
 import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
-import com.twentyfouri.tvbridge.jump.JumpAnalytics
 import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient.BridgeWebViewClientCallback
 import com.twentyfouri.tvbridge.webview.model.AnalyticsPlaybackInfo
-import com.twentyfouri.tvbridge.webview.model.ContentModel
-import com.twentyfouri.tvbridge.webview.model.DrmModel
 import com.twentyfouri.tvbridge.webview.model.MediaEventType
 import com.twentyfouri.tvbridge.webview.view.Mainview
 import com.twentyfouri.tvbridge.webview.view.PlayerCache
@@ -44,7 +35,6 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.net.NetworkInterface
-import java.net.URI
 import javax.inject.Inject
 
 /**
@@ -56,7 +46,7 @@ class WebViewModel @Inject constructor(
         private val config: BridgeConfig,
         private val iapService: IapService,
         val playerFactory: PlayerFactoryBase
-) : BaseObservable(), EventListener {
+) : EventListener {
     var player: PlayerBase? = null
     private var view: Mainview? = null
     private val jsBridge = BridgeToJavaScript(config) { s: String? ->
@@ -64,12 +54,9 @@ class WebViewModel @Inject constructor(
     }
     private val iapCallback = InnerIapCallback()
     private val playerCache = PlayerCache()
-    private val jumpAnalytics = JumpAnalytics()
 
-    private var contentModel: ContentModel? = null
+    private var source: Source? = null
 
-    val videoTrack: VideoTrack?
-        get() = player?.selectedVideoTrack
     val audioTrack: AudioTrack?
         get() = player?.selectedAudioTrack
     val subtitleTrack: TextTrack?
@@ -77,17 +64,6 @@ class WebViewModel @Inject constructor(
 
     var appUrl: String? = null
 
-    var urlSetterVisible: Boolean = false
-        set(value) {
-            if (field == value) return
-            field = value
-            notifyPropertyChanged(BR.urlSetterVisibility)
-        }
-
-    @get:Bindable
-    val urlSetterVisibility: Int
-        get() = if (urlSetterVisible) View.VISIBLE else View.GONE
-
     fun attachView(view: Mainview?) {
         this.view = view
         if (view != null) {
@@ -142,52 +118,42 @@ class WebViewModel @Inject constructor(
 
     fun onClickGo() {
         view?.loadUrl(appUrl)
-        urlSetterVisible = false
         if (BuildConfig.DEBUG) {
             view?.hideKeyboard()
         }
     }
 
-    fun setVideo(contentModel: ContentModel) {
-        logContentModel(contentModel)
-        playDirectly(contentModel)
-    }
-
-    private fun logContentModel(contentModel: ContentModel) {
-        Log.i("BridgeVideo", "Url: " + contentModel.streamUrl)
-        val drmModel = contentModel.drmModel
-        if (drmModel != null) {
-            Log.i("BridgeVideo", "DRM: " + drmModel.drmSchemeUuid)
-            Log.i("BridgeVideo", "LicenseUrl: " + drmModel.drmLicenseUrl)
+    fun setVideo(source: Source) {
+        var adaptedSource = source
+        if (config.drm.shouldOverrideDrmCallback()) {
+            adaptedSource = SourceDrmOverridden.replaceSource(adaptedSource)
         }
+        logSource(adaptedSource)
+        playDirectly(adaptedSource)
     }
 
-    private fun playInExoPlayerDemoApp(contentModel: ContentModel) {
-        val intent = Intent("com.google.android.exoplayer.demo.action.VIEW", Uri.parse(contentModel.streamUrl))
-        val drmModel = contentModel.drmModel
-        if (drmModel != null) {
-            intent.putExtra("drm_scheme", drmModel.drmSchemeUuid)
-            intent.putExtra("drm_license_url", drmModel.drmLicenseUrl)
-        }
-        try {
-            context.startActivity(intent)
-        } catch (e: Exception) {
-            Log.w("WebViewModel", "Failed to start ExoPlayer demo app", e)
+    private fun logSource(source: Source) {
+        Log.i("BridgeVideo", "Url: ${source.url}")
+        when (val drmModel = source.drm.firstOrNull()) {
+            is SourceDrmWidevine -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
+            is SourceDrmPlayready -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
+            is SourceDrmOverridden -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
         }
     }
 
-    private fun playDirectly(contentModel: ContentModel) {
-        this.contentModel = contentModel
-        (player as? PlayerExoPlayer)?.exoPlayer?.also { exoPlayer ->
-            jumpAnalytics.setVideoPlayer(exoPlayer)
-            exoPlayer.setSeekParameters(SeekParameters.CLOSEST_SYNC)
-        }
+    private fun playDirectly(source: Source) {
+        this.source = source
         player?.also { player ->
-            player.source = Source {
-                url = contentModel.streamUrl?.let { URI(it) }
-                mimeType = detectMimeType(contentModel)
-                contentModel.drmModel?.let { buildDrm(it) }?.also { drm.add(it) }
-            }
+            player.source = source
 
             if (isLowEndDevice) {
                 player.trackRestrictions = player.trackRestrictions.buildUpon {
@@ -207,43 +173,6 @@ class WebViewModel @Inject constructor(
         }
     }
 
-    private fun detectMimeType(contentModel: ContentModel) =
-            when (contentModel.streamType) {
-                null, "" -> null
-                ".mpd", "mpd", "dash" -> ManifestDash.mimeType
-                ".ism", "ism", "ss" -> ManifestSmoothStreaming.mimeType
-                ".m3u8", "m3u8", "hls" -> ManifestHls.mimeType
-                else -> null
-            }
-
-    private fun buildDrm(drmModel: DrmModel): SourceDrm? {
-        val drmScheme = drmModel.drmSchemeUuid
-        val useOverride = drmModel.overrideDrmCallback ?: config.drm.shouldOverrideDrmCallback()
-        val useWidevine = drmScheme == "widevine" || drmScheme == C.WIDEVINE_UUID.toString()
-        val usePlayReady = drmScheme == "playready" || drmScheme == C.PLAYREADY_UUID.toString()
-        return when {
-            drmScheme == null -> null
-            useOverride -> SourceDrmOverridden {
-                packageName = when {
-                    useWidevine -> DrmWidevine.packageName
-                    usePlayReady -> DrmPlayready.packageName
-                    else -> ""
-                }
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            useWidevine -> SourceDrmWidevine {
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            usePlayReady -> SourceDrmWidevine {
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            else -> SourceDrmUnrecognized(drmScheme)
-        }
-    }
-
     private val isLowEndDevice: Boolean
         get() = when (Build.MODEL) {
             "AFTB" -> true
@@ -256,9 +185,9 @@ class WebViewModel @Inject constructor(
     }
 
     fun resumePlayer() {
-        val savedContentModel = playerCache.savedContentModel
-        if (playerCache.loadFromCache && savedContentModel != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
-            setVideo(savedContentModel)
+        val savedSource = playerCache.savedSource
+        if (playerCache.loadFromCache && savedSource != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
+            setVideo(savedSource)
             var position = playerCache.savedPlayerPosition
             val player = this.player ?: return
             if (player.live) {
@@ -283,26 +212,24 @@ class WebViewModel @Inject constructor(
 
     fun stopPlayer() {
         view?.setBlackCurtainVisibility(View.VISIBLE)
-        contentModel = null
+        source = null
 
         player?.also { player ->
             player.removeEventListener(Event.ALL, this)
             player.unload()
-            jumpAnalytics.setVideoPlayer(null)
         }
     }
 
     fun releasePlayer() {
         val player = this.player ?: return
-        if (contentModel != null) {
+        if (source != null) {
             playerCache.loadFromCache = true
-            playerCache.savedContentModel = contentModel
+            playerCache.savedSource = source
             playerCache.savedPlayerDuration = player.duration
             playerCache.savedPlayerPosition = player.currentTime
             playerCache.savedPlayerState = if (player.playing) PlayerCache.PlayerState.PLAYING else PlayerCache.PlayerState.PAUSED
         }
         player.unload()
-        jumpAnalytics.setVideoPlayer(null)
     }
 
     val currentPosition: Double
@@ -317,7 +244,7 @@ class WebViewModel @Inject constructor(
     val isPlayerPlaying: Boolean
         get() = player?.playing == true
     val isInPlayer: Boolean
-        get() = player != null && contentModel != null
+        get() = player != null && source != null
 
     fun loadUrl(url: String?) {
         view?.loadUrl(url)
@@ -359,6 +286,7 @@ class WebViewModel @Inject constructor(
             }
             is LoadedMetadataEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.LOADEDMETADATA)
+                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
             is CanPlayEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.CANPLAY)
@@ -389,13 +317,21 @@ class WebViewModel @Inject constructor(
                     jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PAUSE)
                 }
             }
-            is LoadedMetadataEvent,
             is AddAudioTrackEvent, is AddTextTrackEvent,
             is RemoveAudioTrackEvent, is RemoveTextTrackEvent,
             is ChangeAudioTrackEvent, is ChangeTextTrackEvent -> {
                 Log.d("WebViewModel", "onTracksChanged: audio=$audioTrack subtitle=$subtitleTrack")
                 jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
+            is AdBreakStartedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_START)
+            }
+            is AdBreakEndedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_END)
+            }
+            is AdBreaksRescheduledEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
+            }
         }
     }
 
@@ -424,9 +360,7 @@ class WebViewModel @Inject constructor(
     }
 
     fun setPlaybackInfo(playbackInfo: AnalyticsPlaybackInfo) {
-        if ("JUMP" == playbackInfo.name) {
-            jumpAnalytics.setPlaybackInfo(playbackInfo)
-        }
+        // previously used for Jump analytics, not supported with THEO
     }
 
     fun showMessage(message: String?) {
@@ -524,11 +458,14 @@ class WebViewModel @Inject constructor(
     fun detectDeviceInfo(): JSONObject {
         val deviceInfo = JSONObject()
         try {
+            val engineVersion = PlayerFactoryVersion.from(playerFactory)
             deviceInfo.put("deviceBrand", Build.MANUFACTURER)
             deviceInfo.put("deviceModel", Build.MODEL)
             deviceInfo.put("osVersion", Build.VERSION.RELEASE)
             deviceInfo.put("appFlavor", BuildConfig.FLAVOR)
             deviceInfo.put("appVersion", BuildConfig.VERSION_NAME)
+            deviceInfo.put("engineName", engineVersion.engineName)
+            deviceInfo.put("engineVersion", engineVersion.engineVersion)
 
             val drmKeySystems = mutableSetOf<String>()
             playerFactory.getSupportedFormats(context).manifest.forEach { manifest ->