Skip to content

fix(note-editor): 'discard changes' incorrectly shown #20091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
david-allison wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −9
Open

fix(note-editor): 'discard changes' incorrectly shown #20091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,17 @@ class NoteEditorFragment :
return false
}

fun fieldsEdited(): Boolean {
// Editing an existing note: Check to see if the fields are changed
if (!addNote) {
return editFields!!.map { it.text?.toString() } != editorNote!!.fields.toList()
}

if (!isFieldEdited) return false
// BUG: Does not account for sticky fields
return editFields!!.any { it.text.toString() != "" }
}

// changed note type?
if (!addNote && currentEditedCard != null) {
val newNoteType = currentlySelectedNotetype
Expand All @@ -1240,18 +1251,14 @@ class NoteEditorFragment :
if (!addNote && currentEditedCard != null && currentEditedCard!!.currentDeckId() != deckId) {
return true
}

// changed fields?
if (isFieldEdited) {
for (value in editFields!!) {
if (value.text.toString() != "") {
return true
}
}
return false
} else {
return isTagsEdited
if (fieldsEdited()) {
return true
}

// changed tags?
return isTagsEdited
}

private fun collectionHasLoaded(): Boolean = allNoteTypeIds != null
Expand Down