Code review fixes

Author: martenrebane

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/handler/ContainerFileOpeningHandler.kt

@@ -13,7 +13,6 @@ import java.io.File
 fun containerFileOpeningHandler(
     result: ContainerFileOpeningResult,
     nestedFile: MutableState<File?>,
-    currentNestedFile: MutableState<File?>,
     showSivaDialog: MutableState<Boolean>,
     showLoadingScreen: MutableState<Boolean>,
     context: Context,
@@ -23,7 +22,6 @@ fun containerFileOpeningHandler(
     when (result) {
         is ContainerFileOpeningResult.OpenNestedFile -> {
             nestedFile.value = result.file
-            currentNestedFile.value = result.file
             if (result.needsSivaDialog) {
                 showSivaDialog.value = true
             } else {

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

@@ -277,7 +277,6 @@ fun SigningNavigation(
 
     val showSivaDialog = remember { mutableStateOf(false) }
     val nestedFile = rememberSaveable { mutableStateOf<File?>(null) }
-    val currentNestedFile = rememberSaveable { mutableStateOf<File?>(null) }
 
     val showContainerBottomSheet = remember { mutableStateOf(false) }
     val showSignedContainerBottomSheet = remember { mutableStateOf(false) }
@@ -355,7 +354,6 @@ fun SigningNavigation(
     }
 
     val onDataFileClick: (DataFileInterface) -> Unit = { dataFile ->
-        currentNestedFile.value = null
         showDataFileBottomSheet.value = false
 
         showLoadingScreen.value = true
@@ -368,7 +366,6 @@ fun SigningNavigation(
         containerFileOpeningHandler(
             result = result,
             nestedFile = nestedFile,
-            currentNestedFile = currentNestedFile,
             showSivaDialog = showSivaDialog,
             showLoadingScreen = showLoadingScreen,
             context = context,

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

@@ -7,8 +7,6 @@ import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import ee.ria.DigiDoc.R
@@ -43,15 +41,12 @@ fun DataFileBottomSheet(
     openRemoveFileDialog: MutableState<Boolean>,
     onBackButtonClick: () -> Unit,
 ) {
-    val currentNestedFile = rememberSaveable { mutableStateOf<File?>(null) }
-
     val buttonName = stringResource(id = R.string.button_name)
 
     BottomSheet(
         modifier = modifier,
         showSheet = showSheet,
         onDismiss = {
-            currentNestedFile.value = null
             onDataFileBottomSheetDismiss()
         },
         buttons =
@@ -73,7 +68,6 @@ fun DataFileBottomSheet(
                     containerFileOpeningHandler(
                         result = result,
                         nestedFile = nestedFile,
-                        currentNestedFile = currentNestedFile,
                         showSivaDialog = showSivaDialog,
                         showLoadingScreen = showLoadingScreen,
                         context = context,

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

@@ -45,6 +45,7 @@ class RecentDocumentsViewModel
         private val mimeTypeResolver: MimeTypeResolver,
         private val cdoc2Settings: CDOC2Settings,
     ) : ViewModel() {
+        private val logTag = "RecentDocumentsViewModel"
         private val _sendToSigningViewWithSiva = MutableLiveData(false)
         val sendToSigningViewWithSiva: LiveData<Boolean> = _sendToSigningViewWithSiva
 
@@ -69,16 +70,22 @@ class RecentDocumentsViewModel
                     initialValue = _documentList.value,
                 )
 
-        @Throws(Exception::class)
         suspend fun openDocument(
             document: File,
             isSivaConfirmed: Boolean,
-        ): Container =
-            if (!document.isCryptoContainer()) {
-                openSignatureDocument(document, isSivaConfirmed)
-            } else {
-                openCryptoDocument(document)
+        ): Container? {
+            return try {
+                if (!document.isCryptoContainer()) {
+                    openSignatureDocument(document, isSivaConfirmed)
+                } else {
+                    openCryptoDocument(document)
+                }
+            } catch (e: Exception) {
+                errorLog(logTag, "Unable to open container", e)
+                _errorState.postValue(R.string.container_load_error)
+                return null
             }
+        }
 
         @Throws(Exception::class)
         suspend fun openSignatureDocument(

libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/SignedContainer.kt

@@ -371,6 +371,7 @@ class SignedContainer
                     }
 
                     else -> {
+                        errorLog(LOG_TAG, "Unable to open container", e)
                         throw IOException(e.message)
                     }
                 }