Merge aa4fcb2906 into 7422db5fde

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

.github/ISSUE_TEMPLATE/01-bugReport.yml

@@ -11,7 +11,7 @@ body:
           required: true
         - label: 最新[测试版](https://github.com/gedoor/legado/actions/workflows/test.yml)依然存在此问题 / Latest beta app does not work
           required: true
-        - label: 此问题和Xposed、Lsposed、Magisk、手机主题、浏览器插件等无关 / Make sure your machine is not touched by hook frameworks, plugins etc
+        - label: 此问题和Xposed、Lsposed、Magisk、手机主题、浏览器插件、无障碍服务等无关 / Make sure your machine is not touched by hook frameworks, plugins, accessibility etc
           required: true
 
   - type: textarea

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
+# Contains flags that we want to apply not only to Chromium APKs, but also to
-# appropriate for third-party apps to include.
+# third-party apps that bundle the Cronet library.
 
-# Allow unused native methods to be removed, but prevent renaming on those that are kept.
+# WARNING: rules in this file are applied to entire third-party APKs, not just
--keepclasseswithmembernames,includedescriptorclasses,allowaccessmodification class !cr_allowunused,** {
+# Chromium code. They MUST be scoped appropriately to avoid side effects on app
-  native <methods>;
+# code that we do not own.
-}
 
-# Use assumevalues block instead of assumenosideeffects block because Google3 proguard cannot parse
+# Use assumevalues block instead of assumenosideeffects block because Google3
-# assumenosideeffects blocks which overwrite return value.
+# proguard cannot parse assumenosideeffects blocks which overwrite return
-# chromium_code.flags rather than remove_logging.flags so that it's included
+# value. Keep this in shared_with_cronet.flags rather than remove_logging.flags
-# in cronet.
+# 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":"70374d614c6370f39ecc33c3a4a71886","arm64-v8a":"4231b5852366a17ef66bfc47c9e1e9bd","armeabi-v7a":"3c6edf29c6cc021e2a335f17c80c9a18","x86":"d0d33c9f93b4be1141214456757db621","version":"126.0.6478.72"}

app/src/main/assets/updateLog.md

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

app/src/main/java/io/legado/app/App.kt

@@ -36,7 +36,9 @@ import io.legado.app.utils.ChineseUtils
 import io.legado.app.utils.LogUtils
 import io.legado.app.utils.defaultSharedPreferences
 import io.legado.app.utils.getPrefBoolean
+import io.legado.app.utils.isDebuggable
 import kotlinx.coroutines.launch
+import org.chromium.base.ThreadUtils
 import splitties.init.appCtx
 import splitties.systemservices.notificationManager
 import java.net.URL
@@ -51,6 +53,9 @@ class App : Application() {
         super.onCreate()
         LogUtils.d("App", "onCreate")
         LogUtils.logDeviceInfo()
+        if (isDebuggable) {
+            ThreadUtils.setThreadAssertsDisabledForTesting(true)
+        }
         oldConfig = Configuration(resources.configuration)
         CrashHandler(this)
         //预下载Cronet so

app/src/main/java/io/legado/app/model/localBook/EpubFile.kt

@@ -10,6 +10,7 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.book.BookHelp
 import io.legado.app.utils.FileUtils
 import io.legado.app.utils.HtmlFormatter
+import io.legado.app.utils.encodeURI
 import io.legado.app.utils.isXml
 import io.legado.app.utils.printOnDebug
 import me.ag2s.epublib.domain.EpubBook
@@ -252,8 +253,10 @@ class EpubFile(var book: Book) {
             }
         }
         bodyElement.select("img").forEach {
-            val src = it.attr("src")
+            val src = it.attr("src").encodeURI()
-            it.attr("src", URI(res.href).resolve(src).toString())
+            val href = res.href.encodeURI()
+            val resolvedHref = URLDecoder.decode(URI(href).resolve(src).toString(), "UTF-8")
+            it.attr("src", resolvedHref)
         }
         return bodyElement
     }

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

@@ -17,6 +17,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
@@ -384,3 +385,6 @@ val Context.channel: String
         }
         return ""
     }
+
+val Context.isDebuggable: Boolean
+    get() = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0

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

@@ -7,12 +7,13 @@ import android.icu.text.Collator
 import android.icu.util.ULocale
 import android.net.Uri
 import android.text.Editable
+import cn.hutool.core.net.URLEncodeUtil
 import io.legado.app.constant.AppPattern
 import io.legado.app.constant.AppPattern.dataUriRegex
 import java.io.File
 import java.lang.Character.codePointCount
 import java.lang.Character.offsetByCodePoints
-import java.util.*
+import java.util.Locale
 import java.util.regex.Pattern
 
 fun String?.safeTrim() = if (this.isNullOrBlank()) null else this.trim()
@@ -132,3 +133,4 @@ fun String.escapeRegex(): String {
     return replace(AppPattern.regexCharRegex, "\\\\$0")
 }
 
+fun String.encodeURI(): String = URLEncodeUtil.encodeQuery(this)

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
+CronetVersion=126.0.6478.72
-CronetMainVersion=123.0.0.0
+CronetMainVersion=126.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true

modules/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java

@@ -35,6 +35,7 @@ import me.ag2s.epublib.domain.Spine;
 import me.ag2s.epublib.domain.SpineReference;
 import me.ag2s.epublib.util.ResourceUtil;
 import me.ag2s.epublib.util.StringUtil;
+import me.ag2s.epublib.util.URLEncodeUtil;
 
 /**
  * Reads the opf package document as defined by namespace http://www.idpf.org/2007/opf
@@ -108,6 +109,7 @@ public class PackageDocumentReader extends PackageDocumentBase {
         for (int i = 0; i < originItemElements.getLength(); i++) {
             Element itemElement = (Element) originItemElements.item(i).cloneNode(false);
             String href = DOMUtil.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
+            href = URLEncodeUtil.encode(href);
             String resolvedHref = packagePath.resolve(href).toString();
             itemElement.setAttribute("href", resolvedHref);
             fixedElements.add(itemElement);
@@ -451,9 +453,9 @@ public class PackageDocumentReader extends PackageDocumentBase {
                             OPFTags.item, OPFAttributes.id, coverResourceId,
                             OPFAttributes.href);
             if (StringUtil.isNotBlank(coverHref)) {
-                result.add(packagePath.resolve(coverHref).toString());
+                result.add(resolvePath(packagePath, coverHref));
             } else {
-                String resolved = packagePath.resolve(coverResourceId).toString();
+                String resolved = resolvePath(packagePath, coverResourceId);
                 result.add(
                         resolved); // maybe there was a cover href put in the cover id attribute
             }
@@ -464,11 +466,21 @@ public class PackageDocumentReader extends PackageDocumentBase {
                         OPFTags.reference, OPFAttributes.type, OPFValues.reference_cover,
                         OPFAttributes.href);
         if (StringUtil.isNotBlank(coverHref)) {
-            result.add(packagePath.resolve(coverHref).toString());
+            result.add(resolvePath(packagePath, coverHref));
         }
         return result;
     }
 
+    private static String resolvePath(URI parentPath, String href) {
+        href = URLEncodeUtil.encode(href);
+        String resolved = parentPath.resolve(href).toString();
+        try {
+            return URLDecoder.decode(resolved, Constants.CHARACTER_ENCODING);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Finds the cover resource in the packageDocument and adds it to the book if found.
      * Keeps the cover resource in the resources map

modules/book/src/main/java/me/ag2s/epublib/util/URLEncodeUtil.java

@@ -0,0 +1,118 @@
+package me.ag2s.epublib.util;
+
+import java.io.CharArrayWriter;
+import java.nio.charset.Charset;
+import java.util.BitSet;
+import java.util.Objects;
+
+import kotlin.text.Charsets;
+
+public class URLEncodeUtil {
+
+    static BitSet dontNeedEncoding;
+    static final int caseDiff = ('a' - 'A');
+
+    static {
+        dontNeedEncoding = new BitSet(256);
+        int i;
+        for (i = 'a'; i <= 'z'; i++) {
+            dontNeedEncoding.set(i);
+        }
+        for (i = 'A'; i <= 'Z'; i++) {
+            dontNeedEncoding.set(i);
+        }
+        for (i = '0'; i <= '9'; i++) {
+            dontNeedEncoding.set(i);
+        }
+        String mark = "-_.!~*'()";
+        for (i = 0; i < mark.length(); i++) {
+            dontNeedEncoding.set(mark.charAt(i));
+        }
+        String reversed = ";/?:@&=+$,#";
+        for (i = 0; i < reversed.length(); i++) {
+            dontNeedEncoding.set(reversed.charAt(i));
+        }
+    }
+
+    public static String encode(String s, Charset charset) {
+        Objects.requireNonNull(charset, "charset");
+
+        boolean needToChange = false;
+        StringBuilder out = new StringBuilder(s.length());
+        CharArrayWriter charArrayWriter = new CharArrayWriter();
+
+        for (int i = 0; i < s.length(); ) {
+            int c = s.charAt(i);
+            //System.out.println("Examining character: " + c);
+            if (dontNeedEncoding.get(c)) {
+                //System.out.println("Storing: " + c);
+                out.append((char) c);
+                i++;
+            } else {
+                // convert to external encoding before hex conversion
+                do {
+                    charArrayWriter.write(c);
+                    /*
+                     * If this character represents the start of a Unicode
+                     * surrogate pair, then pass in two characters. It's not
+                     * clear what should be done if a byte reserved in the
+                     * surrogate pairs range occurs outside of a legal
+                     * surrogate pair. For now, just treat it as if it were
+                     * any other character.
+                     */
+                    if (c >= 0xD800 && c <= 0xDBFF) {
+                        /*
+                          System.out.println(Integer.toHexString(c)
+                          + " is high surrogate");
+                        */
+                        if ((i + 1) < s.length()) {
+                            int d = (int) s.charAt(i + 1);
+                            /*
+                              System.out.println("\tExamining "
+                              + Integer.toHexString(d));
+                            */
+                            if (d >= 0xDC00 && d <= 0xDFFF) {
+                                /*
+                                  System.out.println("\t"
+                                  + Integer.toHexString(d)
+                                  + " is low surrogate");
+                                */
+                                charArrayWriter.write(d);
+                                i++;
+                            }
+                        }
+                    }
+                    i++;
+                } while (i < s.length() && !dontNeedEncoding.get((c = (int) s.charAt(i))));
+
+                charArrayWriter.flush();
+                String str = new String(charArrayWriter.toCharArray());
+                byte[] ba = str.getBytes(charset);
+                for (int j = 0; j < ba.length; j++) {
+                    out.append('%');
+                    char ch = Character.forDigit((ba[j] >> 4) & 0xF, 16);
+                    // converting to use uppercase letter as part of
+                    // the hex value if ch is a letter.
+                    if (Character.isLetter(ch)) {
+                        ch -= caseDiff;
+                    }
+                    out.append(ch);
+                    ch = Character.forDigit(ba[j] & 0xF, 16);
+                    if (Character.isLetter(ch)) {
+                        ch -= caseDiff;
+                    }
+                    out.append(ch);
+                }
+                charArrayWriter.reset();
+                needToChange = true;
+            }
+        }
+
+        return (needToChange ? out.toString() : s);
+    }
+
+    public static String encode(String s) {
+        return encode(s, Charsets.UTF_8);
+    }
+
+}