From 69ae5b7d245dd7d6bd5a759bcb04cbdb8c3ccecf Mon Sep 17 00:00:00 2001 From: gedoor Date: Sat, 1 Oct 2022 00:35:27 +0000 Subject: [PATCH 1/4] Bump cronet from 106.0.5249.65 to 106.0.5249.79 - Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/106.0.5249.65..106.0.5249.79) --- app/cronetlib/cronet_api.jar | Bin 70942 -> 70943 bytes app/cronetlib/cronet_impl_common_java.jar | Bin 118136 -> 118137 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 8ab06ddcfa6e88cc72b48a8f20bf86cac7c877cf..984834fd42de83ec0f8cc16cb0f6b7af2396a33a 100644 GIT binary patch delta 809 zcmX|=T}TvB6vsW+b!WeK))`k*Gb^&%5@*+)SqBQ&3`_;_sai{2KUVgoBz>!gjG`d& zA#QYn%#_N&NLGZ5=%K)%r(pY_qR6Buq6hb(ha!^B%nr`O<^F%?fByHL3o|)uyE$ts z>ufKy$p!gubLiRfp^KTKf`UvD@BLdkU-t!CTJ%UHGN?p!H5QJl{ZU147@$>+sSR36 zk3=<1i)wmG?XMk44UN|IkMtcMNY|!QeS@QQY9y-nYHIw{)_Q)JX)LDmth0pQVXd@1 zn`4VP2FXI_`l*<(Lz1l)@oZY+PlO77y4#Mcb_lUTx5+yFmDnbL!kPn?N5T&-2;xHl z%2~B+!Vb9<*92<#Ck3_b$(w3C zc*B4v4fwsuf&ylo(7--5TiVXYN*(BSQCg^**d{Lau3ufmaThfY4_O8Cz6yJgCaoK@ ziFnWrXErTF3* z(~$H+9IoKB7rL2m&h*7+1m2U`fZu#HN2`y#_vXz)Xu*rW1%lTNm|ZZTc%jm8D(wBD zrDbgNLySFtY-tH6{Zvmp#WNyo!}9@3aEp{swPcX(Jh^1Pw1_F9@D;~INU&Eg^2M%~ zWmq1d{?~8vVD+73WGL+JTNB`N0QRw|6+_fuYcW;SABNb-lUW;17+}{=49f&^+(C~N zM5jc@2Xc9M|DO}vC2}qPG6Ci!5OCTcd;hGHMmT_q3?1y+n!(D@&%nidd>)*W>DfQx NvJASt$qw{m{0B|3{KfzP delta 847 zcmYk4Uq}>D6vp>lb=KXP*_~;}Ro2?F2yI2(zf%K3mZ3;t^-?LB?z+2d1S0wpM4|Z5 zLnzjTJrJT$;=>ZCSXt1c5fr2;k`Wi(Fm&#UKx{&l_bp&a>dHVMAv}ym-|PZY&j8sPAqby78jGLPKMw zu2Ia;D?Rl2z5$(+Rr*3C42lfOQwR?5U`hmy(2OoB=+Xlo7e(-cn07#%WM++n)pH_l zSy{_5c7QC+>G00O{rKI%Hn}=)WM-a}W3!V@@Zy=FbE7VtU>Yvqk`vC6Jq!582?uHC zg3Y|Pqy!%Lih~lgk>%H>*|zMVwTm1M%WTSk%$lvdHJy#s61*w1@>A~&fS+V`ITK$@ z(XtByB)rBNR~p5sw!ZT^ed{==KpD+$h~`%8E>>E~ZBvd;|0%{(E>`~WPZN&*67Zf5 h>bJIml2+K~G-E)4RzMt3pcCF>RsoG`;DG%+{{U0-57z(y diff --git a/app/cronetlib/cronet_impl_common_java.jar b/app/cronetlib/cronet_impl_common_java.jar index 74fdf95419ede5d84a61460f1f2327e6d5412619..60995064820e1cd43f828f0eefad8be1208181c3 100644 GIT binary patch delta 838 zcmY+CUr1AN6vsWkP+68PrgN#2g%3%h+itse-mn}J%}LT9un0um+=hZAxFW$&su!Ui zf*YJPqQsR}mWo7DICX#XUrisP=s|q!A+sVXg6Q1cn0g;Bd_U)VzUSP-{nelTyFY#G z;(*G3_;%c$nv!Cl=pKlJ-7az*=QeR7Z#7$Zm&GKOH`AN9^5ud@LDBT(qm{pXnEaymTgN_|m(Iy#c^w(d((3geRb zuO8cjkS5i~wfJTh4zPVIo3L?3g+E_Wun>eiFyN^mG=LVzg3!h?RQNRpI?1-0iennc zL`R5*i3JIYZ3U2p@299WuNbz@++C~~Y{ej8L6`>K;}p^qhSO|PP{d3n6ycXJRI#p# zB&k4y71FRLO0jn%^r<~n$*>$OISToBHB9^EMycksZ>cp!!NL9<-$K-9VJFts(%u_U zTB5yfdrgOL>u6MOm_}WSQC!uzq#+xpV_<@txDf*D+de$xg*EG6!aMxmyvL^I(P#Xq$&t_Mlg0Ww_o;TdmGh=C?kX z=+WkdLOixWw;#Nt5Q86%$V7{u7HD(LKoajq$08XshLWvWIJ5{nYj~U_nW$PK&*)Q` TXz>0xov3~Zv}x7Pf&QF-6Ywpb delta 854 zcmZ9JUr19?9LM*&H+_i$Ty}cYj17O&ozJNZ^Y? zf4Ri345H9konN5F66Y&L%&VC8)dJ8S291HK?@cW~CAo%J;}^IVWI z4+ncg7T+*G=2gKGQ;TY@1+o8zwp< zvCatmsLr2^9ZS#)-*9dTu2UOPp~+Vz)V@)oB>@avMsET)w7i2F&nO0BQU^R8uZQ3g>qiy5`x70dAbG6^t# z_|Ndn3NTdNUT%F-7%ErcZNi`e=U3nctx^I$3_+zJW(shQ1~s}@fuURU|1b{dp#(7w zrKmGOX|WxvAD8v7@cW zY-+r@4juIP`8;Q&L@idOpoaFkay)wx8l^;r{(UKjhCEP*-Cd-UVT}}kH1QAiq*ni;=Nk_%XZ$W_%=E-|`c0pU{ JdI#jA{{sKd7xw@F diff --git a/app/src/main/assets/cronet.json b/app/src/main/assets/cronet.json index dbced251d..c135c04f3 100644 --- a/app/src/main/assets/cronet.json +++ b/app/src/main/assets/cronet.json @@ -1 +1 @@ -{"x86_64":"74ea18a90451c8e224c8681d882b7e50","armeabi-v7a":"bf5207a8e5468058c448876d46394e2c","arm64-v8a":"580ab3f059d60f3223a83f51bf845dfd","x86":"381ed72dbb89c613428e1ebb09870318","version":"106.0.5249.65"} \ No newline at end of file +{"x86_64":"c27a3027ec4c8eba8ba5a2aab547eb04","armeabi-v7a":"b3e0bccf799324ea4177c9e1752b02f1","arm64-v8a":"8cfa3bfe215024cf486d1cffeed87241","x86":"461acafc8701b6b74f8a6b2c024d434e","version":"106.0.5249.79"} \ No newline at end of file diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index aec420a44..69a921cc7 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -13,6 +13,7 @@ **2022/09/28** +* 更新cronet: 106.0.5249.79 * 更新cronet: 106.0.5249.65 * 正文选择菜单朗读按钮长按可切换朗读选择内容和从选择开始处一直朗读 * 修复某些情况下无法搜索到标题的bug，净化规则较多的可能会降低搜索速度 diff --git a/gradle.properties b/gradle.properties index 10562b45c..77528d5f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,6 +27,6 @@ android.experimental.enableNewResourceShrinker.preciseShrinking=true # and none from the library's dependencies, thereby reducing the size of the R class for that library. android.nonTransitiveRClass=true #https://chromiumdash.appspot.com/releases?platform=Android -CronetVersion=106.0.5249.65 +CronetVersion=106.0.5249.79 android.injected.testOnly=false \ No newline at end of file From 2003cf5d06a9d329278b9d3950e06b6fc5e9c6b9 Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:54:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E6=BA=90=E6=8D=A2=E6=BA=90=E5=90=8E=E9=98=85?= =?UTF-8?q?=E8=AF=BB=E6=8C=89=E9=92=AE=E5=B7=A5=E4=BD=9C=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84bug=20(#2352)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index f915600b0..1b9addb4d 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -32,7 +32,8 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { var inBookshelf = false var bookSource: BookSource? = null private var changeSourceCoroutine: Coroutine<*>? = null - var isImportBookOnLine = false + var isImportBookOnLine: Boolean + get() = (bookSource?.bookSourceType ?: BookType.local) == BookType.file fun initData(intent: Intent) { execute { @@ -76,7 +77,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { upCoverByRule(book) bookSource = if (book.isLocalBook()) null else appDb.bookSourceDao.getBookSource(book.origin) - isImportBookOnLine = (bookSource?.bookSourceType ?: BookType.local) == BookType.file if (book.tocUrl.isEmpty()) { loadBookInfo(book) } else if (isImportBookOnLine) { From e6f431a13936706e8761de183202e7f1ee823100 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 1 Oct 2022 08:59:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E6=BA=90=E6=8D=A2=E6=BA=90=E5=90=8E=E9=98=85?= =?UTF-8?q?=E8=AF=BB=E6=8C=89=E9=92=AE=E5=B7=A5=E4=BD=9C=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index 1b9addb4d..c225a8882 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -32,7 +32,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { var inBookshelf = false var bookSource: BookSource? = null private var changeSourceCoroutine: Coroutine<*>? = null - var isImportBookOnLine: Boolean + val isImportBookOnLine: Boolean get() = (bookSource?.bookSourceType ?: BookType.local) == BookType.file fun initData(intent: Intent) { @@ -306,7 +306,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { fun changeToLocalBook(bookUrl: String) { appDb.bookDao.getBook(bookUrl)?.let { localBook -> - isImportBookOnLine = false inBookshelf = true LocalBook.mergeBook(localBook, bookData.value).let { bookData.postValue(it) From 6433d17a685db9364a351594cc165cc54d204cb8 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 1 Oct 2022 09:11:22 +0800 Subject: [PATCH 4/4] chore: rename EventBus.BOOK_URL_CHANGED --- app/src/main/java/io/legado/app/constant/EventBus.kt | 2 +- .../legado/app/ui/association/ImportOnLineBookFileViewModel.kt | 2 +- .../main/java/io/legado/app/ui/book/info/BookInfoActivity.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt index e111bdc98..06264871c 100644 --- a/app/src/main/java/io/legado/app/constant/EventBus.kt +++ b/app/src/main/java/io/legado/app/constant/EventBus.kt @@ -28,6 +28,6 @@ object EventBus { const val TIP_COLOR = "tipColor" const val SOURCE_CHANGED = "sourceChanged" const val SEARCH_RESULT = "searchResult" - const val BOOK_URL_CHANGED = "bookUrlChanged" + const val FILE_SOURCE_DOWNLOAD_DONE = "fileSourceDownloadDone" const val updateReadActionBar = "updateReadActionBar" } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt index 4054e0fbd..667c9042c 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt @@ -66,7 +66,7 @@ class ImportOnLineBookFileViewModel(app: Application) : BaseViewModel(app) { fun importOnLineBookFile(url: String, fileName: String, success: () -> Unit) { execute { LocalBook.importFileOnLine(url, fileName, bookSource).let { - postEvent(EventBus.BOOK_URL_CHANGED, it.bookUrl) + postEvent(EventBus.FILE_SOURCE_DOWNLOAD_DONE, it.bookUrl) } }.onSuccess { success.invoke() diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index bc57da9dd..a21ab4aa8 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -535,7 +535,7 @@ class BookInfoActivity : } override fun observeLiveBus() { - observeEvent(EventBus.BOOK_URL_CHANGED) { + observeEvent(EventBus.FILE_SOURCE_DOWNLOAD_DONE) { viewModel.changeToLocalBook(it) } }