Merge pull request #296 from open-eid/MOPPAND-1700

Refactor nullable variables from CryptoContainer wrapper.

Author: Counter178

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/EncryptNavigation.kt

@@ -1153,11 +1153,14 @@ fun EncryptNavigation(
                         showContainerCloseConfirmationDialog.value = false
                     },
                     onDismissButton = {
-                        saveFile(
-                            cryptoContainer?.file,
-                            cryptoContainer?.containerMimetype(),
-                            saveFileLauncher,
-                        )
+                        val file = cryptoContainer?.file
+                        if (file != null) {
+                            saveFile(
+                                file,
+                                cryptoContainer?.containerMimetype(),
+                                saveFileLauncher,
+                            )
+                        }
                     },
                     onConfirmButton = {
                         showContainerCloseConfirmationDialog.value = false
@@ -1203,7 +1206,7 @@ private fun handleBackButtonClick(
 }
 
 private fun saveFile(
-    file: File?,
+    file: File,
     mimetype: String?,
     saveFileLauncher: ActivityResultLauncher<Intent>,
 ) {
@@ -1214,7 +1217,7 @@ private fun saveFile(
                     .addCategory(Intent.CATEGORY_OPENABLE)
                     .putExtra(
                         Intent.EXTRA_TITLE,
-                        sanitizeString(file?.name, ""),
+                        sanitizeString(file.name, ""),
                     ).setType(mimetype)
                     .addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION),
                 null,

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/bottomsheet/CryptoDataFileBottomSheet.kt

@@ -56,7 +56,7 @@ fun CryptoDataFileBottomSheet(
     handleSivaConfirmation: () -> Unit,
     context: Context,
     saveFileLauncher: ActivityResultLauncher<Intent>,
-    saveFile: (File?, String, ActivityResultLauncher<Intent>) -> Unit,
+    saveFile: (File, String, ActivityResultLauncher<Intent>) -> Unit,
     openRemoveFileDialog: MutableState<Boolean>,
     onBackButtonClick: () -> Unit,
 ) {
@@ -108,7 +108,9 @@ fun CryptoDataFileBottomSheet(
                     if (dataFile != null) {
                         try {
                             val file = sharedContainerViewModel.getCryptoContainerDataFile(cryptoContainer, dataFile)
-                            saveFile(file, dataFile.mimeType(context), saveFileLauncher)
+                            if (file != null) {
+                                saveFile(file, dataFile.mimeType(context), saveFileLauncher)
+                            }
                         } catch (ex: Exception) {
                             errorLog("SigningContainer", "Unable to save file. Unable to get datafile", ex)
                             onBackButtonClick()

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/bottomsheet/EncryptContainerBottomSheet.kt

@@ -44,7 +44,7 @@ fun EncryptContainerBottomSheet(
     cryptoContainer: CryptoContainer?,
     onSignClick: () -> Unit,
     saveFileLauncher: ActivityResultLauncher<Intent>,
-    saveFile: (File?, String?, ActivityResultLauncher<Intent>) -> Unit,
+    saveFile: (File, String?, ActivityResultLauncher<Intent>) -> Unit,
 ) {
     val buttonName = stringResource(id = R.string.button_name)
 
@@ -74,11 +74,14 @@ fun EncryptContainerBottomSheet(
                         R.string.container_save,
                     )} ${cryptoContainer?.getName() ?: ""} $buttonName",
                 ) {
-                    saveFile(
-                        cryptoContainer?.file,
-                        cryptoContainer?.containerMimetype(),
-                        saveFileLauncher,
-                    )
+                    val file = cryptoContainer?.file
+                    if (file != null) {
+                        saveFile(
+                            file,
+                            cryptoContainer.containerMimetype(),
+                            saveFileLauncher,
+                        )
+                    }
                 },
                 BottomSheetButton(
                     showButton = isSignButtonShown,

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SigningNavigation.kt

@@ -1274,11 +1274,14 @@ fun SigningNavigation(
                         showContainerCloseConfirmationDialog.value = false
                     },
                     onDismissButton = {
-                        saveFile(
-                            signedContainer?.getContainerFile(),
-                            signedContainer?.containerMimetype(),
-                            saveFileLauncher,
-                        )
+                        val file = signedContainer?.getContainerFile()
+                        if (file != null) {
+                            saveFile(
+                                file,
+                                signedContainer?.containerMimetype(),
+                                saveFileLauncher,
+                            )
+                        }
                     },
                     onConfirmButton = {
                         showContainerCloseConfirmationDialog.value = false
@@ -1346,7 +1349,7 @@ private fun handleBackButtonClick(
 }
 
 private fun saveFile(
-    file: File?,
+    file: File,
     mimetype: String?,
     saveFileLauncher: ActivityResultLauncher<Intent>,
 ) {
@@ -1357,7 +1360,7 @@ private fun saveFile(
                     .addCategory(Intent.CATEGORY_OPENABLE)
                     .putExtra(
                         Intent.EXTRA_TITLE,
-                        sanitizeString(file?.name, ""),
+                        sanitizeString(file.name, ""),
                     ).setType(mimetype)
                     .addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION),
                 null,

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/bottomsheet/ContainerBottomSheet.kt

@@ -43,7 +43,7 @@ fun ContainerBottomSheet(
     signedContainer: SignedContainer?,
     onEncryptClick: () -> Unit,
     saveFileLauncher: ActivityResultLauncher<Intent>,
-    saveFile: (File?, String?, ActivityResultLauncher<Intent>) -> Unit,
+    saveFile: (File, String?, ActivityResultLauncher<Intent>) -> Unit,
 ) {
     val buttonName = stringResource(id = R.string.button_name)
 
@@ -72,11 +72,14 @@ fun ContainerBottomSheet(
                         R.string.container_save,
                     )} ${signedContainer?.getName() ?: ""} $buttonName",
                 ) {
-                    saveFile(
-                        signedContainer?.getContainerFile(),
-                        signedContainer?.containerMimetype(),
-                        saveFileLauncher,
-                    )
+                    val file = signedContainer?.getContainerFile()
+                    if (file != null) {
+                        saveFile(
+                            file,
+                            signedContainer.containerMimetype(),
+                            saveFileLauncher,
+                        )
+                    }
                 },
                 BottomSheetButton(
                     showButton = isEncryptButtonShown,

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/bottomsheet/DataFileBottomSheet.kt

@@ -56,7 +56,7 @@ fun DataFileBottomSheet(
     handleSivaConfirmation: () -> Unit,
     context: Context,
     saveFileLauncher: ActivityResultLauncher<Intent>,
-    saveFile: (File?, String, ActivityResultLauncher<Intent>) -> Unit,
+    saveFile: (File, String, ActivityResultLauncher<Intent>) -> Unit,
     openRemoveFileDialog: MutableState<Boolean>,
     onBackButtonClick: () -> Unit,
 ) {
@@ -114,7 +114,9 @@ fun DataFileBottomSheet(
                                     else -> it.mediaType
                                 }
 
-                            saveFile(file, mimeType, saveFileLauncher)
+                            if (file != null) {
+                                saveFile(file, mimeType, saveFileLauncher)
+                            }
                         } catch (ex: Exception) {
                             errorLog("DataFileBottomSheet", "Unable to save file. Unable to get data file", ex)
                             onBackButtonClick()

app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/EncryptViewModel.kt

@@ -72,7 +72,7 @@ class EncryptViewModel
 
         fun isEmptyFileInContainer(cryptoContainer: CryptoContainer?): Boolean =
             cryptoContainer?.dataFiles?.any {
-                (it?.length() ?: 0L) == 0L
+                it.length() == 0L
             } == true
 
         fun isContainerWithoutRecipients(cryptoContainer: CryptoContainer?): Boolean =
@@ -162,17 +162,17 @@ class EncryptViewModel
             val containerFile = container.file
             val isEncrypted = isEncryptedContainer(container)
 
-            if (isEncrypted && containerFile != null) {
+            if (isEncrypted) {
                 uris += containerFile.toUri()
             } else {
                 val dataFiles = container.getDataFiles()
                 val dataFilesDir =
-                    containerFile?.let {
+                    containerFile.let {
                         ContainerUtil.getContainerDataFilesDir(context, it)
                     }
 
-                dataFiles.mapNotNullTo(uris) { dataFile ->
-                    container.getDataFile(dataFile, dataFilesDir)?.toUri()
+                dataFiles.mapTo(uris) { dataFile ->
+                    container.getDataFile(dataFile, dataFilesDir).toUri()
                 }
             }
 

app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/shared/SharedContainerViewModel.kt

@@ -273,7 +273,7 @@ class SharedContainerViewModel
         ): File? =
             cryptoContainer?.getDataFile(
                 dataFile,
-                cryptoContainer.file?.let {
+                cryptoContainer.file.let {
                     ContainerUtil.getContainerDataFilesDir(
                         context,
                         it,