From b767c041b9bb3a31ba05defaeb525d493948ecf4 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:48:41 +0800
Subject: [PATCH] Load Cronet from Google Play services

---
 app/build.gradle.kts                                     | 3 ++-
 app/src/main/java/com/hippo/ehviewer/EhApplication.kt    | 2 ++
 app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d5b0d24ef..b226b4ff2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -250,7 +250,8 @@ dependencies {
     implementation("io.ktor:ktor-io-jvm:$ktor")
     implementation("io.ktor:ktor-utils-jvm:$ktor")
 
-    implementation("org.chromium.net:cronet-embedded:113.5672.61")
+    implementation("org.chromium.net:cronet-api:113.5672.61")
+    implementation("com.google.android.gms:play-services-cronet:18.0.1")
 
     val serialization = "1.5.1"
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serialization")
diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 69aa2b43e..f38057b9e 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -25,6 +25,7 @@ import androidx.lifecycle.coroutineScope
 import coil.ImageLoaderFactory
 import coil.decode.ImageDecoderDecoder
 import coil.util.DebugLogger
+import com.google.android.gms.net.CronetProviderInstaller
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.data.GalleryDetail
@@ -77,6 +78,7 @@ class EhApplication : Application(), ImageLoaderFactory {
             handler?.uncaughtException(t, e)
         }
         super.onCreate()
+        CronetProviderInstaller.installProvider(appCtx)
         System.loadLibrary("ehviewer")
         System.loadLibrary("ehviewer_rust")
         ReadableTime.initialize(this)
diff --git a/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
index 6b1770cd2..6ea24f838 100644
--- a/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
@@ -1,6 +1,7 @@
 package com.hippo.ehviewer.util
 
+import com.google.android.gms.net.CronetProviderInstaller
 import com.hippo.ehviewer.Settings
 
 val isCronetSupported: Boolean
-    get() = Settings.enableQuic && isAtLeastQ
+    get() = Settings.enableQuic && isAtLeastQ && CronetProviderInstaller.isInstalled()