@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2790 → 0.17.27-alpha.2794

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

@@ -11,10 +11,6 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
-import android.view.ViewTreeObserver
-import android.webkit.WebView
-import com.twentyfouri.tvbridge.R
-import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
@@ -82,15 +78,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
         loadUrl(config.baseUrl)
 
-        val mainWebView = findViewById<WebView>(R.id.webview)
-
-        window.decorView.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View?, newFocus: View? ->
-            if (newFocus is WebView) {
-                Log.d("FocusDebug", "WebView získal focus, vracím zpět na hlavní view")
-                mainWebView.requestFocus()
-            }
-        }
-
         initialized = true
     }
 
@@ -243,7 +230,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
     override fun loadUrl(url: String?) {
         if (url.isNullOrEmpty()) return
-
         binding.webview.visibility = View.VISIBLE
         binding.webview.loadUrl(url)
         if (url.startsWith("http")) {
@@ -256,4 +242,4 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)
         }
     }
-}
+}

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.2790",
+	"version": "0.17.27-alpha.2794",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {