From cced256088aece2e997281228139b037068b8e69 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Wed, 25 Aug 2021 21:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                 |  7 +++++--
 .../legado/app/help/http/cronet/CronetLoader.kt  | 16 ++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 58a908646..b3b9ae1ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -182,8 +182,11 @@ dependencies {
 
     //网络
     implementation('com.squareup.okhttp3:okhttp:4.9.1')
-    implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
-    googleImplementation 'com.google.android.gms:play-services-cronet:17.0.0'
+    compileOnly('com.google.android.gms:play-services-cronet:17.0.1'){
+        exclude(group: "org.chromium.net")
+    }
+    googleImplementation('com.google.android.gms:play-services-cronet:17.0.1')
+    appImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
 
     //Glide
     implementation('com.github.bumptech.glide:glide:4.12.0')
diff --git a/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt b/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt
index 0625a2311..f2d8ec058 100644
--- a/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt
+++ b/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt
@@ -11,7 +11,6 @@ import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.utils.getPrefString
 import io.legado.app.utils.putPrefString
 import org.chromium.net.CronetEngine
-import org.chromium.net.impl.ImplVersion
 import splitties.init.appCtx
 import java.io.*
 import java.math.BigInteger
@@ -24,22 +23,23 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() {
     //https://storage.googleapis.com/chromium-cronet/android/92.0.4515.127/Release/cronet/libs/arm64-v8a/libcronet.92.0.4515.127.so
     //https://cdn.jsdelivr.net/gh/ag2s20150909/cronet-repo@92.0.4515.127/cronet/92.0.4515.127/arm64-v8a/libcronet.92.0.4515.127.so.js
     private const val TAG = "CronetLoader"
-    private val soName = "libcronet." + ImplVersion.getCronetVersion() + ".so"
+    private const val soVersion = "92.0.4515.159"
+    private const val soName = "libcronet.$soVersion.so"
     private val soUrl: String
     private val md5Url: String
     private val soFile: File
     private val downloadFile: File
     private var cpuAbi: String? = null
     private var md5: String? = appCtx.getPrefString("soMd5")
-    private val version: String? = appCtx.getPrefString("soVersion", ImplVersion.getCronetVersion())
+    private val version: String? = appCtx.getPrefString("soVersion", soVersion)
     var download = false
 
     init {
         soUrl = ("https://storage.googleapis.com/chromium-cronet/android/"
-                + ImplVersion.getCronetVersion() + "/Release/cronet/libs/"
+                + soVersion + "/Release/cronet/libs/"
                 + getCpuAbi(appCtx) + "/" + soName)
         md5Url = ("https://cdn.jsdelivr.net/gh/ag2s20150909/cronet-repo@" +
-                ImplVersion.getCronetVersion() + "/cronet/" + ImplVersion.getCronetVersion() + "/"
+                soVersion + "/cronet/" + soVersion + "/"
                 + getCpuAbi(appCtx) + "/" + soName + ".js")
         val dir = appCtx.getDir("cronet", Context.MODE_PRIVATE)
         soFile = File(dir.toString() + "/" + getCpuAbi(appCtx), soName)
@@ -147,9 +147,9 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() {
     @Suppress("SameParameterValue")
     private fun getUrlMd5(url: String): String? {
         //这样在下载成功后，遇到无网条件下，只要版本未发生变化也能获取md5
-        if (md5 != null && md5!!.length == 32 && version == ImplVersion.getCronetVersion()) {
+        if (md5 != null && md5!!.length == 32 && version == soVersion) {
             appCtx.putPrefString("soMd5", md5)
-            appCtx.putPrefString("soVersion", ImplVersion.getCronetVersion())
+            appCtx.putPrefString("soVersion", soVersion)
             return md5
         }
         val inputStream: InputStream
@@ -168,7 +168,7 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() {
             //成功获取到md5后保存md5和版本
             if (tmd5.length == 32) {
                 appCtx.putPrefString("soMd5", tmd5)
-                appCtx.putPrefString("soVersion", ImplVersion.getCronetVersion())
+                appCtx.putPrefString("soVersion", soVersion)
             }
 
             return tmd5