From 98bb0b8f14081773630929f7b18cc8bd7c9b614c Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Sat, 27 Nov 2021 19:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/book/local/ImportBookActivity.kt   | 12 ++++++------
 .../io/legado/app/utils/ActivityResultContracts.kt   |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
index d2c68cbfe..78686fe19 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
@@ -72,7 +72,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
 
     override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_select_folder -> selectFolder.launch { }
+            R.id.menu_select_folder -> selectFolder.launch()
             R.id.menu_scan_folder -> scanFolder()
             R.id.menu_import_file_name -> alertImportFileName()
         }
@@ -133,7 +133,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
         when {
             lastPath.isNullOrEmpty() -> {
                 binding.tvEmptyMsg.visible()
-                selectFolder.launch { }
+                selectFolder.launch()
             }
             lastPath.isContentScheme() -> {
                 val rootUri = Uri.parse(lastPath)
@@ -141,7 +141,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
                     val doc = DocumentFile.fromTreeUri(this, rootUri)
                     if (doc == null || doc.name.isNullOrEmpty()) {
                         binding.tvEmptyMsg.visible()
-                        selectFolder.launch { }
+                        selectFolder.launch()
                     } else {
                         subDocs.clear()
                         rootDoc = FileDoc.fromDocumentFile(doc)
@@ -149,12 +149,12 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
                     }
                 }.onFailure {
                     binding.tvEmptyMsg.visible()
-                    selectFolder.launch { }
+                    selectFolder.launch()
                 }
             }
             Build.VERSION.SDK_INT > Build.VERSION_CODES.Q -> {
                 binding.tvEmptyMsg.visible()
-                selectFolder.launch { }
+                selectFolder.launch()
             }
             else -> initRootPath(lastPath)
         }
@@ -172,7 +172,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
                     upPath()
                 }.onFailure {
                     binding.tvEmptyMsg.visible()
-                    selectFolder.launch { }
+                    selectFolder.launch()
                 }
             }
             .request()
diff --git a/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
index ce9dd0cd5..6a8e94a00 100644
--- a/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
+++ b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
@@ -5,8 +5,13 @@ 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.contract.ActivityResultContract
 
+fun ActivityResultLauncher<*>.launch() {
+    launch(null)
+}
+
 class SelectImageContract : ActivityResultContract<Int?, SelectImageContract.Result>() {
 
     var requestCode: Int? = null