Notepad 3.0 (release 2)

* Work around crashes in rare cases when there could be more than one draft * Fix logic for importing drafts from 2.x
farmerbb · Oct 5, 2022 · 3a1d440 · 3a1d440
1 parent 141191f
commit 3a1d440
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/com/farmerbb/notepad/data/NotepadRepository.kt b/app/src/main/java/com/farmerbb/notepad/data/NotepadRepository.kt
@@ -27,13 +27,18 @@ import com.farmerbb.notepad.model.SortOrder.TitleAscending
 import com.farmerbb.notepad.model.SortOrder.TitleDescending
 import com.squareup.sqldelight.runtime.coroutines.asFlow
 import com.squareup.sqldelight.runtime.coroutines.mapToList
-import com.squareup.sqldelight.runtime.coroutines.mapToOneOrDefault
 import java.util.Date
+import kotlinx.coroutines.flow.map
 
 class NotepadRepository(
     private val database: Database
 ) {
-    val savedDraftId get() = database.noteMetadataQueries.getDraftId().asFlow().mapToOneOrDefault(-1L)
+    val savedDraftId get() = database.noteMetadataQueries.getDraftId()
+        .asFlow()
+        .mapToList()
+        .map {
+            it.firstOrNull() ?: -1L
+        }
 
     fun noteMetadataFlow(order: SortOrder) = with(database.noteMetadataQueries) {
         when(order) {

diff --git a/app/src/main/java/com/farmerbb/notepad/usecase/DataMigrator.kt b/app/src/main/java/com/farmerbb/notepad/usecase/DataMigrator.kt
@@ -68,18 +68,19 @@ private class DataMigratorImpl(
                 if (!filename.isDigitsOnly() && filename != "draft") continue
 
                 val text = loadNote(filename)
+                val hasDraft = filename == draftFilename
 
                 val metadata = NoteMetadata(
                     metadataId = -1,
                     title = text.lines().first(),
                     date = Date(filename.toLong()),
-                    hasDraft = false
+                    hasDraft = hasDraft
                 )
 
                 val contents = NoteContents(
                     contentsId = -1,
                     text = text,
-                    draftText = if (filename == draftFilename) draftText else null
+                    draftText = if (hasDraft) draftText else null
                 )
 
                 with(database) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
 # Notepad
-notepad-versionCode = "113"
+notepad-versionCode = "114"
 notepad-versionName = "3.0"
 
 # Android SDK