diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9a1e01fe4b6..efd456b0bb7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -170,10 +170,10 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1") testImplementation("org.altbeacon:android-beacon-library:2.19.2") - implementation("com.google.android.exoplayer:exoplayer-core:2.14.2") - implementation("com.google.android.exoplayer:exoplayer-hls:2.14.2") - implementation("com.google.android.exoplayer:exoplayer-ui:2.14.2") - implementation("com.google.android.exoplayer:extension-cronet:2.14.2") + implementation("com.google.android.exoplayer:exoplayer-core:2.15.1") + implementation("com.google.android.exoplayer:exoplayer-hls:2.15.1") + implementation("com.google.android.exoplayer:exoplayer-ui:2.15.1") + implementation("com.google.android.exoplayer:extension-cronet:2.15.1") } // Disable to fix memory leak and be compatible with the configuration cache. diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt index 1b0f9d548bd..49b2e1a6b7f 100644 --- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt +++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt @@ -50,7 +50,6 @@ import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.Player import com.google.android.exoplayer2.SimpleExoPlayer import com.google.android.exoplayer2.ext.cronet.CronetDataSource -import com.google.android.exoplayer2.ext.cronet.CronetEngineWrapper import com.google.android.exoplayer2.source.DefaultMediaSourceFactory import com.google.android.exoplayer2.ui.AspectRatioFrameLayout import com.google.android.exoplayer2.ui.PlayerView @@ -87,6 +86,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext +import org.chromium.net.CronetEngine import org.json.JSONObject import java.util.concurrent.Executors import javax.inject.Inject @@ -641,9 +641,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi exoPlayer = SimpleExoPlayer.Builder(applicationContext).setMediaSourceFactory( DefaultMediaSourceFactory( CronetDataSource.Factory( - CronetEngineWrapper( - applicationContext - ), + CronetEngine.Builder(applicationContext).build(), Executors.newSingleThreadExecutor() ) )