read-only implementation (2)

Author: vbernier02

app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt

@@ -43,7 +43,6 @@ import org.fossify.notes.databases.NotesDatabase
 import org.fossify.notes.databinding.ActivityMainBinding
 import org.fossify.notes.dialogs.*
 import org.fossify.notes.extensions.*
-import org.fossify.notes.fragments.NoteFragment
 import org.fossify.notes.fragments.TextFragment
 import org.fossify.notes.helpers.*
 import org.fossify.notes.models.Note
@@ -92,7 +91,6 @@ class MainActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         appLaunched(BuildConfig.APPLICATION_ID)
-
         setupOptionsMenu()
         refreshMenuItems()
 
@@ -492,14 +490,6 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-    private fun checkReadOnlyState() {
-        getCurrentFragment()?.apply {
-            if (this is TextFragment) {
-                (this as TextFragment).getNotesView().isEnabled = !mCurrentNote.isReadOnly
-            }
-        }
-    }
-
     private fun setupSearchButtons() {
         searchQueryET.onTextChangeListener {
             searchTextChanged(it)
@@ -1329,6 +1319,14 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun checkReadOnlyState() {
+        getCurrentFragment()?.apply {
+            if (this is TextFragment) {
+                (this as TextFragment).getNotesView().isEnabled = !mCurrentNote.isReadOnly
+            }
+        }
+    }
+
     private fun toggleReadOnly() {
         mCurrentNote.isReadOnly = !mCurrentNote.isReadOnly
         NotesHelper(this).insertOrUpdateNote(mCurrentNote) {

app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt

@@ -72,12 +72,12 @@ class NotesHelper(val context: Context) {
 
     fun insertOrUpdateNote(note: Note, callback: ((newNoteId: Long) -> Unit)? = null) {
         ensureBackgroundThread {
+            val noteId = context.notesDB.insertOrUpdate(note)
             if (note.isReadOnly) {
                 Handler(Looper.getMainLooper()).post {
-                    callback?.invoke(note.id ?: -1L)
+                    callback?.invoke(noteId)
                 }
             } else {
-                val noteId = context.notesDB.insertOrUpdate(note)
                 Handler(Looper.getMainLooper()).post {
                     callback?.invoke(noteId)
                 }