fix: 修复7个bug

Baker0o7 · AndroidForClaw · Baker0o7 · commit 940495a8462d · 2026-04-02T16:21:58.000-06:00
- 修复收藏夹筛选器不工作的问题 (combine缺少showFavoritesOnly)
- 修复长按菜单恢复操作索引错误 (硬编码索引→动态查找)
- 修复滑动撤销操作导致状态错误 (toggleArchive/trash→直接恢复)
- 实现完整的JSON导入功能 (解析notes/tags/noteTags)
- 修复loadTrashedNotes阻塞协程 (collect→asLiveData.observe)
- 替换废弃的onBackPressed()为OnBackPressedCallback
- 替换废弃的versionCode为longVersionCode

Co-Authored-By: AndroidForClaw &lt;androidforclaw@users.noreply.github.com&gt;
diff --git a/app/src/main/kotlin/com/kitabu/app/ui/editor/EditorActivity.kt b/app/src/main/kotlin/com/kitabu/app/ui/editor/EditorActivity.kt
@@ -16,6 +16,7 @@ import android.widget.LinearLayout
 import android.widget.GridLayout
 import android.widget.TextView as AndroidTextView
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -86,6 +87,7 @@ class EditorActivity : AppCompatActivity() {
         setupColorPicker()
         setupWordCount()
         setupAutoSave()
+        setupBackPress()
 
         val noteId     = intent.getIntExtra(EXTRA_NOTE_ID, -1)
         val templateId = intent.getIntExtra(EXTRA_TEMPLATE_ID, -1)
@@ -757,6 +759,13 @@ class EditorActivity : AppCompatActivity() {
         else                  -> super.onOptionsItemSelected(item)
     }
 
-    override fun onBackPressed() { performSave() }
     override fun onPause()       { super.onPause(); performSave(silent = true) }
+
+    private fun setupBackPress() {
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                performSave()
+            }
+        })
+    }
 }
diff --git a/app/src/main/kotlin/com/kitabu/app/ui/notes/MainActivity.kt b/app/src/main/kotlin/com/kitabu/app/ui/notes/MainActivity.kt
@@ -10,6 +10,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
+import androidx.lifecycle.asLiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
@@ -135,12 +136,20 @@ class MainActivity : AppCompatActivity() {
                     showingArchived -> {
                         vm.toggleArchive(nwt.note)
                         Snackbar.make(binding.root, "Restored to notes", Snackbar.LENGTH_LONG)
-                            .setAction("Undo") { vm.toggleArchive(nwt.note) }.show()
+                            .setAction("Undo") {
+                                lifecycleScope.launch {
+                                    vm.repo.archive(nwt.note)
+                                }
+                            }.show()
                     }
                     else -> {
                         vm.trash(nwt.note)
                         Snackbar.make(binding.root, "Moved to trash", Snackbar.LENGTH_LONG)
-                            .setAction("Undo") { lifecycleScope.launch { vm.trash(nwt.note) } }.show()
+                            .setAction("Undo") {
+                                lifecycleScope.launch {
+                                    vm.repo.restoreFromTrash(nwt.note)
+                                }
+                            }.show()
                     }
                 }
             }
@@ -170,16 +179,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun loadTrashedNotes() {
-        lifecycleScope.launch {
-            vm.repo.trashedNotes.collect { list ->
-                adapter.submitList(list)
-                binding.layoutEmpty.visibility = if (list.isEmpty()) View.VISIBLE else View.GONE
-                binding.recyclerView.visibility = if (list.isEmpty()) View.GONE else View.VISIBLE
-                supportActionBar?.subtitle = "${list.size} trashed note${if (list.size != 1) "s" else ""}"
-                binding.emptyIcon.text = ""
-                binding.emptyTitle.text = "Trash is empty"
-                binding.emptySubtitle.text = "Deleted notes appear here for 30 days"
-            }
+        vm.repo.trashedNotes.asLiveData().observe(this) { list ->
+            adapter.submitList(list)
+            binding.layoutEmpty.visibility = if (list.isEmpty()) View.VISIBLE else View.GONE
+            binding.recyclerView.visibility = if (list.isEmpty()) View.GONE else View.VISIBLE
+            supportActionBar?.subtitle = "${list.size} trashed note${if (list.size != 1) "s" else ""}"
+            binding.emptyIcon.text = ""
+            binding.emptyTitle.text = "Trash is empty"
+            binding.emptySubtitle.text = "Deleted notes appear here for 30 days"
         }
     }
 
@@ -264,20 +271,23 @@ class MainActivity : AppCompatActivity() {
         if (showingTrashed) opts.add("Restore")
         opts.add("Delete")
         opts.add("Share")
+        val restoreIdx = opts.indexOf("Restore")
+        val deleteIdx = opts.indexOf("Delete")
+        val shareIdx = opts.indexOf("Share")
         MaterialAlertDialogBuilder(this, R.style.KitabuDialog)
             .setItems(opts.toTypedArray()) { _, i ->
                 when {
-                    showingTrashed && i == opts.size - 3 -> { /* restore */
-                        lifecycleScope.launch { vm.trash(note) }
+                    restoreIdx != -1 && i == restoreIdx -> {
+                        lifecycleScope.launch { vm.repo.restoreFromTrash(note) }
                     }
                     i == 0 -> vm.togglePin(note)
                     i == 1 -> vm.toggleFavorite(note)
                     i == 2 -> vm.toggleLock(note)
                     i == 3 && !showingTrashed -> {
-                        if (showingArchived) vm.toggleArchive(note) else vm.toggleArchive(note)
+                        vm.toggleArchive(note)
                     }
-                    i == opts.size - 2 -> confirmDelete(note)
-                    i == opts.size - 1 -> shareNote(nwt)
+                    i == deleteIdx -> confirmDelete(note)
+                    i == shareIdx -> shareNote(nwt)
                 }
             }.show()
     }
@@ -333,9 +343,59 @@ class MainActivity : AppCompatActivity() {
                 val content = contentResolver.openInputStream(uri)?.use { stream ->
                     BufferedReader(InputStreamReader(stream)).readText()
                 } ?: return@launch
-                Snackbar.make(binding.root, "Import started...", Snackbar.LENGTH_SHORT).show()
-                // Basic import - show the JSON for now
-                Snackbar.make(binding.root, "Import: ${content.take(100)}", Snackbar.LENGTH_LONG).show()
+                val json = org.json.JSONObject(content)
+                val notesArr = json.optJSONArray("notes") ?: org.json.JSONArray()
+                val tagsArr = json.optJSONArray("tags") ?: org.json.JSONArray()
+                val noteTagsArr = json.optJSONArray("noteTags") ?: org.json.JSONArray()
+
+                // Import tags first (build oldId -> newId map)
+                val tagIdMap = mutableMapOf<Int, Int>()
+                for (i in 0 until tagsArr.length()) {
+                    val t = tagsArr.getJSONObject(i)
+                    val oldId = t.getInt("id")
+                    val name = t.getString("name")
+                    val newTag = vm.getOrCreateTag(name)
+                    tagIdMap[oldId] = newTag.id
+                }
+
+                // Import notes
+                val noteIdMap = mutableMapOf<Int, Int>()
+                var imported = 0
+                for (i in 0 until notesArr.length()) {
+                    val n = notesArr.getJSONObject(i)
+                    val oldId = n.getInt("id")
+                    val note = Note(
+                        title = n.optString("title", ""),
+                        content = n.optString("content", ""),
+                        color = n.optInt("color", 0),
+                        isPinned = n.optBoolean("isPinned", false),
+                        isLocked = n.optBoolean("isLocked", false),
+                        isArchived = n.optBoolean("isArchived", false),
+                        isFavorite = n.optBoolean("isFavorite", false),
+                        isDaily = n.optBoolean("isDaily", false),
+                        dailyDate = n.optString("dailyDate", null),
+                        reminderTime = if (n.isNull("reminderTime")) null else n.optLong("reminderTime"),
+                        createdAt = n.optLong("createdAt", System.currentTimeMillis()),
+                        updatedAt = n.optLong("updatedAt", System.currentTimeMillis())
+                    )
+                    val newId = vm.repo.insert(note)
+                    noteIdMap[oldId] = newId.toInt()
+                    imported++
+                }
+
+                // Import note-tag associations
+                for (i in 0 until noteTagsArr.length()) {
+                    val nt = noteTagsArr.getJSONObject(i)
+                    val oldNoteId = nt.getInt("noteId")
+                    val oldTagId = nt.getInt("tagId")
+                    val newNoteId = noteIdMap[oldNoteId]
+                    val newTagId = tagIdMap[oldTagId]
+                    if (newNoteId != null && newTagId != null) {
+                        vm.setTagsForNote(newNoteId, listOf(newTagId))
+                    }
+                }
+
+                Snackbar.make(binding.root, "Imported $imported notes", Snackbar.LENGTH_LONG).show()
             } catch (e: Exception) {
                 Snackbar.make(binding.root, "Import failed: ${e.message}", Snackbar.LENGTH_SHORT).show()
             }
diff --git a/app/src/main/kotlin/com/kitabu/app/ui/notes/NoteViewModel.kt b/app/src/main/kotlin/com/kitabu/app/ui/notes/NoteViewModel.kt
@@ -24,13 +24,13 @@ class NoteViewModel(application: Application) : AndroidViewModel(application) {
 
     @OptIn(ExperimentalCoroutinesApi::class)
     val notes: LiveData<List<NoteWithTags>> = combine(
-        _searchQuery.debounce(300), _sortOrder, _filterTagId, _showDailyOnly, _showArchivedOnly
-    ) { q, sort, tagId, dailyOnly, archivedOnly ->
-        FilterState(q, sort, tagId, dailyOnly, archivedOnly)
+        _searchQuery.debounce(300), _sortOrder, _filterTagId, _showDailyOnly, _showArchivedOnly, _showFavoritesOnly
+    ) { q, sort, tagId, dailyOnly, archivedOnly, favoritesOnly ->
+        FilterState(q, sort, tagId, dailyOnly, archivedOnly, favoritesOnly)
     }
         .flatMapLatest { state ->
             val base: Flow<List<NoteWithTags>> = when {
-                _showFavoritesOnly.value -> repo.favoriteNotes
+                state.favoritesOnly  -> repo.favoriteNotes
                 state.archivedOnly   -> repo.archivedNotes
                 state.dailyOnly      -> repo.dailyNotes
                 state.tagId != null  -> repo.getNotesByTag(state.tagId)
@@ -47,7 +47,8 @@ class NoteViewModel(application: Application) : AndroidViewModel(application) {
         val sort: SortOrder,
         val tagId: Int?,
         val dailyOnly: Boolean,
-        val archivedOnly: Boolean
+        val archivedOnly: Boolean,
+        val favoritesOnly: Boolean = false
     )
 
     private fun sorted(list: List<NoteWithTags>, sort: SortOrder): List<NoteWithTags> {
diff --git a/app/src/main/kotlin/com/kitabu/app/ui/settings/SettingsActivity.kt b/app/src/main/kotlin/com/kitabu/app/ui/settings/SettingsActivity.kt
@@ -52,7 +52,13 @@ class SettingsActivity : AppCompatActivity() {
 
         try {
             val pInfo = packageManager.getPackageInfo(packageName, 0)
-            binding.tvVersion.text = "Kitabu v${pInfo.versionName} (${pInfo.versionCode})"
+            val versionCode = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+                pInfo.longVersionCode
+            } else {
+                @Suppress("DEPRECATION")
+                pInfo.versionCode
+            }
+            binding.tvVersion.text = "Kitabu v${pInfo.versionName} ($versionCode)"
         } catch (_: Exception) {
             binding.tvVersion.text = "Kitabu v3.0.0"
         }
