From e13926e6f52d908980598570251a2177b9113f71 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 7 Dec 2019 13:56:53 +0100 Subject: [PATCH] adding an extra check to avoid deleting wrong notes --- .../simplemobiletools/notes/pro/activities/MainActivity.kt | 6 +++--- .../simplemobiletools/notes/pro/fragments/TextFragment.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 4e9ffb4e..ac6c9ecf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -628,12 +628,12 @@ class MainActivity : SimpleActivity() { private fun displayDeleteNotePrompt() { DeleteNoteDialog(this, mCurrentNote) { - deleteNote(it) + deleteNote(it, mCurrentNote) } } - fun deleteNote(deleteFile: Boolean) { - if (mNotes.size <= 1) { + fun deleteNote(deleteFile: Boolean, note: Note) { + if (mNotes.size <= 1 || note != mCurrentNote) { return } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt index ca01bf72..39814e0a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt @@ -118,7 +118,7 @@ class TextFragment : NoteFragment() { val fileContents = note!!.getNoteStoredValue() if (fileContents == null) { - (activity as MainActivity).deleteNote(false) + (activity as MainActivity).deleteNote(false, note!!) return }