fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-15 15:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

delete the note created from file only after handling SAF dialog

Browse Source
This commit is contained in:
tibbi 2018-01-25 23:56:24 +01:00
parent 0bcadef773
commit eccdd5229b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import android.os.Bundle
import android.support.v4.view.ViewPager import android.support.v4.view.ViewPager
import android.text.method.ArrowKeyMovementMethod import android.text.method.ArrowKeyMovementMethod
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.util.Log
import android.util.TypedValue import android.util.TypedValue
import android.view.ActionMode import android.view.ActionMode
import android.view.Gravity import android.view.Gravity
@ -380,17 +379,26 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
} }
fun deleteNote(deleteFile: Boolean) { fun deleteNote(deleteFile: Boolean) {
if (mNotes.size <= 1) if (mNotes.size <= 1) {
return return
}
val deletedNoteId = mCurrentNote.id if (!deleteFile) {
val path = mCurrentNote.path doDeleteNote(mCurrentNote, deleteFile)
} else {
handleSAFDialog(File(mCurrentNote.path)) {
doDeleteNote(mCurrentNote, deleteFile)
}
}
}
private fun doDeleteNote(note: Note, deleteFile: Boolean) {
dbHelper.deleteNote(mCurrentNote.id) dbHelper.deleteNote(mCurrentNote.id)
mNotes = dbHelper.getNotes() mNotes = dbHelper.getNotes()
val firstNoteId = mNotes[0].id val firstNoteId = mNotes[0].id
updateSelectedNote(firstNoteId) updateSelectedNote(firstNoteId)
if (config.widgetNoteId == deletedNoteId) { if (config.widgetNoteId == note.id) {
config.widgetNoteId = mCurrentNote.id config.widgetNoteId = mCurrentNote.id
updateWidget() updateWidget()
} }
@ -398,7 +406,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
initViewPager() initViewPager()
if (deleteFile) { if (deleteFile) {
deleteFile(File(path)) { deleteFile(File(note.path)) {
if (!it) { if (!it) {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)
} }