Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ fun DiagnosticsScreen(
var enableOneTimeLogGeneration by remember {
mutableStateOf(diagnosticsViewModel.dataStore.getIsLogFileGenerationEnabled())
}
val openRestartConfirmationDialog = remember { mutableStateOf(false) }
val openRestartConfirmationDialog = rememberSaveable { mutableStateOf(false) }

val settingValueChanged = stringResource(id = R.string.setting_value_changed)
val settingValueChangeCancelled = stringResource(id = R.string.setting_value_change_cancelled)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ fun EncryptRecipientScreen(
)
}
val showRecipientBottomSheet = remember { mutableStateOf(false) }
var actionRecipient by remember { mutableStateOf<Addressee?>(null) }
val clickedRecipient = remember { mutableStateOf<Addressee?>(null) }
val openRemoveRecipientDialog = remember { mutableStateOf(false) }
var actionRecipient by rememberSaveable { mutableStateOf<Addressee?>(null) }
val clickedRecipient = rememberSaveable { mutableStateOf<Addressee?>(null) }
val openRemoveRecipientDialog = rememberSaveable { mutableStateOf(false) }

val recipientRemoved = stringResource(id = R.string.recipient_removed)
val recipientRemovalCancelled = stringResource(id = R.string.recipient_removal_cancelled)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ fun HomeScreen(
homeViewModel: HomeViewModel = hiltViewModel(),
) {
val activity = LocalActivity.current
val openCrashDetectorDialog = remember { mutableStateOf(false) }
val openCrashDetectorDialog = rememberSaveable { mutableStateOf(false) }
val hasUnsentReports by homeViewModel.hasUnsentReports.asFlow().collectAsState(Tasks.forResult(false))

val isMainMenuBottomSheetVisible = rememberSaveable { mutableStateOf(false) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ fun RecentDocumentsScreen(

val messages by SnackBarManager.messages.collectAsState(emptyList())

val showLoading = remember { mutableStateOf(false) }
val showSivaDialog = remember { mutableStateOf(false) }
val selectedDocument = remember { mutableStateOf<File?>(null) }
val showLoading = rememberSaveable { mutableStateOf(false) }
val showSivaDialog = rememberSaveable { mutableStateOf(false) }
val selectedDocument = rememberSaveable { mutableStateOf<File?>(null) }
val isSettingsMenuBottomSheetVisible = rememberSaveable { mutableStateOf(false) }

val handleResult: (Boolean) -> Unit = { confirmed ->
Expand Down Expand Up @@ -164,13 +164,13 @@ fun RecentDocumentsScreen(
}

val recentDocumentList =
remember {
rememberSaveable {
mutableStateOf(
recentDocumentsViewModel.getRecentDocumentList(fileOpeningMethod),
)
}
var actionDocument by remember { mutableStateOf<File?>(null) }
val openRemoveDocumentDialog = remember { mutableStateOf(false) }
var actionDocument by rememberSaveable { mutableStateOf<File?>(null) }
val openRemoveDocumentDialog = rememberSaveable { mutableStateOf(false) }

val documentRemoved = stringResource(id = R.string.document_removed)
val documentRemovalCancelled = stringResource(id = R.string.document_removal_cancelled)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ fun EncryptNavigation(

val listState = rememberLazyListState()

val showContainerCloseConfirmationDialog = remember { mutableStateOf(false) }
val showContainerCloseConfirmationDialog = rememberSaveable { mutableStateOf(false) }

val showContainerBottomSheet = remember { mutableStateOf(false) }
val showDataFileBottomSheet = remember { mutableStateOf(false) }
val showRecipientBottomSheet = remember { mutableStateOf(false) }

val showSivaDialog = remember { mutableStateOf(false) }
val showSivaDialog = rememberSaveable { mutableStateOf(false) }
val nestedFile = rememberSaveable { mutableStateOf<File?>(null) }

val openNestedContainer: (nestedContainer: File, isSivaConfirmed: Boolean) -> Unit =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
Expand Down Expand Up @@ -79,9 +80,9 @@ fun FileOpeningNavigation(
val signedContainer by sharedContainerViewModel.signedContainer.asFlow().collectAsState(null)
val cryptoContainer by sharedContainerViewModel.cryptoContainer.asFlow().collectAsState(null)
val externalFileUris by sharedContainerViewModel.externalFileUris.collectAsState()
val showSivaDialog = remember { mutableStateOf(false) }
var isExternalFile by remember { mutableStateOf(false) }
var fileUris by remember { mutableStateOf<List<Uri>>(emptyList()) }
val showSivaDialog = rememberSaveable { mutableStateOf(false) }
var isExternalFile by rememberSaveable { mutableStateOf(false) }
var fileUris by rememberSaveable { mutableStateOf<List<Uri>>(emptyList()) }

val handleSivaConfirmation: () -> Unit = {
showSivaDialog.value = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.util.Log
import android.widget.Toast
import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult
Expand Down Expand Up @@ -172,8 +173,8 @@ fun SigningNavigation(

val isSettingsMenuBottomSheetVisible = rememberSaveable { mutableStateOf(false) }

val clickedDataFile = remember { mutableStateOf<DataFileInterface?>(null) }
val clickedSignature = remember { mutableStateOf<SignatureInterface?>(null) }
val clickedDataFile = rememberSaveable { mutableStateOf<DataFileInterface?>(null) }
val clickedSignature = rememberSaveable { mutableStateOf<SignatureInterface?>(null) }

val signatureAddedSuccess = remember { mutableStateOf(false) }
val signatureAddedSuccessText = stringResource(id = R.string.signature_update_signature_add_success)
Expand All @@ -200,7 +201,7 @@ fun SigningNavigation(
val invalidSignaturesText =
pluralStringResource(id = R.plurals.signatures_invalid, count = invalidSignaturesCount, invalidSignaturesCount)

val showLoadingScreen = remember { mutableStateOf(false) }
val showLoadingScreen = rememberSaveable { mutableStateOf(false) }

val openRemoveFileDialog = rememberSaveable { mutableStateOf(false) }
val fileRemoved = stringResource(id = R.string.document_removed)
Expand Down Expand Up @@ -274,27 +275,27 @@ fun SigningNavigation(
}

var signatures by remember { mutableStateOf<List<SignatureInterface>>(emptyList()) }
val showSignaturesLoadingIndicator = remember { mutableStateOf(false) }
val showSignaturesLoadingIndicator = rememberSaveable { mutableStateOf(false) }
val signaturesLoading = stringResource(id = R.string.signatures_loading)
val signaturesLoaded = stringResource(id = R.string.signatures_loaded)

var dataFiles by remember { mutableStateOf<List<DataFileInterface>>(emptyList()) }
val showDataFilesLoadingIndicator = remember { mutableStateOf(false) }
val showDataFilesLoadingIndicator = rememberSaveable { mutableStateOf(false) }
val dataFilesLoading = stringResource(id = R.string.container_files_loading)

val filesAdded by sharedContainerViewModel.addedFilesCount.collectAsState(0)

val listState = rememberLazyListState()

val showContainerCloseConfirmationDialog = remember { mutableStateOf(false) }
val showContainerCloseConfirmationDialog = rememberSaveable { mutableStateOf(false) }

val showSivaDialog = remember { mutableStateOf(false) }
val showSivaDialog = rememberSaveable { mutableStateOf(false) }
val nestedFile = rememberSaveable { mutableStateOf<File?>(null) }

val showContainerBottomSheet = remember { mutableStateOf(false) }
val showSignedContainerBottomSheet = remember { mutableStateOf(false) }
val showDataFileBottomSheet = remember { mutableStateOf(false) }
val showSignatureBottomSheet = remember { mutableStateOf(false) }
val showContainerBottomSheet = rememberSaveable { mutableStateOf(false) }
val showSignedContainerBottomSheet = rememberSaveable { mutableStateOf(false) }
val showDataFileBottomSheet = rememberSaveable { mutableStateOf(false) }
val showSignatureBottomSheet = rememberSaveable { mutableStateOf(false) }

val openNestedContainer: (nestedContainer: File, isSivaConfirmed: Boolean) -> Unit =
{ nestedContainer, isSivaConfirmed ->
Expand Down Expand Up @@ -771,7 +772,7 @@ fun SigningNavigation(
testTagsAsResourceId = true
}.testTag("signingContainer"),
) {
var actionSignature by remember { mutableStateOf<SignatureInterface?>(null) }
var actionSignature by rememberSaveable { mutableStateOf<SignatureInterface?>(null) }

Column(
modifier =
Expand All @@ -781,7 +782,7 @@ fun SigningNavigation(
verticalArrangement = Arrangement.Top,
horizontalAlignment = Alignment.Start,
) {
if (signatureAddedSuccess.value == true) {
if (signatureAddedSuccess.value) {
// Make sure text is announced when TalkBack is enabled by having its own element
if (isTalkBackEnabled(context)) {
Box(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.bouncycastle.asn1.x500.style.BCStyle
import org.bouncycastle.asn1.x500.style.IETFUtils
import org.bouncycastle.asn1.x509.Extension
import org.bouncycastle.asn1.x509.PolicyInformation
import java.io.Serializable
import java.security.cert.CertificateFactory
import java.security.cert.X509Certificate
import java.util.Date
Expand All @@ -43,7 +44,7 @@ class Addressee(
var certType: CertType,
var validTo: Date?,
var concatKDFAlgorithmURI: String?,
) {
): Serializable {
constructor(cn: String, sn: String, certType: CertType, validTo: Date?, data: ByteArray) : this(
data = data,
identifier = "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

package ee.ria.DigiDoc.libdigidoclib.domain.model

interface DataFileInterface {
import java.io.Serializable

interface DataFileInterface: Serializable {
val id: String
val fileName: String
val fileSize: Long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
package ee.ria.DigiDoc.libdigidoclib.domain.model

import ee.ria.libdigidocpp.DataFile
import java.io.Serializable

class DataFileWrapper(
dataFile: DataFile,
) : DataFileInterface {
) : DataFileInterface, Serializable {
override val id: String = dataFile.id()
override val fileName: String = dataFile.fileName()
override val fileSize: Long = dataFile.fileSize()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

package ee.ria.DigiDoc.libdigidoclib.domain.model

interface SignatureInterface {
import java.io.Serializable

interface SignatureInterface: Serializable {
val id: String
val name: String
val claimedSigningTime: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
import ee.ria.libdigidocpp.Signature
import java.io.IOException
import java.io.Serializable

class SignatureWrapper(
signature: Signature,
) : SignatureInterface {
) : SignatureInterface, Serializable {
private val logTag = javaClass.simpleName

override val id: String = signature.id()
Expand Down
Loading