From e84a5409e4e49f6fda9c96fc5efa7eb280c29102 Mon Sep 17 00:00:00 2001
From: PhilKes <phil.kessler@gmx.de>
Date: Tue, 29 Oct 2024 18:49:10 +0100
Subject: [PATCH] When exiting a note delete it if it's empty

---
 .../activity/note/EditActivity.kt             | 17 +++++++++----
 .../activity/note/EditListActivity.kt         | 14 +++++++----
 .../activity/note/EditNoteActivity.kt         |  7 ------
 .../presentation/viewmodel/NotallyModel.kt    | 25 +++++++++++++++----
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
index c500daa3..d272e592 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
@@ -48,6 +48,7 @@ import com.philkes.notallyx.presentation.view.note.audio.AudioAdapter
 import com.philkes.notallyx.presentation.view.note.preview.PreviewFileAdapter
 import com.philkes.notallyx.presentation.view.note.preview.PreviewImageAdapter
 import com.philkes.notallyx.presentation.viewmodel.NotallyModel
+import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.FileError
 import com.philkes.notallyx.utils.Operations
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
@@ -68,7 +69,11 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
 
     override fun finish() {
         lifecycleScope.launch(Dispatchers.Main) {
-            saveNote()
+            if (model.isEmpty()) {
+                model.deleteBaseNote()
+            } else if (changeHistory.canUndo()) {
+                saveNote()
+            }
             super.finish()
         }
     }
@@ -76,13 +81,15 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putLong("id", model.id)
-        lifecycleScope.launch { saveNote() }
+        if (changeHistory.canUndo()) {
+            lifecycleScope.launch { saveNote() }
+        }
     }
 
     open suspend fun saveNote() {
-        if (changeHistory.canUndo()) {
-            model.modifiedTimestamp = System.currentTimeMillis()
-        }
+        model.modifiedTimestamp = System.currentTimeMillis()
+        model.saveNote()
+        WidgetProvider.sendBroadcast(application, longArrayOf(model.id))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
index af441f0d..2e599cc7 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
@@ -1,6 +1,7 @@
 package com.philkes.notallyx.presentation.activity.note
 
 import android.os.Build
+import android.os.Bundle
 import android.view.MenuItem
 import android.view.inputmethod.InputMethodManager
 import com.philkes.notallyx.Preferences
@@ -15,7 +16,6 @@ import com.philkes.notallyx.presentation.view.note.listitem.sorting.ListItemNoSo
 import com.philkes.notallyx.presentation.view.note.listitem.sorting.ListItemSortedByCheckedCallback
 import com.philkes.notallyx.presentation.view.note.listitem.sorting.ListItemSortedList
 import com.philkes.notallyx.presentation.view.note.listitem.sorting.toMutableList
-import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
 
 class EditListActivity : EditActivity(Type.LIST) {
@@ -25,10 +25,14 @@ class EditListActivity : EditActivity(Type.LIST) {
 
     private lateinit var listManager: ListManager
 
-    override suspend fun saveNote() {
-        super.saveNote()
-        model.saveNote(items.toMutableList())
-        WidgetProvider.sendBroadcast(application, longArrayOf(model.id))
+    override fun finish() {
+        model.setItems(items.toMutableList())
+        super.finish()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        model.setItems(items.toMutableList())
+        super.onSaveInstanceState(outState)
     }
 
     override fun setupToolbar() {
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
index 4dc006f0..419d8a37 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
@@ -38,7 +38,6 @@ import com.philkes.notallyx.presentation.setOnNextAction
 import com.philkes.notallyx.presentation.showAndFocus
 import com.philkes.notallyx.presentation.showKeyboard
 import com.philkes.notallyx.presentation.view.Constants
-import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.LinkMovementMethod
 
 private const val UNNAMED_NOTE_PLACEHOLDER = "Unnamed Note"
@@ -49,12 +48,6 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
     private lateinit var pickNoteNewActivityResultLauncher: ActivityResultLauncher<Intent>
     private lateinit var pickNoteUpdateActivityResultLauncher: ActivityResultLauncher<Intent>
 
-    override suspend fun saveNote() {
-        super.saveNote()
-        model.saveNote()
-        WidgetProvider.sendBroadcast(application, longArrayOf(model.id))
-    }
-
     override fun configureUI() {
         binding.EnterTitle.setOnNextAction { binding.EnterBody.requestFocus() }
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
index 4fa0b916..ec4f20cc 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
@@ -247,8 +247,23 @@ class NotallyModel(private val app: Application) : AndroidViewModel(app) {
         }
     }
 
-    suspend fun saveNote(items: List<ListItem> = this.items): Long {
-        return withContext(Dispatchers.IO) { baseNoteDao.insert(getBaseNote(items)) }
+    fun setItems(items: List<ListItem>) {
+        this.items.clear()
+        this.items.addAll(items)
+    }
+
+    suspend fun saveNote(): Long {
+        return withContext(Dispatchers.IO) { baseNoteDao.insert(getBaseNote()) }
+    }
+
+    fun isEmpty(): Boolean {
+        return title.isEmpty() &&
+            body.isEmpty() &&
+            items.none { item -> item.body.isNotEmpty() } &&
+            labels.isEmpty() &&
+            files.value.isEmpty() &&
+            images.value.isEmpty() &&
+            audios.value.isEmpty()
     }
 
     private suspend fun updateImages() {
@@ -263,10 +278,10 @@ class NotallyModel(private val app: Application) : AndroidViewModel(app) {
         withContext(Dispatchers.IO) { baseNoteDao.updateAudios(id, audios.value) }
     }
 
-    private fun getBaseNote(currentItems: List<ListItem> = this.items): BaseNote {
+    private fun getBaseNote(): BaseNote {
         val spans = getFilteredSpans(body)
         val body = this.body.trimEnd().toString()
-        val items = currentItems.filter { item -> item.body.isNotEmpty() }
+        val nonEmptyItems = this.items.filter { item -> item.body.isNotEmpty() }
         return BaseNote(
             id,
             type,
@@ -279,7 +294,7 @@ class NotallyModel(private val app: Application) : AndroidViewModel(app) {
             labels,
             body,
             spans,
-            items,
+            nonEmptyItems,
             images.value,
             files.value,
             audios.value,