Merge pull request #135 from SecUSo/issue/#132

Fixes: #132
SecUSo · Jan 15, 2023 · f67cd0e · f67cd0e
2 parents d4c4f2e + 43af545
commit f67cd0e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/BaseNoteActivity.kt b/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/BaseNoteActivity.kt
@@ -192,17 +192,19 @@ abstract class BaseNoteActivity(noteType: Int) : AppCompatActivity(), View.OnCli
             window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
             createEditNoteViewModel.getNoteByID(id.toLong()).observe(
                 this
-            ) { note: Note ->
-                etName.setText(note.name)
+            ) { note ->
+                if (note != null) {
+                    etName.setText(note.name)
 
-                //find the current category and set spinner to that
-                currentCat = note.category
-                savedCat = currentCat
+                    //find the current category and set spinner to that
+                    currentCat = note.category
+                    savedCat = currentCat
 
-                //fill the notificationCursor
-                hasAlarm = notification!!._noteId >= 0
+                    //fill the notificationCursor
+                    hasAlarm = notification!!._noteId >= 0
 
-                onNoteLoadedFromDB(note)
+                    onNoteLoadedFromDB(note)
+                }
             }
         } else {
             onNewNote()
@@ -438,6 +440,11 @@ abstract class BaseNoteActivity(noteType: Int) : AppCompatActivity(), View.OnCli
     private fun displayTrashDialog() {
         val sp = getSharedPreferences(PreferenceKeys.SP_DATA, MODE_PRIVATE)
         createEditNoteViewModel.getNoteByID(id.toLong()).observe(this) { note ->
+            if (note == null) {
+                shouldSave = false
+                finish()
+                return@observe
+            }
             if (sp.getBoolean(PreferenceKeys.SP_DATA_DISPLAY_TRASH_MESSAGE, true)) {
                 //we never displayed the message before, so show it now
                 AlertDialog.Builder(this)

diff --git a/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/CreateEditNoteViewModel.kt b/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/CreateEditNoteViewModel.kt
@@ -117,8 +117,8 @@ class CreateEditNoteViewModel(application: Application) : AndroidViewModel(appli
         }
     }
 
-    fun getNoteByID(id: Long): LiveData<Note> {
-        val note = MutableLiveData<Note>()
+    fun getNoteByID(id: Long): LiveData<Note?> {
+        val note = MutableLiveData<Note?>()
         Log.d(TAG, "Fetching note $id from database")
         viewModelScope.launch(Dispatchers.IO) {
             note.postValue(database.noteDao().getNoteByID(id))