Handle folder selection errors #1

tosinonikute · tosinonikute · commit 081f75de8c6d · 2025-10-04T18:36:08.000+01:00
diff --git a/shared/src/androidMain/kotlin/com/module/notelycompose/MainActivity.kt b/shared/src/androidMain/kotlin/com/module/notelycompose/MainActivity.kt
@@ -56,14 +56,15 @@ class MainActivity : AppCompatActivity() {
     private fun setupFolderPickerLauncher() {
         folderPickerLauncherHolder.folderPickerLauncher =
             registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri: Uri? ->
-                uri?.let {
+                if (uri != null) {
                     contentResolver.takePersistableUriPermission(
                         uri,
                         android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION or
                                 android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION
                     )
-                    folderPickerLauncherHolder.onFolderSelected?.invoke(uri)
                 }
+                // Always invoke callback, even if uri is null
+                folderPickerLauncherHolder.onFolderSelected?.invoke(uri)
             }
     }
 
diff --git a/shared/src/androidMain/kotlin/com/module/notelycompose/PermissionLauncherHolder.kt b/shared/src/androidMain/kotlin/com/module/notelycompose/PermissionLauncherHolder.kt
@@ -19,13 +19,13 @@ class FileSaverHandler(
 
 class FolderPickerLauncherHolder {
     var folderPickerLauncher: ActivityResultLauncher<Uri?>? = null
-    var onFolderSelected: ((Uri) -> Unit)? = null
+    var onFolderSelected: ((Uri?) -> Unit)? = null
 }
 
 class FolderPickerHandler(
     private val folderPickerLauncherHolder: FolderPickerLauncherHolder
 ) {
-    fun pickFolder(onFolderSelected: (Uri) -> Unit) {
+    fun pickFolder(onFolderSelected: (Uri?) -> Unit) {
         folderPickerLauncherHolder.onFolderSelected = onFolderSelected
         folderPickerLauncherHolder.folderPickerLauncher?.launch(null)
     }
diff --git a/shared/src/androidMain/kotlin/com/module/notelycompose/export/domain/ExportSelectionInteractorImpl.kt b/shared/src/androidMain/kotlin/com/module/notelycompose/export/domain/ExportSelectionInteractorImpl.kt
@@ -35,6 +35,12 @@ class ExportSelectionInteractorImpl(
         onResult: (Result<String>) -> Unit
     ) {
         folderPickerHandler.pickFolder { folderUri ->
+
+            if (folderUri == null) {
+                onResult(Result.failure(NoFolderSelectedException("Folder selection cancelled")))
+                return@pickFolder
+            }
+
             kotlinx.coroutines.GlobalScope.launch(Dispatchers.IO) {
                 val result = performTextExport(
                     folderUri,
diff --git a/shared/src/commonMain/composeResources/values/strings.xml b/shared/src/commonMain/composeResources/values/strings.xml
@@ -207,6 +207,7 @@
     <string name="batch_export_settings_how_to_2">2.</string>
     <string name="batch_export_settings_how_to_3">3.</string>
     <string name="batch_export_settings_error_occurred">error occurred while exporting</string>
+    <string name="batch_export_settings_no_folder_selected">Folder selection cancelled</string>
     <!-- Import -->
     <string name="import_failed_title">Import Failed</string>
 </resources>
diff --git a/shared/src/commonMain/kotlin/com/module/notelycompose/export/domain/NoFolderSelectedException.kt b/shared/src/commonMain/kotlin/com/module/notelycompose/export/domain/NoFolderSelectedException.kt
@@ -0,0 +1,3 @@
+package com.module.notelycompose.export.domain
+
+class NoFolderSelectedException(message: String): Exception()
diff --git a/shared/src/commonMain/kotlin/com/module/notelycompose/export/presentation/ExportSelectionViewModel.kt b/shared/src/commonMain/kotlin/com/module/notelycompose/export/presentation/ExportSelectionViewModel.kt
@@ -5,11 +5,14 @@ import androidx.lifecycle.viewModelScope
 import audio.utils.deleteFile
 import com.module.notelycompose.audio.ui.importing.ImportingAudioState
 import com.module.notelycompose.export.domain.ExportSelectionInteractor
+import com.module.notelycompose.export.domain.NoFolderSelectedException
 import com.module.notelycompose.export.presentation.model.ExportSelectionPresentationState
 import com.module.notelycompose.export.presentation.model.ExportingFileState
 import com.module.notelycompose.notes.domain.GetAllNotesUseCase
 import com.module.notelycompose.notes.presentation.list.NoteListPresentationState
 import com.module.notelycompose.notes.presentation.mapper.NotePresentationMapper
+import kotlinx.coroutines.Delay
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -19,6 +22,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.seconds
 
 class ExportSelectionViewModel(
     private val getAllNotesUseCase: GetAllNotesUseCase,
@@ -78,6 +82,10 @@ class ExportSelectionViewModel(
         val texts = _state.value.selectedNotes.map { it.content }
         val titles =  _state.value.selectedNotes.map { it.title }
         val audioPath =  _state.value.selectedNotes.map { it.recordingPath }
+        viewModelScope.launch {
+            delay(2.seconds)
+            _exportingState.update { ExportingFileState.Exporting() }
+        }
         exportSelectionInteractor.exportAllSelection(
             texts = texts,
             titles = titles,
@@ -91,9 +99,16 @@ class ExportSelectionViewModel(
             _exportingState.update {
                 when {
                     result.isSuccess -> ExportingFileState.Success
-                    else -> ExportingFileState.Failure(
-                        result.exceptionOrNull()?.message ?: "Export failed"
-                    )
+                    else -> {
+                        _exportingState.update { ExportingFileState.Idle }
+                        if(result.exceptionOrNull() is NoFolderSelectedException) {
+                            ExportingFileState.NoFolderSelected
+                        } else {
+                            ExportingFileState.Failure(
+                                result.exceptionOrNull()?.message ?: "Export failed"
+                            )
+                        }
+                    }
                 }
             }
         }
diff --git a/shared/src/commonMain/kotlin/com/module/notelycompose/export/presentation/model/ExportingFileState.kt b/shared/src/commonMain/kotlin/com/module/notelycompose/export/presentation/model/ExportingFileState.kt
@@ -5,4 +5,5 @@ sealed interface ExportingFileState {
     data class Exporting(val progress: Float = 0f) : ExportingFileState
     object Success : ExportingFileState
     data class Failure(val message: String) : ExportingFileState
+    object NoFolderSelected : ExportingFileState
 }
diff --git a/shared/src/commonMain/kotlin/com/module/notelycompose/export/ui/ExportingFileStateHost.kt b/shared/src/commonMain/kotlin/com/module/notelycompose/export/ui/ExportingFileStateHost.kt
@@ -26,7 +26,9 @@ import com.module.notelycompose.export.presentation.model.ExportingFileState
 import com.module.notelycompose.notes.ui.theme.LocalCustomColors
 import com.module.notelycompose.resources.Res
 import com.module.notelycompose.resources.batch_export_settings_error_occurred
+import com.module.notelycompose.resources.batch_export_settings_no_folder_selected
 import com.module.notelycompose.resources.batch_export_ok
+import com.module.notelycompose.resources.error
 import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.stringResource
 
@@ -65,11 +67,29 @@ internal fun ExportingFileStateHost(
                             Text(stringResource(Res.string.batch_export_ok))
                         }
                     },
-                    title = { Text(stringResource(Res.string.batch_export_ok)) },
+                    title = { Text(stringResource(Res.string.error)) },
                     text = { Text(stringResource(Res.string.batch_export_settings_error_occurred)) }
                 )
             }
         }
+
+        is ExportingFileState.NoFolderSelected -> {
+            if(shouldShowDialog) {
+                AlertDialog(
+                    onDismissRequest = onDismiss,
+                    confirmButton = {
+                        TextButton(onClick = {
+                            shouldShowDialog = false
+                            onDismiss()
+                        }) {
+                            Text(stringResource(Res.string.batch_export_ok))
+                        }
+                    },
+                    title = { Text(stringResource(Res.string.error)) },
+                    text = { Text(stringResource(Res.string.batch_export_settings_no_folder_selected)) }
+                )
+            }
+        }
     }
 }
 
diff --git a/shared/src/iosMain/kotlin/com/module/notelycompose/export/domain/ExportSelectionInteractorImpl.kt b/shared/src/iosMain/kotlin/com/module/notelycompose/export/domain/ExportSelectionInteractorImpl.kt
@@ -35,7 +35,7 @@ class ExportSelectionInteractorImpl : ExportSelectionInteractor {
             val folderUrl = pickFolder()
 
             if (folderUrl == null) {
-                onResult(Result.failure(Exception("Folder selection cancelled")))
+                onResult(Result.failure(NoFolderSelectedException("Folder selection cancelled")))
                 return@launch
             }
 

Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,15 @@ class MainActivity : AppCompatActivity() {`
`56`	`56`	`private fun setupFolderPickerLauncher() {`
`57`	`57`	`folderPickerLauncherHolder.folderPickerLauncher =`
`58`	`58`	`registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri: Uri? ->`
`59`		`- uri?.let {`
	`59`	`+ if (uri != null) {`
`60`	`60`	`contentResolver.takePersistableUriPermission(`
`61`	`61`	`uri,`
`62`	`62`	`android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION or`
`63`	`63`	`android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION`
`64`	`64`	`)`
`65`		`- folderPickerLauncherHolder.onFolderSelected?.invoke(uri)`
`66`	`65`	`}`
	`66`	`+ // Always invoke callback, even if uri is null`
	`67`	`+ folderPickerLauncherHolder.onFolderSelected?.invoke(uri)`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ class FileSaverHandler(`
`19`	`19`
`20`	`20`	`class FolderPickerLauncherHolder {`
`21`	`21`	`var folderPickerLauncher: ActivityResultLauncher<Uri?>? = null`
`22`		`- var onFolderSelected: ((Uri) -> Unit)? = null`
	`22`	`+ var onFolderSelected: ((Uri?) -> Unit)? = null`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`class FolderPickerHandler(`
`26`	`26`	`private val folderPickerLauncherHolder: FolderPickerLauncherHolder`
`27`	`27`	`) {`
`28`		`- fun pickFolder(onFolderSelected: (Uri) -> Unit) {`
	`28`	`+ fun pickFolder(onFolderSelected: (Uri?) -> Unit) {`
`29`	`29`	`folderPickerLauncherHolder.onFolderSelected = onFolderSelected`
`30`	`30`	`folderPickerLauncherHolder.folderPickerLauncher?.launch(null)`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.module.notelycompose.export.domain`
	`2`	`+`
	`3`	`+class NoFolderSelectedException(message: String): Exception()`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ sealed interface ExportingFileState {`
`5`	`5`	`data class Exporting(val progress: Float = 0f) : ExportingFileState`
`6`	`6`	`object Success : ExportingFileState`
`7`	`7`	`data class Failure(val message: String) : ExportingFileState`
	`8`	`+ object NoFolderSelected : ExportingFileState`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class ExportSelectionInteractorImpl : ExportSelectionInteractor {`
`35`	`35`	`val folderUrl = pickFolder()`
`36`	`36`
`37`	`37`	`if (folderUrl == null) {`
`38`		`- onResult(Result.failure(Exception("Folder selection cancelled")))`
	`38`	`+ onResult(Result.failure(NoFolderSelectedException("Folder selection cancelled")))`
`39`	`39`	`return@launch`
`40`	`40`	`}`
`41`	`41`