@24i/smartapps-bigscreen-rnv-build-engine 0.17.2-alpha.2163 → 0.17.2-alpha.2164

package/dist/templates/platforms/androidtv/project/amazoniap/build.gradle

@@ -1,10 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -1,22 +1,29 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+        freeCompilerArgs = ['-Xjvm-default=compatibility']
+    }
+
+    packagingOptions {
+        exclude 'META-INF/*.kotlin_module'
+    }
+
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         applicationId 'com.twentyfouri.tvbridge'
         versionCode 1
@@ -44,11 +51,19 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
-        bbg {
+        /*bbg {
             storeFile file('/Users/matus/StudioProjects/Keystores/pureflix.jks')
             storePassword 'freddie12'
             keyPassword 'freddie12'
             keyAlias 'iamflix-app'
+        }*/
+        kan {
+            keyAlias 'ireshet'
+            keyPassword 'applicaster'
+            storeFile file('../keystore/kan11_applicaster.keystore')
+            storePassword 'applicaster'
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
     }
 
@@ -60,7 +75,6 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.pureflix
         }
     }
 
@@ -234,10 +248,19 @@ android {
         bigscreenAppstage {
             // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
             dimension "bridge"
-            versionCode {{APP_VERSION_CODE}}
-            versionName "{{APP_VERSION_NAME}}"
-            applicationId "{{APP_ID}}"
-            resValue "string", "app_name", "{{configProps.appName}}"
+            versionCode 1000100
+            versionName "1.0.1"
+            applicationId "com.twentyfouri.app.appstagebigscreen"
+            resValue "string", "app_name", "Appstage BIGscreen"
+        }
+        kan {
+            // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
+            dimension "bridge"
+            versionCode 5407
+            versionName "54.0.7"
+            applicationId "com.applicaster.il.ch1"
+            resValue "string", "app_name", "כאן BOX"
+            signingConfig signingConfigs.kan
         }
         pureflix {
             // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305
@@ -320,29 +343,28 @@ android.applicationVariants.all { variant ->
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.0'
-    implementation 'com.google.firebase:firebase-analytics:19.0.0'
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.11'
+    implementation 'com.google.firebase:firebase-analytics:21.0.0'
 
-    implementation "com.google.dagger:dagger:2.29"
-    kapt "com.google.dagger:dagger-compiler:2.29"
+    implementation "com.google.dagger:dagger:2.42"
+    kapt "com.google.dagger:dagger-compiler:2.42"
 
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.5.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.0"
-    implementation "com.squareup.okhttp3:okhttp:3.12.11"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
+    implementation "com.squareup.okhttp3:okhttp:4.9.2"
+    implementation "com.twentyfouri.player:exoplayer:0.6.0-alpha.23"
+    implementation 'com.google.android.exoplayer:extension-okhttp:2.17.1'
     implementation "com.jumptvs.jumpkit:jumpkit-exoplayer:2.6.5"
 
-    implementation "com.twentyfouri.smartexoplayer:smartexoplayer:4.0.23"
-    implementation "com.twentyfouri.androidcore:chromecast:2.1.5"
-
     implementation project(':common')
     portalImplementation project(':amazoniap')
     portalImplementation project(':googleiap')
@@ -355,11 +377,11 @@ dependencies {
     androidTestImplementation "com.squareup.retrofit2:retrofit-mock:2.5.0"
     androidTestImplementation "com.squareup.okhttp:mockwebserver:2.7.0"
     androidTestImplementation "com.squareup.spoon:spoon-client:1.2.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test:rules:1.3.0"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
-    androidTestImplementation "androidx.test.espresso:espresso-web:3.3.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test:rules:1.4.0"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-web:3.4.0"
     androidTestImplementation('com.github.andrzejchm.RESTMock:android:0.3.1') {
         exclude module: 'support-annotations'
     }

package/dist/templates/platforms/androidtv/project/app/src/bigscreenAppstage/res/raw/configuration.json

@@ -1,5 +1,8 @@
 {
-  "baseUrl": "{{APP_URL}}",
+  "baseUrl": "http://appstage-bigscreen.kan.24imedia.com.s3.amazonaws.com/builds/androidtv/animated_1080/dist/v0.0.9/public/index.html",
+  "customizableUrl": false,
+  "mediaEventPrefix": "player:",
+  "startWithHighVideoQuality": true,
   "drm": {
     "overrideDrmCallback": true
   }

package/dist/templates/platforms/androidtv/project/app/src/kan/java/com/twentyfouri/tvbridge/Flavor.kt

@@ -0,0 +1,5 @@
+package com.twentyfouri.tvbridge
+
+class Flavor: FlavorBase() {
+
+}

package/dist/templates/platforms/androidtv/project/app/src/kan/res/raw/configuration.json

@@ -0,0 +1,9 @@
+{
+  "baseUrl": "http://appstage-bigscreen.kan.24imedia.com.s3.amazonaws.com/builds/androidtv/animated_1080/live/public/index.html",
+  "customizableUrl": false,
+  "mediaEventPrefix": "player:",
+  "startWithHighVideoQuality": true,
+  "drm": {
+    "overrideDrmCallback": true
+  }
+}

package/dist/templates/platforms/androidtv/project/app/src/main/AndroidManifest.xml

@@ -15,6 +15,9 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <uses-permission android:name="com.google.android.assistant.READ_HOTWORD_STATE" />
+    <uses-permission android:name="com.google.android.assistant.WRITE_HOTWORD_STATE" />
+
     <application
         android:name=".global.BaseApplication"
         android:allowBackup="true"
@@ -27,7 +30,9 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".webview.view.WebViewActivity"
-            android:label="@string/app_name">
+            android:hardwareAccelerated="true"
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -36,7 +41,8 @@
             </intent-filter>
         </activity>
         <receiver android:name="com.amazon.device.iap.ResponseReceiver"
-            android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY">
+            android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY"
+            android:exported="true">
             <intent-filter>
                 <action
                     android:name="com.amazon.inapp.purchasing.NOTIFY" />

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -6,18 +6,20 @@ import android.os.Looper
 import android.util.Log
 import android.webkit.JavascriptInterface
 import com.google.gson.JsonObject
-import com.twentyfouri.smartexoplayer.tracks.TrackInfo
-import com.twentyfouri.smartexoplayer.tracks.TrackPreference
+import com.twentyfouri.player.base.TextTrack
+import com.twentyfouri.player.base.TrackKind
 import com.twentyfouri.tvbridge.webview.parser.ContentModelParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.DeviceInfoParser.deviceInfoParsed
 import com.twentyfouri.tvbridge.webview.parser.PlaybackInfoParser.parse
-import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.fromJson
+import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJson
+import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 import com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
 
 @SuppressWarnings("unused")
 class BridgeFromJavaScript(
@@ -67,6 +69,7 @@ class BridgeFromJavaScript(
     fun bridgeJavaScriptToAndroid_SetVideoPath(jsonString: String, mimeType: String?) = launch {
         Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetVideoPath = $jsonString")
         try {
+            viewModel.stopPlayer()
             val contentModel = stringToJson(jsonString)
             contentModel?.streamType = mimeType?.let {
                 when {
@@ -136,7 +139,7 @@ class BridgeFromJavaScript(
      */
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_GetCurrentTime(): Int = runBlocking("bridgeJavaScriptToAndroid_GetCurrentTime") {
-        viewModel.currentPosition / 1000
+        viewModel.currentPosition.roundToInt() / 1000
     } ?: 0
 
     /*
@@ -144,7 +147,7 @@ class BridgeFromJavaScript(
      */
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_GetCurrentTimeFloat(): Float = runBlocking("bridgeJavaScriptToAndroid_GetCurrentTimeFloat") {
-        viewModel.currentPosition.toFloat() / 1000f
+        viewModel.currentPosition.toFloat() / 1000
     } ?: 0f
 
     /*
@@ -163,7 +166,7 @@ class BridgeFromJavaScript(
      */
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_GetTotalTime(): Int = runBlocking("bridgeJavaScriptToAndroid_GetTotalTime") {
-        viewModel.duration / 1000
+        viewModel.duration.roundToInt() / 1000
     } ?: 0
 
     /*
@@ -173,7 +176,7 @@ class BridgeFromJavaScript(
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_SeekTo(seconds: Int) = launch {
         Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SeekTo($seconds)")
-        viewModel.seekToPosition(seconds * 1000)
+        viewModel.seekToPosition(1000 * seconds.toDouble())
     }
 
     /*
@@ -234,13 +237,16 @@ class BridgeFromJavaScript(
     fun bridgeJavaScriptToAndroid_SetTrack(trackJson: String) = launch {
         if (trackJson == "") {
             Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetTrack empty => DEFAULT")
-            viewModel.setSubtitleTrack(TrackPreference.DEFAULT)
+            viewModel.setSubtitleTrack(null)
         } else if (trackJson == "false") {
             Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetTrack false => DISABLED")
-            viewModel.setSubtitleTrack(TrackPreference.DISABLED)
+            viewModel.setSubtitleTrack(TextTrack {
+                id = "text_off"
+                kind = TrackKind.EMPTY
+            })
         } else {
             Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetTrack $trackJson")
-            viewModel.setSubtitleTrack(fromJson(trackJson))
+            viewModel.setSubtitleTrack(textFromJson(trackJson))
         }
     }
 
@@ -250,7 +256,7 @@ class BridgeFromJavaScript(
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_SetAudioTrack(trackJson: String?) = launch {
         Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetAudioTrack ${trackJson ?: "(none)"}")
-        viewModel.setAudioTrack(fromJson(trackJson))
+        viewModel.setAudioTrack(audioFromJson(trackJson))
     }
 
     /*
@@ -370,10 +376,10 @@ class BridgeFromJavaScript(
     companion object {
         const val LOG_TAG = "JavaScriptBridge"
         val DISABLED_AUDIO_TRACK = JsonObject().apply {
-            addProperty("type", TrackInfo.TYPE_AUDIO)
+            addProperty("type", "audio")
         }.toString()
         val DISABLED_SUBTITLE_TRACK = JsonObject().apply {
-            addProperty("type", TrackInfo.TYPE_SUBTITLES)
+            addProperty("type", "subtitles")
         }.toString()
     }
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeToJavaScript.kt

@@ -1,13 +1,20 @@
 package com.twentyfouri.tvbridge.bridge
 
 import android.util.Log
-import com.twentyfouri.smartexoplayer.tracks.TrackInfo
+import com.twentyfouri.player.base.AudioTrack
+import com.twentyfouri.player.base.TextTrack
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript.Companion.LOG_TAG
+import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 
 class BridgeToJavaScript(
-        private val executeJavaScript: (String) -> Unit
+    config: BridgeConfig,
+    private val executeJavaScript: (String) -> Unit
 ) {
+    private val keyEventPrefix: String = config.keyEventPrefix
+    private val mediaEventPrefix: String = config.mediaEventPrefix
+    private val iapEventPrefix: String = config.iapEventPrefix
+
     /**
      * Android 2 JavaScript keyevent Event. Dispatch key custom event to the page document element
      *
@@ -16,7 +23,7 @@ class BridgeToJavaScript(
      */
     fun bridgeAndroidToJavaScript_KeyEvent(keyCode: Int, keyEvent: String) {
         Log.d(LOG_TAG, "bridgeAndroidToJavaScript_KeyEvent keyCode = $keyCode, keyEvent = $keyEvent")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$keyEvent',true,true);evt.keyCode=$keyCode;evt.which=$keyCode;document.dispatchEvent(evt);})())")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$keyEventPrefix$keyEvent',true,true);evt.keyCode=$keyCode;evt.which=$keyCode;(document.activeElement?document.activeElement:document).dispatchEvent(evt);})())")
     }
 
     /**
@@ -25,8 +32,8 @@ class BridgeToJavaScript(
      * @param mediaEvent the mediaEvent which is being sent from the Android code.
      */
     fun bridgeAndroidToJavaScript_MediaEvent(mediaEvent: String) {
-        Log.d(LOG_TAG, "bridgeAndroidToJavaScript_MediaEvent $mediaEvent")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEvent',true,true);document.dispatchEvent(evt);})())")
+        Log.d(LOG_TAG, "bridgeAndroidToJavaScript_MediaEvent $mediaEventPrefix$mediaEvent")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);document.dispatchEvent(evt);})())")
     }
 
     /**
@@ -35,31 +42,42 @@ class BridgeToJavaScript(
      * @param mediaEvent the mediaEvent
      * @param tracks tracks from the players stream.
      */
-    fun bridgeAndroidToJavaScript_MediaTrackEvent(mediaEvent: String, tracks: List<TrackInfo>) {
-        val tracksJson = toJson(tracks)
+    fun bridgeAndroidToJavaScript_MediaTrackEvent(
+        mediaEvent: String,
+        audioTracks: List<AudioTrack>,
+        textTracks: List<TextTrack>
+    ) {
+        val tracksJson = toJson(audioTracks, textTracks)
         Log.d(LOG_TAG, tracksJson)
-        val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEvent',true,true);evt.tracks='$tracksJson';document.dispatchEvent(evt);})())"
+        val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.tracks='$tracksJson';document.dispatchEvent(evt);})())"
         Log.v(LOG_TAG, mediaEventString)
         executeJavaScript(mediaEventString)
     }
 
     fun bridgeAndroidToJavaScript_IAPValidationError(message: String) {
         Log.d(LOG_TAG, "bridgeAndroidToJavaScript_IAPValidationError")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('iapError',true,true);evt.message='$message';document.dispatchEvent(evt);})())")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}iapError',true,true);evt.message='$message';document.dispatchEvent(evt);})())")
     }
 
-    fun bridgeAndroidToJavaScript_IAPValidationSuccess(userId: String, receiptId: String, sku: String) {
-        Log.d(LOG_TAG, "bridgeAndroidToJavaScript_IAPValidationSuccess sku=$sku receiptId=$receiptId")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('iapSuccess',true,true);evt.userId='$userId';evt.receiptId='$receiptId';evt.sku='$sku';document.dispatchEvent(evt);})())")
+    fun bridgeAndroidToJavaScript_IAPValidationSuccess(
+        userId: String,
+        receiptId: String,
+        sku: String
+    ) {
+        Log.d(
+            LOG_TAG,
+            "bridgeAndroidToJavaScript_IAPValidationSuccess sku=$sku receiptId=$receiptId"
+        )
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}iapSuccess',true,true);evt.userId='$userId';evt.receiptId='$receiptId';evt.sku='$sku';document.dispatchEvent(evt);})())")
     }
 
     fun bridgeIAPGetProductDataSuccess(okSkus: String, badSkus: String) {
         Log.d(LOG_TAG, "bridgeIAPGetProductDataSuccess ok=$okSkus bad=$badSkus")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('onInAppProductDetailSuccess',true,true);evt.okSkus=$okSkus;evt.badSkus=$badSkus;document.dispatchEvent(evt);})())")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}onInAppProductDetailSuccess',true,true);evt.okSkus=$okSkus;evt.badSkus=$badSkus;document.dispatchEvent(evt);})())")
     }
 
     fun bridgeIAPGetProductDataFail(reason: String) {
         Log.d(LOG_TAG, "bridgeIAPGetProductDataFail")
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('onInAppProductDetailError',true,true);evt.message='$reason';document.dispatchEvent(evt);})())")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}onInAppProductDetailError',true,true);evt.message='$reason';document.dispatchEvent(evt);})())")
     }
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/configuration/BridgeConfig.kt

@@ -1,9 +1,16 @@
 package com.twentyfouri.tvbridge.configuration
 
+import com.twentyfouri.tvbridge.BuildConfig
+
 class BridgeConfig {
     var baseUrl: String = "http://portal.24imedia.tv/"
     var userAgent: UserAgent = UserAgent()
     var drm: Drm = Drm()
     var isEnabledTouchSound: Boolean = false
     var playerAppName: String? = null
+    var keyEventPrefix: String = ""
+    var mediaEventPrefix: String = ""
+    var iapEventPrefix: String = ""
+    var customizableUrl: Boolean = BuildConfig.DEBUG
+    var startWithHighVideoQuality: Boolean = false
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/di/ActivityModule.kt

@@ -1,7 +1,9 @@
 package com.twentyfouri.tvbridge.global.di
 
 import android.app.Activity
-import com.twentyfouri.smartexoplayer.SmartPlayerFactory
+import com.twentyfouri.player.base.PlayerFactoryBase
+import com.twentyfouri.tvbridge.configuration.BridgeConfig
+import com.twentyfouri.tvbridge.global.utils.PlayerFactoryExoPlayerCustomized
 import dagger.Module
 import dagger.Provides
 
@@ -14,6 +16,6 @@ class ActivityModule(
             activity
 
     @Provides
-    fun providePlayerFactory() =
-            SmartPlayerFactory(activity)
+    fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
+            PlayerFactoryExoPlayerCustomized(config)
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/LoggingDrmCallback.kt

@@ -3,28 +3,28 @@ package com.twentyfouri.tvbridge.global.utils
 import android.util.Base64
 import android.util.Log
 import com.google.android.exoplayer2.drm.ExoMediaDrm
-import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.twentyfouri.smartexoplayer.drm.SmartHttpMediaDrmCallback
-import com.twentyfouri.smartexoplayer.drm.SmartMediaDrmCallback
-import com.twentyfouri.smartexoplayer.model.DrmConfiguration
-import com.twentyfouri.tvbridge.BuildConfig
+import com.google.android.exoplayer2.drm.MediaDrmCallback
 import java.util.*
 
 class LoggingDrmCallback(
-        private val licenseUrl: String?,
-        forceDefaultUrl: Boolean,
-        dataSourceFactory: HttpDataSource.Factory
-) : SmartHttpMediaDrmCallback(licenseUrl, forceDefaultUrl, dataSourceFactory) {
+        private val base: MediaDrmCallback,
+        private val licenseUrl: String? = null
+) : MediaDrmCallback {
+    override fun executeProvisionRequest(
+            uuid: UUID,
+            request: ExoMediaDrm.ProvisionRequest
+    ): ByteArray {
+        return base.executeProvisionRequest(uuid, request)
+    }
 
-    @Throws(Exception::class)
     override fun executeKeyRequest(uuid: UUID, request: ExoMediaDrm.KeyRequest): ByteArray {
-        if (BuildConfig.DEBUG) {
+        if (com.twentyfouri.player.exoplayer.BuildConfig.DEBUG) {
             Log.v(TAG, "DRM Embedded URL: ${request.licenseServerUrl}")
-            Log.v(TAG, "DRM Default URL: ${licenseUrl}")
+            Log.v(TAG, "DRM Default URL: $licenseUrl")
             Log.v(TAG, "DRM request:\n${request.data.toBase64()}")
         }
-        val response = super.executeKeyRequest(uuid, request)
-        if (BuildConfig.DEBUG) {
+        val response = base.executeKeyRequest(uuid, request)
+        if (com.twentyfouri.player.exoplayer.BuildConfig.DEBUG) {
             Log.v(TAG, "DRM response:\n" + response.toBase64())
         }
         return response
@@ -32,15 +32,7 @@ class LoggingDrmCallback(
 
     private fun ByteArray.toBase64(): String = Base64.encodeToString(this, Base64.DEFAULT)
 
-    class Factory(
-            private val licenseUrl: String?,
-            private val forceDefaultUrl: Boolean
-    ) : SmartMediaDrmCallback.Factory {
-        override fun build(drm: DrmConfiguration, dataSourceFactory: HttpDataSource.Factory): SmartMediaDrmCallback =
-                LoggingDrmCallback(licenseUrl, forceDefaultUrl, dataSourceFactory)
-    }
-
     companion object {
-        private const val TAG = "DrmCallback"
+        const val TAG = "DrmCallback"
     }
 }