优化

app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt

@@ -215,7 +215,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
                 val docList = DocumentUtils.listFiles(path) {
                     when {
                         it.name.startsWith(".") -> false
-                        it.isDirectory -> true
+                        it.isDir -> true
                         else -> it.name.matches(bookFileRegex)
                     }
                 }

app/src/main/java/io/legado/app/ui/font/FontSelectDialog.kt

@@ -22,7 +22,6 @@ import io.legado.app.utils.*
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
-import splitties.init.appCtx
 import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
@@ -31,9 +30,6 @@ class FontSelectDialog : BaseDialogFragment(R.layout.dialog_font_select),
     Toolbar.OnMenuItemClickListener,
     FontAdapter.CallBack {
     private val fontRegex = Regex("(?i).*\\.[ot]tf")
-    private val fontFolder by lazy {
-        FileUtils.createFolderIfNotExist(appCtx.filesDir, "Fonts")
-    }
     private val binding by viewBinding(DialogFontSelectBinding::bind)
     private val adapter by lazy {
         val curFontPath = callBack?.curFontPath ?: ""
@@ -188,7 +184,6 @@ class FontSelectDialog : BaseDialogFragment(R.layout.dialog_font_select),
 
     override fun onClick(docItem: FileDoc) {
         execute {
-            FileUtils.deleteFile(fontFolder.absolutePath)
             callBack?.selectFont(docItem.uri.toString())
         }.onSuccess {
             dismissAllowingStateLoss()

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

@@ -96,6 +96,9 @@ object DocumentUtils {
 
     @Throws(Exception::class)
     fun listFiles(uri: Uri, filter: ((file: FileDoc) -> Boolean)? = null): ArrayList<FileDoc> {
+        if (!uri.isContentScheme()) {
+            return listFiles(uri.path!!, filter)
+        }
         val docList = arrayListOf<FileDoc>()
         var cursor: Cursor? = null
         try {
@@ -139,23 +142,22 @@ object DocumentUtils {
     }
 
     @Throws(Exception::class)
-    fun listFiles(path: String, filter: ((file: File) -> Boolean)? = null): ArrayList<FileDoc> {
+    fun listFiles(path: String, filter: ((file: FileDoc) -> Boolean)? = null): ArrayList<FileDoc> {
-        val docItems = arrayListOf<FileDoc>()
+        val docList = arrayListOf<FileDoc>()
         val file = File(path)
-        file.listFiles { pathName ->
+        file.listFiles()?.forEach {
-            filter?.invoke(pathName) ?: true
+            val item = FileDoc(
-        }?.forEach {
+                it.name,
-            docItems.add(
+                it.isDirectory,
-                FileDoc(
+                it.length(),
-                    it.name,
+                Date(it.lastModified()),
-                    it.isDirectory,
+                Uri.parse(it.absolutePath)
-                    it.length(),
-                    Date(it.lastModified()),
-                    Uri.parse(it.absolutePath)
-                )
             )
+            if (filter == null || filter.invoke(item)) {
+                docList.add(item)
+            }
         }
-        return docItems
+        return docList
     }
 
 }