Fix Export & Import notes

- Add allowMainThreadQueries to Room Database
- Change ActivityResultContracts MIME type
from "*/*" to "application/json"
- Add SettingsEvent.InsertNotes

Author: VladShurakov

.idea/deploymentTargetDropDown.xml

@@ -13,8 +13,8 @@ android {
         applicationId = "com.vladshurakov.jetnotesapp"
         minSdk = 26
         targetSdk = 34
-        versionCode = 6
-        versionName = "1.2.0"
+        versionCode = 5
+        versionName = "1.1.2"
         resourceConfigurations += listOf("en")
 
         vectorDrawables {

.idea/gradle.xml

@@ -9,8 +9,8 @@ import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.DeleteNote
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetAllNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetNote
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetNotes
-import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.InsertNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.InsertNote
+import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.InsertNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.MoveNoteToFolder
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.NotesUseCases
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.SearchNotes
@@ -38,7 +38,7 @@ object AppModule {
             context = context,
             klass = NoteDatabase::class.java,
             name = "notes-database"
-        ).build()
+        ).allowMainThreadQueries().build()
     }
 
     @Provides

app/build.gradle.kts

@@ -42,14 +42,12 @@ import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.Settin
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.SettingsThemeDialog
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.SettingsTopBar
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.SettingsView
+import com.vladshurakov.jetnotesapp.feature_settings.presenter.viewmodel.SettingsEvent
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.viewmodel.SettingsViewModel
 import com.vladshurakov.jetnotesapp.theme.MainTheme
 import com.vladshurakov.jetnotesapp.theme.MainTheme.colors
 import com.vladshurakov.jetnotesapp.util.Screen
 import java.lang.reflect.Type
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 @Composable
 fun SettingsScreen(
@@ -59,15 +57,14 @@ fun SettingsScreen(
 ) {
 
     val exportDataLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.CreateDocument()
+        ActivityResultContracts.CreateDocument("application/json")
     ) { uri ->
         if (uri == null) return@rememberLauncherForActivityResult
         val jsonString = Gson().toJson(settingsViewModel.getAll())
         navController.context.contentResolver.openOutputStream(uri).use {
             it?.bufferedWriter()?.apply {
                 write(jsonString)
                 flush()
-                close()
             }
         }
     }
@@ -80,12 +77,11 @@ fun SettingsScreen(
             it?.bufferedReader()?.readText() ?: "[]"
         }
         val type: Type = object : TypeToken<List<Note>>() {}.type
-        val notes: MutableList<Note> =
-            Gson().fromJson<List<Note>?>(jsonString, type).toMutableList()
-        notes.forEachIndexed { index, note ->
+        val notes = Gson().fromJson<List<Note>>(jsonString, type).toMutableList()
+        notes.onEachIndexed { index, note ->
             notes[index] = note.copy(id = null)
         }
-        settingsViewModel.insert(notes)
+        settingsViewModel.onEvent(SettingsEvent.InsertNotes(notes))
     }
 
     val isStyleDialogOpen = remember {
@@ -261,11 +257,7 @@ fun SettingsScreen(
                 )
 
                 TextButton(
-                    onClick = {
-                        val currentTime =
-                            SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
-                        exportDataLauncher.launch("JetNotesBackup-${currentTime}.json")
-                    },
+                    onClick = { exportDataLauncher.launch("JetNotesBackup") },
                     shape = RectangleShape,
                     contentPadding = PaddingValues(start = 18.dp),
                     modifier = Modifier
@@ -285,7 +277,7 @@ fun SettingsScreen(
                 }
 
                 TextButton(
-                    onClick = { importDataLauncher.launch(arrayOf("*/*")) },
+                    onClick = { importDataLauncher.launch(arrayOf("application/json")) },
                     shape = RectangleShape,
                     contentPadding = PaddingValues(start = 18.dp),
                     modifier = Modifier

app/src/main/java/com/vladshurakov/jetnotesapp/di/AppModule.kt

@@ -1,10 +1,12 @@
 package com.vladshurakov.jetnotesapp.feature_settings.presenter.viewmodel
 
+import com.vladshurakov.jetnotesapp.feature_notes.domain.models.Note
 import com.vladshurakov.jetnotesapp.feature_settings.domain.models.SettingsBundle
 
 /*
  * Event for the Settings screen
  */
 sealed interface SettingsEvent {
     data class SaveSettings(val settingsBundle: SettingsBundle): SettingsEvent
+    data class InsertNotes(val notes: List<Note>): SettingsEvent
 }

app/src/main/java/com/vladshurakov/jetnotesapp/feature_settings/presenter/screen/SettingsScreen.kt

@@ -30,8 +30,11 @@ class SettingsViewModel @Inject constructor(
     fun onEvent(event: SettingsEvent) {
         when (event) {
             is SettingsEvent.SaveSettings -> {
-                settingsUseCases.saveSettings.invoke(settingsBundle = event.settingsBundle)
-                _settingsBundle.value = event.settingsBundle
+                saveSettings(event.settingsBundle)
+            }
+
+            is SettingsEvent.InsertNotes -> {
+                insertNotes(event.notes)
             }
         }
     }
@@ -40,7 +43,12 @@ class SettingsViewModel @Inject constructor(
         return notesUseCases.getAllNotes.invoke()
     }
 
-    fun insert(notes: List<Note>) {
+    private fun saveSettings(settingsBundle: SettingsBundle){
+        settingsUseCases.saveSettings.invoke(settingsBundle = settingsBundle)
+        _settingsBundle.value = settingsBundle
+    }
+
+    private fun insertNotes(notes: List<Note>) {
         viewModelScope.launch {
             notesUseCases.insertNotes(notes)
         }