From 2a6ca93ccd31062a59549f6d764fbda696671397 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Tue, 19 Sep 2023 23:39:37 +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/file/FileManageActivity.kt   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt b/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt
index 84e807aac..636ee3d8d 100644
--- a/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/file/FileManageActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
+import androidx.activity.addCallback
 import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.FileProvider
@@ -55,6 +56,13 @@ class FileManageActivity : VMBaseActivity<ActivityFileManageBinding, FileManageV
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.addItemDecoration(VerticalDivider(this))
         binding.recyclerView.adapter = fileAdapter
+        onBackPressedDispatcher.addCallback(this) {
+            if (viewModel.lastDir != viewModel.rootDoc) {
+                gotoLastDir()
+                return@addCallback
+            }
+            finish()
+        }
     }
 
     private fun initSearchView() {
@@ -87,6 +95,12 @@ class FileManageActivity : VMBaseActivity<ActivityFileManageBinding, FileManageV
         }
     }
 
+    private fun gotoLastDir() {
+        viewModel.subDocs.removeLastOrNull()
+        pathAdapter.setItems(viewModel.subDocs)
+        viewModel.upFiles(viewModel.lastDir)
+    }
+
     override fun observeLiveBus() {
         viewModel.filesLiveData.observe(this) {
             searchView.setQuery("", false)
@@ -155,9 +169,7 @@ class FileManageActivity : VMBaseActivity<ActivityFileManageBinding, FileManageV
                 val item = getItemByLayoutPosition(holder.layoutPosition)
                 item?.let {
                     if (item == viewModel.lastDir) {
-                        viewModel.subDocs.removeLastOrNull()
-                        pathAdapter.setItems(viewModel.subDocs)
-                        viewModel.upFiles(viewModel.subDocs.lastOrNull() ?: viewModel.rootDoc)
+                        gotoLastDir()
                     } else if (item.isDirectory) {
                         viewModel.subDocs.add(item)
                         pathAdapter.setItems(viewModel.subDocs)