[skip ci]

.github/scripts/cronet.sh

@@ -4,32 +4,47 @@ branch=$1
 [ -z $1 ] && branch=Stable
 [ -z $GITHUB_ENV ] && echo "Error: Unexpected github workflow environment" && exit
 
-# 获取最新cronet版本
+offset=0
-echo "fetch $branch release info from https://chromiumdash.appspot.com ..."
+max_offset=3
-lastest_cronet_version=`curl -s "https://chromiumdash.appspot.com/fetch_releases?channel=$branch&platform=Android&num=1&offset=0" | jq .[0].version -r`
+
-echo "lastest_cronet_version: $lastest_cronet_version"
+function fetchExitVersion() {
-#lastest_cronet_version=100.0.4845.0
+    # 获取最新cronet版本
-lastest_cronet_main_version=${lastest_cronet_version%%\.*}.0.0.0
+    echo "fetch $branch release info from https://chromiumdash.appspot.com ..."
-# 检查版本是否存在
+    lastest_cronet_version=`curl -s "https://chromiumdash.appspot.com/fetch_releases?channel=$branch&platform=Android&num=1&offset=$offset" | jq .[0].version -r`
+    echo "lastest_cronet_version: $lastest_cronet_version"
+    #lastest_cronet_version=100.0.4845.0
+    lastest_cronet_main_version=${lastest_cronet_version%%\.*}.0.0.0
+    checkVersionExit
+}
 function checkVersionExit() {
+    # 检查版本是否存在
     local jar_url="https://storage.googleapis.com/chromium-cronet/android/$lastest_cronet_version/Release/cronet/cronet_api.jar"
     statusCode=$(curl -s -I -w %{http_code} "$jar_url" -o /dev/null)
     if [ $statusCode == "404" ];then
         echo "storage.googleapis.com return 404 for cronet $lastest_cronet_version"
-        exit
+        if [[ $max_offset > $offset ]]; then
+            echo "retry with offset $offset"
+            fetchVersion
+            offset=$(expr $offset + 1)
+        else
+            exist
+        fi
     fi
 }
 # 添加变量到github env
 function writeVariableToGithubEnv() {
     echo "$1=$2" >> $GITHUB_ENV
 }
+
+##########
 # 获取本地cronet版本
 path=$GITHUB_WORKSPACE/gradle.properties
 current_cronet_version=`cat $path | grep CronetVersion | sed s/CronetVersion=//`
 echo "current_cronet_version: $current_cronet_version"
 
+fetchExitVersion
+
 if [[  $current_cronet_version < $lastest_cronet_version ]];then
-    checkVersionExit
     # 更新gradle.properties
     sed -i s/CronetVersion=.*/CronetVersion=$lastest_cronet_version/ $path
     sed -i s/CronetMainVersion=.*/CronetMainVersion=$lastest_cronet_main_version/ $path

app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -262,7 +262,7 @@ class BookInfoActivity :
         tvLasted.text = getString(R.string.lasted_show, book.latestChapterTitle)
         tvIntro.text = book.getDisplayIntro()
         llToc?.visible(!book.isWebFile)
-        editMenuItem?.visible(viewModel.inBookshelf)
+        editMenuItem?.isVisible = viewModel.inBookshelf
         upTvBookshelf()
         val kinds = book.getKindList()
         if (kinds.isEmpty()) {