build: 更新 Gradle 版本和插件

- 将 Android Gradle 插件版本从 9.1.1 更新至 9.2.1。
- 更新 Gradle 包版本至 9.4.1，以确保兼容性和性能优化。

Author: Mamba_out

app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt

@@ -16,14 +16,16 @@
 package com.hippo.ehviewer.preference
 
 import android.app.Activity
-import android.app.ProgressDialog
+import com.hippo.app.ProgressDialog
 import android.content.Context
-import android.os.AsyncTask
+import android.os.Handler
+import android.os.Looper
 import android.os.Parcel
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.widget.Toast
 import androidx.preference.Preference
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
@@ -37,13 +39,15 @@ import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.lib.yorozuya.IOUtils
 import com.hippo.unifile.UniFile
 import com.hippo.util.ExceptionUtils.throwIfFatal
+import com.hippo.util.IoThreadPoolExecutor
 import okhttp3.OkHttpClient
 import java.io.IOException
 import java.io.InputStream
 import java.util.Collections
+import java.util.concurrent.atomic.AtomicBoolean
 
 class RestoreDownloadPreference : Preference {
-    private var mTask: AsyncTask<Void?, Any?, Any?>? = null
+    private var mTask: RestoreTask? = null
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
 
@@ -56,33 +60,46 @@ class RestoreDownloadPreference : Preference {
     override fun onClick() {
         super.onClick()
         if (mTask == null) {
-            mTask = RestoreTask(getContext()).execute()
+            mTask = RestoreTask(context).also { it.start() }
         }
     }
 
     override fun onDetached() {
-        if (mTask != null) {
-            mTask!!.cancel(true)
-            mTask = null
-        }
+        mTask?.cancel()
+        mTask = null
         super.onDetached()
     }
 
-    private inner class RestoreTask(private val mContext: Context) :
-        AsyncTask<Void?, Any?, Any?>() {
-        private val mApplication: EhApplication
-        private val mManager: DownloadManager
-        private val mHttpClient: OkHttpClient
+    private inner class RestoreTask(private val mContext: Context) {
+        private val mApplication: EhApplication =
+            mContext.applicationContext as EhApplication
+        private val mManager: DownloadManager =
+            EhApplication.getDownloadManager(mApplication)
+        private val mHttpClient: OkHttpClient =
+            EhApplication.getOkHttpClient(mApplication)
+        private val mHandler = Handler(Looper.getMainLooper())
+        private val mCancelled = AtomicBoolean(false)
         private var mProgressDialog: ProgressDialog? = null
 
-        init {
-            mApplication = mContext.getApplicationContext() as EhApplication
-            mManager = EhApplication.getDownloadManager(mApplication)
-            mHttpClient = EhApplication.getOkHttpClient(mApplication)
+        fun start() {
+            onPreExecute()
+            IoThreadPoolExecutor.instance.execute {
+                val result = doInBackground()
+                mHandler.post {
+                    if (mCancelled.get()) {
+                        onCancelled()
+                    } else {
+                        onPostExecute(result)
+                    }
+                }
+            }
+        }
+
+        fun cancel() {
+            mCancelled.set(true)
         }
 
-        override fun onPreExecute() {
-            super.onPreExecute()
+        private fun onPreExecute() {
             mProgressDialog = ProgressDialog(mContext)
             mProgressDialog!!.setTitle(R.string.settings_download_restore_download_items)
             mProgressDialog!!.setIndeterminate(false)
@@ -95,18 +112,12 @@ class RestoreDownloadPreference : Preference {
             if (null == file || !file.isDirectory()) {
                 return null
             }
-            val siFile = file.findFile(SpiderQueen.SPIDER_INFO_FILENAME)
-            if (null == siFile) {
-                return null
-            }
+            val siFile = file.findFile(SpiderQueen.SPIDER_INFO_FILENAME) ?: return null
 
             var `is`: InputStream? = null
             try {
                 `is` = siFile.openInputStream()
-                val spiderInfo = SpiderInfo.read(`is`)
-                if (spiderInfo == null) {
-                    return null
-                }
+                val spiderInfo = SpiderInfo.read(`is`) ?: return null
                 val gid = spiderInfo.gid
                 if (mManager.containDownloadInfo(gid)) {
                     return null
@@ -118,32 +129,33 @@ class RestoreDownloadPreference : Preference {
                 restoreItem.dirname = file.getName()
                 return restoreItem
             } catch (e: IOException) {
+                FirebaseCrashlytics.getInstance().recordException(e)
                 return null
             } finally {
                 IOUtils.closeQuietly(`is`)
             }
         }
 
-        override fun doInBackground(vararg params: Void?): Any? {
-            val dir = Settings.getDownloadLocation()
-            if (null == dir) {
+        private fun doInBackground(): Any? {
+            if (mCancelled.get()) {
                 return null
             }
+            val dir = Settings.getDownloadLocation() ?: return null
 
-            val restoreItemList: MutableList<RestoreItem?> = ArrayList<RestoreItem?>()
+            val restoreItemList: MutableList<RestoreItem?> = ArrayList()
 
-            val files = dir.listFiles()
-            if (files == null) {
-                return null
-            }
+            val files = dir.listFiles() ?: return null
 
             val total = files.size
             publishProgress(0, total)
 
             for (i in 0..<total) {
+                if (mCancelled.get()) {
+                    return null
+                }
                 val file = files[i]
                 val restoreItem = getRestoreItem(file)
-                if (null != restoreItem) {
+                if (restoreItem != null) {
                     restoreItemList.add(restoreItem)
                 }
                 publishProgress(i + 1, total)
@@ -155,8 +167,8 @@ class RestoreDownloadPreference : Preference {
 
             publishProgress(-1, -1)
 
-            try {
-                return EhEngine.fillGalleryListByApi(
+            return try {
+                EhEngine.fillGalleryListByApi(
                     null,
                     mHttpClient,
                     ArrayList<GalleryInfo?>(restoreItemList),
@@ -165,10 +177,14 @@ class RestoreDownloadPreference : Preference {
             } catch (e: Throwable) {
                 throwIfFatal(e)
                 e.printStackTrace()
-                return null
+                null
             }
         }
 
+        private fun publishProgress(progress: Int, max: Int) {
+            mHandler.post { onProgressUpdate(progress, max) }
+        }
+
         val isContextValid: Boolean
             get() {
                 if (mContext is Activity) {
@@ -184,7 +200,7 @@ class RestoreDownloadPreference : Preference {
             }
             if (this.isContextValid) {
                 try {
-                    if (mProgressDialog!!.isShowing()) {
+                    if (mProgressDialog!!.isShowing) {
                         mProgressDialog!!.dismiss()
                     }
                 } catch (e: IllegalArgumentException) {
@@ -194,11 +210,8 @@ class RestoreDownloadPreference : Preference {
             mProgressDialog = null
         }
 
-        override fun onProgressUpdate(vararg values: Any?) {
-            super.onProgressUpdate(*values)
+        private fun onProgressUpdate(progress: Int, max: Int) {
             if (mProgressDialog != null && this.isContextValid) {
-                val progress = values[0] as Int
-                val max = values[1] as Int
                 if (progress == -1 && max == -1) {
                     mProgressDialog!!.setIndeterminate(true)
                     mProgressDialog!!.setMessage(mApplication.getString(R.string.settings_download_restore_download_items_get_gallery_info))
@@ -210,12 +223,12 @@ class RestoreDownloadPreference : Preference {
             }
         }
 
-        override fun onCancelled() {
+        private fun onCancelled() {
             mTask = null
             dismissProgressDialog()
         }
 
-        override fun onPostExecute(o: Any?) {
+        private fun onPostExecute(o: Any?) {
             mTask = null
             dismissProgressDialog()
             if (o !is MutableList<*>) {
@@ -284,6 +297,7 @@ class RestoreDownloadPreference : Preference {
         }
 
         companion object {
+            @JvmField
             val CREATOR: Parcelable.Creator<RestoreItem?> =
                 object : Parcelable.Creator<RestoreItem?> {
                     override fun createFromParcel(source: Parcel): RestoreItem {

build.gradle

@@ -36,8 +36,8 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '9.1.1' apply false
-    id 'com.android.library' version '9.1.1' apply false
+    id 'com.android.application' version '9.2.1' apply false
+    id 'com.android.library' version '9.2.1' apply false
     id 'com.google.gms.google-services' version '4.4.2' apply false
     id "org.jetbrains.kotlin.android" version '2.2.10' apply false
     id "org.jetbrains.kotlin.plugin.parcelize" version "2.1.0" apply false

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,7 @@
 #Thu Apr 30 13:31:17 CST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME