kunfei пре 4 година
родитељ
комит
5143091001
1 измењених фајлова са 16 додато и 2 уклоњено
  1. 16 2
      app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt

+ 16 - 2
app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt

@@ -62,8 +62,7 @@ class RemoteBookActivity : VMBaseActivity<ActivityImportBookBinding, RemoteBookV
 
 
     private fun initEvent() {
     private fun initEvent() {
         binding.tvGoBack.setOnClickListener {
         binding.tvGoBack.setOnClickListener {
-            viewModel.dirList.removeLastOrNull()
-            upPath()
+           goBackDir()
         }
         }
     }
     }
 
 
@@ -97,6 +96,21 @@ class RemoteBookActivity : VMBaseActivity<ActivityImportBookBinding, RemoteBookV
         }
         }
     }
     }
 
 
+    override fun onBackPressed() {
+        if (!goBackDir()) {
+            super.onBackPressed()
+        }
+    }
+
+    private fun goBackDir(): Boolean {
+        if (viewModel.dirList.isEmpty()) {
+            return false
+        }
+        viewModel.dirList.removeLastOrNull()
+        upPath()
+        return true
+    }
+
     private fun upPath() {
     private fun upPath() {
         binding.tvGoBack.isEnabled = viewModel.dirList.isNotEmpty()
         binding.tvGoBack.isEnabled = viewModel.dirList.isNotEmpty()
         var path = "books" + File.separator
         var path = "books" + File.separator