Skip to content

Commit eccdd52

Browse files
committed
delete the note created from file only after handling SAF dialog
1 parent 0bcadef commit eccdd52

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.os.Bundle
66
import android.support.v4.view.ViewPager
77
import android.text.method.ArrowKeyMovementMethod
88
import android.text.method.LinkMovementMethod
9-
import android.util.Log
109
import android.util.TypedValue
1110
import android.view.ActionMode
1211
import android.view.Gravity
@@ -380,25 +379,34 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
380379
}
381380

382381
fun deleteNote(deleteFile: Boolean) {
383-
if (mNotes.size <= 1)
382+
if (mNotes.size <= 1) {
384383
return
384+
}
385+
386+
if (!deleteFile) {
387+
doDeleteNote(mCurrentNote, deleteFile)
388+
} else {
389+
handleSAFDialog(File(mCurrentNote.path)) {
390+
doDeleteNote(mCurrentNote, deleteFile)
391+
}
392+
}
393+
}
385394

386-
val deletedNoteId = mCurrentNote.id
387-
val path = mCurrentNote.path
395+
private fun doDeleteNote(note: Note, deleteFile: Boolean) {
388396
dbHelper.deleteNote(mCurrentNote.id)
389397
mNotes = dbHelper.getNotes()
390398

391399
val firstNoteId = mNotes[0].id
392400
updateSelectedNote(firstNoteId)
393-
if (config.widgetNoteId == deletedNoteId) {
401+
if (config.widgetNoteId == note.id) {
394402
config.widgetNoteId = mCurrentNote.id
395403
updateWidget()
396404
}
397405
invalidateOptionsMenu()
398406
initViewPager()
399407

400408
if (deleteFile) {
401-
deleteFile(File(path)) {
409+
deleteFile(File(note.path)) {
402410
if (!it) {
403411
toast(R.string.unknown_error_occurred)
404412
}

0 commit comments

Comments
 (0)