Merge 6c9a8a74bd into ed6f8e5e43

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

app/cronet-proguard-rules.pro

@@ -113,6 +113,14 @@
 -identifiernamestring class * {
     @org.chromium.build.annotations.IdentifierNameString *;
 }
+
+# Mark fields with this to help R8 figure out that they cannot be null.
+-assumenosideeffects class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** *(...) return _NONNULL_;
+}
+-assumenosideeffects class ** {
+  @org.chromium.build.annotations.AssumeNonNull *** * return _NONNULL_;
+}
 # -------- Config Path: components/cronet/android/cronet_impl_common_proguard.cfg --------
 # Proguard config for apps that depend on cronet_impl_common_java.jar.
 

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":"2aad90238c23fd16cd4f00932cc8bbfc","arm64-v8a":"44ea67de5cfb2fb4e9491efce9496e2f","armeabi-v7a":"52826628a666ad0f4b14ef602af85341","x86_64":"146de0053930fdabdb481fd9462fd1a7","version":"125.0.6422.113"}

app/src/main/assets/updateLog.md

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

app/src/main/java/io/legado/app/base/BaseService.kt

@@ -1,6 +1,7 @@
 package io.legado.app.base
 
 import android.content.Intent
+import android.os.Build
 import android.os.IBinder
 import androidx.annotation.CallSuper
 import androidx.lifecycle.LifecycleService
@@ -83,9 +84,11 @@ abstract class BaseService : LifecycleService() {
                 }
             }
             .request()
-        PermissionsCompat.Builder()
-            .addPermissions(Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
-            .rationale(R.string.ignore_battery_permission_rationale)
-            .request()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PermissionsCompat.Builder()
+                .addPermissions(Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
+                .rationale(R.string.ignore_battery_permission_rationale)
+                .request()
+        }
     }
-}
+}

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=125.0.6422.113
+CronetMainVersion=125.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true