优化

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

@@ -1,12 +1,13 @@
 package io.legado.app.utils
 
-import android.app.Activity.RESULT_OK
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
 
 fun <T> ActivityResultLauncher<T?>.launch() {
     launch(null)
@@ -14,20 +15,17 @@ fun <T> ActivityResultLauncher<T?>.launch() {
 
 class SelectImageContract : ActivityResultContract<Int?, SelectImageContract.Result>() {
 
+    private val delegate = ActivityResultContracts.PickVisualMedia()
     var requestCode: Int? = null
 
     override fun createIntent(context: Context, input: Int?): Intent {
         requestCode = input
-        return Intent(Intent.ACTION_GET_CONTENT)
+        val request = PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
-            .addCategory(Intent.CATEGORY_OPENABLE)
+        return delegate.createIntent(context, request)
-            .setType("image/*")
     }
 
     override fun parseResult(resultCode: Int, intent: Intent?): Result {
-        if (resultCode == RESULT_OK) {
+        return Result(requestCode, delegate.parseResult(resultCode, intent))
-            return Result(requestCode, intent?.data)
-        }
-        return Result(requestCode, null)
     }
 
     data class Result(