Merge 4b9fa993ca into 90b082500c

- Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/123.0.6312.80..126.0.6478.122)

app/cronet-proguard-rules.pro

@@ -1,20 +1,19 @@
-# -------- Config Path: base/android/proguard/chromium_code.flags --------
+# -------- Config Path: base/android/proguard/shared_with_cronet.flags --------
 # Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Contains flags that can be safely shared with Cronet, and thus would be
-# appropriate for third-party apps to include.
+# Contains flags that we want to apply not only to Chromium APKs, but also to
+# third-party apps that bundle the Cronet library.
 
-# Allow unused native methods to be removed, but prevent renaming on those that are kept.
--keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class !cr_allowunused,** {
-  native <methods>;
-}
+# WARNING: rules in this file are applied to entire third-party APKs, not just
+# Chromium code. They MUST be scoped appropriately to avoid side effects on app
+# code that we do not own.
 
-# Use assumevalues block instead of assumenosideeffects block because Google3 proguard cannot parse
-# assumenosideeffects blocks which overwrite return value.
-# chromium_code.flags rather than remove_logging.flags so that it's included
-# in cronet.
+# Use assumevalues block instead of assumenosideeffects block because Google3
+# proguard cannot parse assumenosideeffects blocks which overwrite return
+# value. Keep this in shared_with_cronet.flags rather than remove_logging.flags
+# so that it's included in cronet.
 -assumevalues class org.chromium.base.Log {
   static boolean isDebug() return false;
 }
@@ -37,21 +36,10 @@
     public static **[] values();
 }
 
-# -identifiernamestring doesn't keep the module impl around, we have to
-# explicitly keep it.
--if @org.chromium.components.module_installer.builder.ModuleInterface interface *
--keep,allowobfuscation,allowaccessmodification class !cr_allowunused,** extends <1> {
-  <init>();
-}
-
 # Required to remove fields until b/274802355 is resolved.
 -assumevalues class !cr_allowunused,** {
   final org.chromium.base.ThreadUtils$ThreadChecker * return _NONNULL_;
 }
-
-# TODO(agrieve): Remove once we start to use Android U SDK.
--dontwarn android.window.BackEvent
--dontwarn android.window.OnBackAnimationCallback
 # -------- Config Path: build/android/chromium_annotations.flags --------
 # Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
@@ -113,6 +101,22 @@
 -identifiernamestring class * {
     @org.chromium.build.annotations.IdentifierNameString *;
 }
+
+# Mark fields with this to help R8 figure out that they cannot be null.
+# Use assumevalues in addition to assumenosideeffects block because Google3 proguard cannot parse
+# assumenosideeffects blocks which overwrite return value.
+-assumevalues class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** *(...) return _NONNULL_;
+}
+-assumenosideeffects class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** *(...);
+}
+-assumevalues class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** * return _NONNULL_;
+}
+-assumenosideeffects class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** *;
+}
 # -------- Config Path: components/cronet/android/cronet_impl_common_proguard.cfg --------
 # Proguard config for apps that depend on cronet_impl_common_java.jar.
 
@@ -227,3 +231,10 @@
 -keepclasseswithmembers,includedescriptorclasses,allowaccessmodification class ** {
   @org.jni_zero.CalledByNativeUnchecked <methods>;
 }
+
+# Allow unused native methods to be removed, but prevent renaming on those that
+# are kept.
+# TODO(crbug.com/315973491): Restrict the broad scope of this rule.
+-keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class ** {
+  native <methods>;
+}

app/src/main/assets/cronet.json

@@ -1 +1 @@
-{"arm64-v8a":"bbf2c50d1ebf0763d451b08e290a3244","armeabi-v7a":"ecb872f7b1b5342f4d7c36262bec0600","x86":"4da4832b89e2412d808c5b1ecdc24e3d","x86_64":"62080f051db02ed0e939affb39ce67fb","version":"123.0.6312.80"}
+{"x86_64":"cefc6b03fcd3e0a386fd309ba197a51d","arm64-v8a":"341eb99fcd8246a4a02e46c45b07b155","armeabi-v7a":"adc8d602ef0a89da206d48f3b6ccc9b5","x86":"2277832e16f522b2f589eecc0547865e","version":"126.0.6478.122"}

app/src/main/assets/updateLog.md

@@ -13,6 +13,7 @@
 * 漫画源看书显示乱码，**阅读与其他软件的源并不通用**，请导入阅读的支持的漫画源！
 
 **2024/02/27**
+* 更新cronet: 126.0.6478.122
 * 更新cronet: 123.0.6312.80
 * 更新cronet: 123.0.6312.40
 

app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@@ -1205,7 +1205,7 @@ class ReadBookActivity : BaseReadBookActivity(),
                         ReadBook.book?.let {
                             ReadBook.curTextChapter = null
                             BookHelp.delContent(book, chapter)
-                            viewModel.loadChapterList(book)
+                            loadChapterList(book)
                         }
                     }
                 }.onError {

app/src/main/java/io/legado/app/utils/ChineseUtils.kt

@@ -36,7 +36,7 @@ object ChineseUtils {
                 "劈", "脊", "槃",
                 "支援", "沈默", "類比", "模擬", "划槳", "列根", "先進", "雪梨", "雪糕",
                 "零錢", "零钱", "離線", "碟片", "模組", "桌球", "案頭", "機車", "電漿",
-                "鳳梨", "魔戒", "載入",
+                "鳳梨", "魔戒", "載入", "菲林", "整合",
                 "路易斯", "非同步", "出租车", "周杰倫", "马铃薯", "馬鈴薯", "機械人", "電單車",
                 "電扶梯", "音效卡", "飆車族", "點陣圖", "個入球", "顆進球",
                 "魔獸紀元", "高空彈跳", "铁达尼号",

gradle.properties

@@ -42,7 +42,7 @@ android.defaults.buildfeatures.shaders=false
 # 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=123.0.6312.80
-CronetMainVersion=123.0.0.0
+CronetVersion=126.0.6478.122
+CronetMainVersion=126.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true