From 9540016c917630265d2dc77a23379f267d695cb0 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 15 Apr 2022 08:09:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/book/read/page/provider/ImageProvider.kt   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt
index e11dbdccc..e000fa311 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ImageProvider.kt
@@ -44,11 +44,9 @@ object ImageProvider {
             oldBitmap: Bitmap,
             newBitmap: Bitmap?
         ) {
-            if (evicted) {
-                oldBitmap.recycle()
-                putDebug("ImageProvider: trigger bitmap recycle. URI: $key")
-                putDebug("ImageProvider : cacheUsage ${size()}bytes / ${maxSize()}bytes")
-            }
+            oldBitmap.recycle()
+            putDebug("ImageProvider: trigger bitmap recycle. URI: $key")
+            putDebug("ImageProvider : cacheUsage ${size()}bytes / ${maxSize()}bytes")
         }
     }
 
@@ -90,7 +88,7 @@ object ImageProvider {
         // inJustDecodeBounds如果设置为true,仅仅返回图片实际的宽和高,宽和高是赋值给opts.outWidth,opts.outHeight;
         op.inJustDecodeBounds = true
         BitmapFactory.decodeFile(file.absolutePath, op)
-        if (op.outWidth < 1 && op.outHeight < 1) {
+        if (op.outWidth <= 0 && op.outHeight <= 0) {
             return Size(errorBitmap.width, errorBitmap.height)
         }
         return Size(op.outWidth, op.outHeight)
@@ -116,7 +114,10 @@ object ImageProvider {
             bitmap
         }.onFailure {
             Coroutine.async {
-                putDebug("ImageProvider: decode bitmap failed. path: ${vFile.absolutePath}\n$it", it)
+                putDebug(
+                    "ImageProvider: decode bitmap failed. path: ${vFile.absolutePath}\n$it",
+                    it
+                )
                 if (FileUtils.readText(vFile.absolutePath).isXml()) {
                     putDebug("ImageProvider: delete xml file. path: ${vFile.absolutePath}")
                     vFile.delete()

From 13b8b08d842fa8e3aa6ac604c9fffc57731c1335 Mon Sep 17 00:00:00 2001
From: gedoor <gedoor@users.noreply.github.com>
Date: Fri, 15 Apr 2022 00:16:55 +0000
Subject: [PATCH 2/2] Bump cronet from 100.0.4896.88 to 100.0.4896.127 -
 Changes in the [Git
 log](https://chromium.googlesource.com/chromium/src/+log/100.0.4896.88..100.0.4896.127)

---
 app/cronetlib/cronet_api.jar              | Bin 69333 -> 69335 bytes
 app/cronetlib/cronet_impl_common_java.jar | Bin 97276 -> 97278 bytes
 app/src/main/assets/cronet.json           |   2 +-
 app/src/main/assets/updateLog.md          |   1 +
 gradle.properties                         |   2 +-
 5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/cronetlib/cronet_api.jar b/app/cronetlib/cronet_api.jar
index af1fe5c368201280853af8d92cfbf32cd8a4bcd2..5898e280d335c5cf52ee5885d6155c2863480fea 100644
GIT binary patch
delta 910
zcmY+?Ur19?90&0GJ6pSRyPJRRST?PUAVqTCxlK1x+gpS$76kT(bh-^mu%$1Ch(idA
z9x6}k_YlK@VWAcqm7pl@B?#%ydWar`Sdcv^Nup8`R_A!zqWg9}-}C#O-#z!fk7+-|
zw8hO$8m&c8pF@>P&u?x=w1N=P($=lLR3V0_4|K`nJ205<P!zjjcX_<Ec1KN}PZAWt
z0m6w;NC_ylUU!|#8LV|X6?dS{;dO<)?E$Ca4Z4Gl4o{8C?^mjNf}!5(_8xzCM`u-M
z&>!fn=Dk`y9$)`q*MKP0NP<&vNrGG04}$ss(?FnOh4Rx^<k(JLZpLT<w82933baBh
z`VQL2*L?g0Ak)MJ8P5VJBvHh{f};RFn8OUfIdaj)t%AmFGQQM60S*(ekr$<0%W;vg
zvg=;HIEW=0wwP_?3maW)G-H*>_FvP04U!nwz-hAH!b6!hpD&Nb!Aghy1=8Qk6dpjo
zKbs!p^H}kbmK`<Gp=w#An3i?v`H@yM?O}<fFPHGMt$2y+^suV&AuCPa(Bp)}lGi+0
zrT-H9T^$<DY`h8`OFl={Bz)9@T{`v_zSu5cLdT}=8CBD=aS;!Q;3b=5S=fgwB5QwN
zWKFssX4OnD4;1l4A;w7+Gm|E)*E4WDRv|o7iZKpHl3B2fJQHbmQime2!Q?#FlT2qr
z8PDXg-B)K-NG%lM6o<xn6*7w!Iyf()WPnPtp2{J%8o&XYc*g)?^5u={>9^(BU}V+f
z=`0k})wBhl7+Lkql8UJX`JMy{4533}*U-1Da`?NECYDW@kl5a)l^l-L>yemP(~oOe
zE5sHKr#5mxZ*7=y&crHDZmD>?!9XKhyI-S{^#4#X^Q#1dW>z}&Q-yD<`8Z<+t8V)@
H|6%?B-~Ax+

delta 955
zcmY+CZAep57{~89yWPFr&AYjl4lR4NR=P9Y)<$9b5Loy@zf~CI+-5_pe1S?N^HXAh
z1xI@z7#i8TX;GjkrVvy}Sbc~-RA5;jv{EyqAi~bMTg&dJ`~Ur)|8t(_p8Gm3zKV+(
zWhENXCM2G<&fNng=bJ@AXclQ`aTO)la4(?2r_F9c@=3nOAMoY-{XtnEf*T3N9*>v!
zyoHrjp@7@%FNpfR+Y1UK{wjAQ8ufW15nnj!A<>8@uRdDU;Hs<-9Sz6wV$o2f!Npqz
zo7TID-*-wY6v#rM;E@Hdkc|Y>e}^GKsis%ITJBHa9l!Od`8utr0*{FFeO5ZXU`eNw
z<vJiDvUd(52Y#qe@pl$Ih$dvGztR*rxu(#AKBuKBT#5vjM5I6+V$nV;Gi-FyY6q7V
zDRkVnJT_!wZZ2K2>0kh{$U4j-2OTPGkC|z|LxOP)GupWED2o|+u*90vi-F~R&IFjV
z2C_AX;K3sH?x6EUX7xm9)v#!PkikqkzfwnMgKAGFp4-n@I?XwdY}po4jQ=)jgpi2B
z_(oVQnvdncGmPwzwt{uDo=n0Fexx00IDF8m!m$oJ&1us?ugr|++?b{*gLFt>GP8Z0
z5;Hz@sz&!V8yu0?<VA5+AB%5JOg_VlYP(d}e_4SoT2{1hC8@P^^rn`QYepDk_W^M&
zE3Ub|%*=!@JfOd=vU9yADAF<Qx&tqDD3^|&)j<~nXal^^p+iUjqDTAii6N*nqK(j}
zXSF*=xX1;q0lD$qSVDxjSa_@o+VV7mmOhc-u90muZD2EeoZ!w@AV#zc^+2r=RpWs-
zoNWRuv!*RmTx8SXDFc+t$cc}C;=o2pyM=!?g7?lOK(NWme>Q^O&L%*`H-)aAlc2)H
vVx`|z2;C;M2Ny5?jp#vZW|7992~Z}RX^SkwVGeKoN<kPlBfIotiQo7i7wH{?

diff --git a/app/cronetlib/cronet_impl_common_java.jar b/app/cronetlib/cronet_impl_common_java.jar
index 136bcbe72608bc79233d82637d535a54da45cc1e..4ead4d6d72dd05323c3865977b76922192478bce 100644
GIT binary patch
delta 782
zcmY+BO-NKx7>3Vxr!gCUX3T8V*;ta2HFMAW&p?Z@pkxaAQ7OgJt23jE@y?$!jx&j2
zEuu}?S$vz2T3DNmfrzNU2!%ijZ5L5e6oh1vP`Huk+<P^0aTf3MzTbJj!&zU`|5?))
zDqG7|R!2+B+XzukBd)eU4X#9?;$g7$6^t3}l-j7x<@0-Nc851mO02{N<X9v^L)7DU
zdtJ`3$L*x<kk{^aMf|-XC-sNjVSAs?;gTe3O@<>Wu{SBneFN5kuoOy(%3a+)Um#!a
z8r@FBQbLKnlsJe5Ncq+_AeUMDW7ZD)%sc*Vi7%oM5u~$hPiqaEKDQIw27wCR4tBbu
z5vK>CNto$k6NYN`v#S=L4}b|RGSmuzkP1!VGBy?}LUV!}NyV7!R}8!>L$g3-H55yk
z*@#?)))>Dn7~f=gHO8B+<y77CM9)s$EW!^l2ne~0TiD?^I0b3^KW0L`47>4ZoEOec
zZ5Z_$Y)o)CRoH-)C?|N!vsqPtpEcsk1mEKN0yd|?igigiE|kAh1&hBg!+S}d-nFCw
z@lze%Pw}EdDdlCKH)%Pm`&y$oRCu(k!JcmxY#8F;$`1wDa8U=<IH{15UkdTE!tY`<
zrh!5f18K<U4idmOLvR4Ua459taWTv1Zt0;IPh|Lx;|7h)8^C}Cg;ba{Vi*R8aMGfQ
z=rFio3GWPpBz$bpm?O&rmqbmh@8$E8SzheNg)DT#4HQS<g6?e#;6#x3-}ZnJ=SP6*
zGC>vf;Q1Uh>E_O;>IlBhac{X}BQADA33d+h4?miRTG)?L9=f0kXY$}Hde9GqkiWnI
B`Huhq

delta 804
zcmY+BO-NKx6vywmG?vq-ZyZfWku<>pZD!sZ-;B?NHmwpt7mBHo-|vkk<Lf!&$LN%a
zZCq3+mpYpWqm&>?!9@fuQfU*0Op6u~LPUfRt^zkA-8YE5E?l_h_y3=d%Q-%@9Ua=%
zU9DMRB0R`HLx_1jxY!78JcxpGqp@`d?qy4&=o5XiQXBFqO4vcX#0TV>EC<C<u)06e
zS1U<MKvRM>fofHWNUElVWK|6fXtJoOvNxth;{N_vpFS|;9n$*LxZf-lPL@le61sbq
z_#H$fl7j?DF_5hPngJ1p*~gBY`zvj4SK1)2AoFxm+>Szo_O!FIRySMg$i?d;Akttb
zTeKJA(g@Vj_czTqTN}#5rYKy%5*><Yy_$wiku2=idBWCUI^mTLSE)}=YcoaxOX~UP
zzYUeN!8l<hxM0Tf(^zIe1>2c+q30F|Z2pdLo}8SQkib#{+G)?6=_+SSa{{g!JZ*EC
zZLU|b-q!-UMtR#8>pYgwJqk|tX*<VK;T=97g%<j7m!<Z->_(~>>tZ~?@y(3!X$<OU
z?p|73_?6AB{K&;OasIjbIRD(%&lAC8LXmFl^SBv(V|;?SgS7Vf;3E3sd~Ww&>)e@`
z8Uuq4ADJdJ#-V{$5?q{u!pFT(gn!0)g%+C$N-*pMCqA>mIc%Qbc-C&gJ9e;RVv-xS
zC%{c}1dHaFgaB<Swh(<1Wct0-LcW-uy$TDF6P(QWE#&wT@3E8s5o$1%fF5{+(iC*V
zS6rBaC>?7wy_a#e8T{BeZSJ_`loaAFC-D1868fp9%j8vPbU{XXnYf&UB5>h{Bq$lH
IgTUAN5A>D$UH||9

diff --git a/app/src/main/assets/cronet.json b/app/src/main/assets/cronet.json
index e720b0441..a850c4c64 100644
--- a/app/src/main/assets/cronet.json
+++ b/app/src/main/assets/cronet.json
@@ -1 +1 @@
-{"x86_64":"7d572f0d9b1097018e3d190ef4c0b32c","armeabi-v7a":"3a7375fb6d587b6b583ee017705978d8","arm64-v8a":"e8d2e9daca3a7095c4f045e6c84b9988","x86":"48864ce84335a1783aaa81d2ab09c8cd","version":"100.0.4896.88"}
\ No newline at end of file
+{"x86_64":"c81b8f347139d480e02e039ee54ded2c","armeabi-v7a":"376f6fe95055a4c3e58d6ba5a775295e","arm64-v8a":"67d683961c2e605a0595dbea4a099070","x86":"533ebbf13b68a92ae940a8c3d176ccf2","version":"100.0.4896.127"}
\ No newline at end of file
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
index f35bc6e90..8d0430587 100644
--- a/app/src/main/assets/updateLog.md
+++ b/app/src/main/assets/updateLog.md
@@ -13,6 +13,7 @@
 
 **2022/04/14**
 
+* 更新cronet: 100.0.4896.127
 * 修复解码正文图片报错，添加解码日志
 * js文档：java.toast java.longToast
 * cookie保存策略更改，若登录失效请重新登录
diff --git a/gradle.properties b/gradle.properties
index b603501f9..8a4de3489 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,4 @@ kotlin.code.style=official
 android.enableResourceOptimizations=true
 
 #https://chromiumdash.appspot.com/releases?platform=Android
-CronetVersion=100.0.4896.88
+CronetVersion=100.0.4896.127