From 75bd60ad190e808c299fd0b53543ed5401dfdea4 Mon Sep 17 00:00:00 2001
From: Xwite <82232510+Xwite@users.noreply.github.com>
Date: Sat, 8 Oct 2022 08:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9C=AC=E5=9C=B0=E4=B9=A6?=
 =?UTF-8?q?=E7=B1=8D=E5=AF=BC=E5=85=A5=E5=92=8CwebDav=E4=B9=A6=E7=B1=8D?=
 =?UTF-8?q?=E6=97=B6=E8=AF=B7=E6=B1=82=E8=AE=BE=E7=BD=AE=E4=B9=A6=E7=B1=8D?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BD=8D=E7=BD=AE=20(#2386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: remove storage setting request

* refactor: request storage setting when needed
---
 app/src/main/AndroidManifest.xml              |  6 +--
 app/src/main/assets/storageHelp.md            |  4 +-
 .../legado/app/model/localBook/LocalBook.kt   |  4 +-
 .../ui/association/FileAssociationActivity.kt |  2 +-
 .../ui/book/import/BaseImportBookActivity.kt  | 45 +++++++++++++++++++
 .../{ => import}/local/ImportBookActivity.kt  |  7 +--
 .../{ => import}/local/ImportBookAdapter.kt   |  2 +-
 .../{ => import}/local/ImportBookViewModel.kt |  2 +-
 .../local/rule/TxtTocRuleActivity.kt          |  2 +-
 .../local/rule/TxtTocRuleAdapter.kt           |  2 +-
 .../local/rule/TxtTocRuleViewModel.kt         |  2 +-
 .../{ => import}/remote/RemoteBookActivity.kt |  7 +--
 .../{ => import}/remote/RemoteBookAdapter.kt  |  2 +-
 .../{ => import}/remote/RemoteBookSort.kt     |  2 +-
 .../remote/RemoteBookViewModel.kt             |  2 +-
 .../book/source/manage/BookSourceActivity.kt  |  2 +-
 .../io/legado/app/ui/main/MainActivity.kt     | 31 -------------
 .../main/bookshelf/BaseBookshelfFragment.kt   |  4 +-
 18 files changed, 72 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/ImportBookActivity.kt (97%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/ImportBookAdapter.kt (99%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/ImportBookViewModel.kt (99%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/rule/TxtTocRuleActivity.kt (99%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/rule/TxtTocRuleAdapter.kt (99%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/local/rule/TxtTocRuleViewModel.kt (98%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/remote/RemoteBookActivity.kt (96%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/remote/RemoteBookAdapter.kt (98%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/remote/RemoteBookSort.kt (51%)
 rename app/src/main/java/io/legado/app/ui/book/{ => import}/remote/RemoteBookViewModel.kt (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d461e6c76..0f89a8673 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -201,7 +201,7 @@
             android:screenOrientation="behind" />
         <!-- txt目录规则管理 -->
         <activity
-            android:name=".ui.book.local.rule.TxtTocRuleActivity"
+            android:name=".ui.book.import.local.rule.TxtTocRuleActivity"
             android:launchMode="singleTop"
             android:screenOrientation="behind" />
         <!-- 替换规则界面 -->
@@ -241,11 +241,11 @@
             android:launchMode="singleTop" />
         <!-- 导入书籍 -->
         <activity
-            android:name=".ui.book.local.ImportBookActivity"
+            android:name=".ui.book.import.local.ImportBookActivity"
             android:launchMode="singleTop" />
         <!-- 添加远程 -->
         <activity
-            android:name=".ui.book.remote.RemoteBookActivity"
+            android:name=".ui.book.import.remote.RemoteBookActivity"
             android:launchMode="singleTop" />
         <!-- 发现界面 -->
         <activity
diff --git a/app/src/main/assets/storageHelp.md b/app/src/main/assets/storageHelp.md
index 4f23d2a03..8830725fa 100644
--- a/app/src/main/assets/storageHelp.md
+++ b/app/src/main/assets/storageHelp.md
@@ -1,2 +1,2 @@
-* 由于安卓的存储访问限制，阅读需要设置**公共目录下的子目录**来实现书籍拷贝、下载
-* 如不设置，可能影响本地书籍、webDav书籍的正常阅读
\ No newline at end of file
+* 由于安卓的存储访问限制，阅读需要设置**公共目录下的子目录**来实现书籍拷贝、下载，例如Documents/Books、Download/Books
+* 如不设置，将无法正常使用本地书籍、webDav书籍的相关功能
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
index c5c05d3ec..3e4a67060 100644
--- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
@@ -42,7 +42,7 @@ object LocalBook {
     @Throws(FileNotFoundException::class, SecurityException::class)
     fun getBookInputStream(book: Book): InputStream {
         val uri = book.getLocalUri()
-        //文件不存在 尝试下载webDav文件 book.remoteUrl
+        //文件不存在 尝试下载webDav文件
         val inputStream = uri.inputStream(appCtx) ?: downloadRemoteBook(book)
         if (inputStream != null) return inputStream
         throw FileNotFoundException("${uri.path} 文件不存在")
@@ -303,7 +303,7 @@ object LocalBook {
         return localBook
     }
 
-    //下载book.remoteUrl对应的远程文件并更新bookUrl 返回inputStream
+    //下载book对应的远程文件并更新bookUrl 返回inputStream
     private fun downloadRemoteBook(localBook: Book): InputStream? {
         val webDavUrl = localBook.getRemoteUrl()
         if (webDavUrl.isNullOrBlank()) return null
diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
index 47000187a..69ef308bb 100644
--- a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
@@ -172,7 +172,7 @@ class FileAssociationActivity :
             }.onFailure {
                 when (it) {
                     is SecurityException -> localBookTreeSelect.launch {
-                        title = "选择保存书籍的文件夹"
+                        title = getString(R.string.select_book_folder)
                         mode = HandleFileContract.DIR_SYS
                     }
                     else -> {
diff --git a/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt
new file mode 100644
index 000000000..12219caf1
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt
@@ -0,0 +1,45 @@
+package io.legado.app.ui.book.import
+
+import androidx.lifecycle.ViewModel
+import androidx.viewbinding.ViewBinding
+import io.legado.app.R
+import io.legado.app.base.VMBaseActivity
+import io.legado.app.help.config.AppConfig
+import io.legado.app.lib.dialogs.alert
+import io.legado.app.ui.document.HandleFileContract
+
+abstract class BaseImportBookActivity<VB : ViewBinding, VM : ViewModel>(): VMBaseActivity<VB, VM>() {
+
+    private val localBookTreeSelect = registerForActivityResult(HandleFileContract()) {
+        it.uri?.let { treeUri ->
+            AppConfig.defaultBookTreeUri = treeUri.toString()
+        }
+    }
+
+    /**
+     * 设置书籍保存位置
+     */
+    protected fun setBookStorage() {
+        //测试书籍保存位置是否设置
+        if (!AppConfig.defaultBookTreeUri.isNullOrBlank()) return
+        //测试读写??
+        val storageHelp = String(assets.open("storageHelp.md").readBytes())
+        val hint = getString(R.string.select_book_folder)
+        alert(hint, storageHelp) {
+            yesButton {
+                localBookTreeSelect.launch {
+                    title = hint
+                    mode = HandleFileContract.DIR_SYS
+                }
+            }
+            noButton {
+                finish()
+            }
+            onCancelled {
+                finish()
+            }
+        }
+    }
+
+
+}
\ No newline at end of file
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/import/local/ImportBookActivity.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
index 113fb5f25..4e9cbb1db 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local
+package io.legado.app.ui.book.import.local
 
 import android.annotation.SuppressLint
 import android.net.Uri
@@ -11,7 +11,6 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.documentfile.provider.DocumentFile
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.R
-import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
 import io.legado.app.databinding.ActivityImportBookBinding
@@ -21,6 +20,7 @@ import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.permission.Permissions
 import io.legado.app.lib.permission.PermissionsCompat
 import io.legado.app.lib.theme.backgroundColor
+import io.legado.app.ui.book.import.BaseImportBookActivity
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.widget.SelectActionBar
 import io.legado.app.utils.*
@@ -34,7 +34,7 @@ import java.io.File
 /**
  * 导入本地书籍界面
  */
-class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookViewModel>(),
+class ImportBookActivity : BaseImportBookActivity<ActivityImportBookBinding, ImportBookViewModel>(),
     PopupMenu.OnMenuItemClickListener,
     ImportBookAdapter.CallBack,
     SelectActionBar.CallBack {
@@ -61,6 +61,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
         initView()
         initEvent()
         initData()
+        setBookStorage()
     }
 
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt
index b310d5fc2..552d267f8 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local
+package io.legado.app.ui.book.import.local
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt
index c4f760850..3a64d7d26 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local
+package io.legado.app.ui.book.import.local
 
 import android.app.Application
 import android.net.Uri
diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleActivity.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleActivity.kt
index 1aa6791a1..a75478343 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local.rule
+package io.legado.app.ui.book.import.local.rule
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleAdapter.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleAdapter.kt
index 652ae5b94..76b014d5a 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local.rule
+package io.legado.app.ui.book.import.local.rule
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleViewModel.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleViewModel.kt
index 2c4cf0028..edc29a395 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/rule/TxtTocRuleViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.local.rule
+package io.legado.app.ui.book.import.local.rule
 
 import android.app.Application
 import io.legado.app.base.BaseViewModel
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt
similarity index 96%
rename from app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt
index a6714d8b4..6c98f4016 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.remote
+package io.legado.app.ui.book.import.remote
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -9,11 +9,11 @@ import androidx.activity.viewModels
 import androidx.core.view.isGone
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.R
-import io.legado.app.base.VMBaseActivity
 import io.legado.app.databinding.ActivityImportBookBinding
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.model.remote.RemoteBook
 import io.legado.app.ui.about.AppLogDialog
+import io.legado.app.ui.book.import.BaseImportBookActivity
 import io.legado.app.ui.widget.SelectActionBar
 import io.legado.app.ui.widget.dialog.WaitDialog
 import io.legado.app.utils.showDialogFragment
@@ -28,7 +28,7 @@ import java.io.File
  * @author qianfanguojin
  * @time 2022/05/12
  */
-class RemoteBookActivity : VMBaseActivity<ActivityImportBookBinding, RemoteBookViewModel>(),
+class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, RemoteBookViewModel>(),
     RemoteBookAdapter.CallBack,
     SelectActionBar.CallBack {
     override val binding by viewBinding(ActivityImportBookBinding::inflate)
@@ -41,6 +41,7 @@ class RemoteBookActivity : VMBaseActivity<ActivityImportBookBinding, RemoteBookV
         initView()
         initData()
         initEvent()
+        setBookStorage()
     }
 
     private fun initView() {
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt
index 16f4b37a1..25b9d98f2 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.remote
+package io.legado.app.ui.book.import.remote
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt
similarity index 51%
rename from app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt
rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt
index 8e8786bc2..41964035e 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookSort.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.remote
+package io.legado.app.ui.book.import.remote
 
 enum class RemoteBookSort {
     Default, Name
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt
index 902fa5ad2..725038532 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.remote
+package io.legado.app.ui.book.import.remote
 
 import android.app.Application
 import io.legado.app.base.BaseViewModel
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
index 0883ccf65..f845dc1d2 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@@ -28,7 +28,7 @@ import io.legado.app.lib.theme.primaryTextColor
 import io.legado.app.model.CheckSource
 import io.legado.app.model.Debug
 import io.legado.app.ui.association.ImportBookSourceDialog
-import io.legado.app.ui.book.local.rule.TxtTocRuleActivity
+import io.legado.app.ui.book.import.local.rule.TxtTocRuleActivity
 import io.legado.app.ui.book.source.debug.BookSourceDebugActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
 import io.legado.app.ui.config.CheckSourceConfig
diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
index 6b6ed9c71..dfb6ea19b 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
@@ -31,7 +31,6 @@ import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.elevation
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment
 import io.legado.app.ui.main.bookshelf.style1.BookshelfFragment1
 import io.legado.app.ui.main.bookshelf.style2.BookshelfFragment2
@@ -73,12 +72,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
     private var bottomMenuCount = 4
     private val realPositions = arrayOf(idBookshelf, idExplore, idRss, idMy)
 
-    private val localBookTreeSelect = registerForActivityResult(HandleFileContract()) {
-        it.uri?.let { treeUri ->
-            AppConfig.defaultBookTreeUri = treeUri.toString()
-        }
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         upBottomMenu()
         binding.run {
@@ -99,8 +92,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
             if (!privacyPolicy()) return@launch
             //版本更新
             upVersion()
-            //请求设置书籍保存位置
-            setBookStorage()
             //自动更新书籍
             val isAutoRefreshedBook = savedInstanceState?.getBoolean("isAutoRefreshedBook") ?: false
             if (AppConfig.autoRefreshBook && !isAutoRefreshedBook) {
@@ -219,28 +210,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
         }
     }
 
-    /**
-     * 设置书籍保存位置
-     */
-    private fun setBookStorage() {
-        //测试书籍保存位置是否设置
-        if (!AppConfig.defaultBookTreeUri.isNullOrBlank()) return
-        //测试读写??
-        val storageHelp = String(assets.open("storageHelp.md").readBytes())
-        alert("设置书籍保存位置", storageHelp) {
-            yesButton {
-                localBookTreeSelect.launch {
-                    title = getString(R.string.select_book_folder)
-                    mode = HandleFileContract.DIR_SYS
-                }
-            }
-            neutralButton("不想设置") {
-                AppConfig.defaultBookTreeUri = "null"
-            }
-            noButton()
-        }
-    }
-
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
         event?.let {
             when (keyCode) {
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 85f19c0e5..1e04585e9 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -21,9 +21,9 @@ import io.legado.app.lib.dialogs.alert
 import io.legado.app.ui.about.AppLogDialog
 import io.legado.app.ui.book.cache.CacheActivity
 import io.legado.app.ui.book.group.GroupManageDialog
-import io.legado.app.ui.book.local.ImportBookActivity
+import io.legado.app.ui.book.import.local.ImportBookActivity
+import io.legado.app.ui.book.import.remote.RemoteBookActivity
 import io.legado.app.ui.book.manage.BookshelfManageActivity
-import io.legado.app.ui.book.remote.RemoteBookActivity
 import io.legado.app.ui.book.search.SearchActivity
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.main.MainViewModel