@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2792 → 0.17.27-alpha.2796

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

@@ -10,7 +10,7 @@ def npawAccountCode = '{{NPAW_ACCOUNT_CODE}}'
 def useNpawPlugin = npawAccountCode != ''
 def useImaSdk = {{ENABLE_IMA_SDK}}
 
-def player_version = '0.8.0-alpha.19'
+def player_version = '0.8.0-alpha.21'
 
 android {
     namespace = 'com.twentyfouri.tvbridge'

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

@@ -46,6 +46,6 @@ class ApplicationModule(
     @Provides
     @Singleton
     fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
-        PlayerFactoryConfigured.buildFactory(config)
+        PlayerFactoryConfigured.buildFactory(config, baseApplication)
 
 }

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

@@ -1,7 +1,17 @@
 package com.twentyfouri.tvbridge.global.utils
 
+import android.app.Application
+import com.twentyfouri.player.bitmovin.NpawConfig
 import com.twentyfouri.player.bitmovin.PlayerFactoryBitmovin
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
-class PlayerFactoryBitmovinCustomized(config: BridgeConfig) :
-    PlayerFactoryBitmovin(config.bitmovinLicense), PlayerFactoryVersion
+class PlayerFactoryBitmovinCustomized(config: BridgeConfig, application: Application) :
+    PlayerFactoryBitmovin(
+        config.bitmovinLicense,
+        if (config.npawAccount.isNotEmpty()) {
+            NpawConfig(config.npawAccount, application)
+        } else {
+            null
+        }
+    ),
+    PlayerFactoryVersion

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

@@ -1,13 +1,14 @@
 package com.twentyfouri.tvbridge.global.utils
 
+import android.app.Application
 import com.twentyfouri.player.base.PlayerFactoryBase
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
 object PlayerFactoryConfigured {
-    fun buildFactory(bridgeConfig: BridgeConfig): PlayerFactoryBase {
+    fun buildFactory(bridgeConfig: BridgeConfig, application: Application): PlayerFactoryBase {
         var factory: PlayerFactoryBase? = null
         if (bridgeConfig.bitmovinLicense.isNotEmpty()) {
-            factory = factory ?: buildBitmovinFactory(bridgeConfig)
+            factory = factory ?: buildBitmovinFactory(bridgeConfig, application)
         }
         if (bridgeConfig.npawAccount.isNotEmpty()) {
             factory = factory ?: buildNpawFactory(bridgeConfig)
@@ -28,8 +29,8 @@ object PlayerFactoryConfigured {
         null
     }
 
-    private fun buildBitmovinFactory(bridgeConfig: BridgeConfig) = try {
-        PlayerFactoryBitmovinCustomized(bridgeConfig)
+    private fun buildBitmovinFactory(bridgeConfig: BridgeConfig, application: Application) = try {
+        PlayerFactoryBitmovinCustomized(bridgeConfig, application)
     } catch (e: NoClassDefFoundError) {
         null
     }

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

@@ -37,6 +37,7 @@ import com.twentyfouri.tvbridge.webview.view.PlayerCache
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import java.io.IOException
 import java.net.NetworkInterface
 import java.util.Locale
 import javax.inject.Inject
@@ -607,7 +608,7 @@ class WebViewModel @Inject constructor(
     val adId get() = try {
         // Let's try Google first
         AdvertisingIdClient.getAdvertisingIdInfo(context).id
-    } catch (e: GooglePlayServicesNotAvailableException) {
+    } catch (e: IOException) {
         // Probably Amazon
         try {
             Settings.Secure.getString(context.contentResolver, "advertising_id")
@@ -619,12 +620,12 @@ class WebViewModel @Inject constructor(
     val limitAdTracking get() = try {
         // Let's try Google first
         AdvertisingIdClient.getAdvertisingIdInfo(context).isLimitAdTrackingEnabled
-    } catch (e: GooglePlayServicesNotAvailableException) {
+    } catch (e: IOException) {
         // Probably Amazon
         try {
             Settings.Secure.getInt(context.contentResolver, "limit_ad_tracking") != 0
         } catch (snfe: Settings.SettingNotFoundException) {
-            null
+            true
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.27-alpha.2792",
+	"version": "0.17.27-alpha.2796",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {