Skip to content

POC: Crypto and Signed Container closing logic update. #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ambrose40 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

POC: Crypto and Signed Container closing logic update. #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd7ab4c
MOPPAND-1738 Crypto and Signed Container closing logic update and rem…
ambrose40 Jan 16, 2026
8bd4833
MOPPAND-1738 KtLint fix.
ambrose40 Jan 19, 2026
0268404
MOPPAND-1738 Remove duplicate strings and clean up container folders …
ambrose40 Jan 20, 2026
df41f6c
MOPPAND-1738 Code review suggestions.
ambrose40 Jan 20, 2026
b51525a
MOPPAND-1738 Fixes after testing phase 1 and fix LDAP search in case …
ambrose40 Jan 22, 2026
50246ed
MOPPAND-1738 Do not offer to save container when decrypted.
ambrose40 Jan 26, 2026
df9994f
MOPPAND-1738 Empty file in container message flicker upon closing dec…
ambrose40 Jan 27, 2026
4e9e1c1
MOPPAND-1738 Success message upon saving Crypto and Signed container.
ambrose40 Jan 28, 2026
9f5da1e
MOPPAND-1738 Container saved en text update.
ambrose40 Feb 2, 2026
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
2 changes: 0 additions & 2 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/utils/ConstantTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ class ConstantTest {
assertEquals("signer_detail_route", Constant.Routes.SIGNER_DETAIL_SCREEN)
assertEquals("certificate_detail_route", Constant.Routes.CERTIFICATE_DETAIL_SCREEN)
assertEquals("recipient_detail_route", Constant.Routes.RECIPIENT_DETAIL_SCREEN)
assertEquals("recent_documents_route", Constant.Routes.RECENT_DOCUMENTS_SCREEN)
assertEquals("recent_documents_from_encrypt_route", Constant.Routes.RECENT_DOCUMENTS_FROM_ENCRYPT_SCREEN)
assertEquals("settings_route", Constant.Routes.SETTINGS_SCREEN)
assertEquals("settings_language_chooser_route", Constant.Routes.SETTINGS_LANGUAGE_CHOOSER_SCREEN)
assertEquals("settings_theme_chooser_route", Constant.Routes.SETTINGS_THEME_CHOOSER_SCREEN)
Expand Down
6 changes: 0 additions & 6 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/utils/RouteTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ import ee.ria.DigiDoc.utils.Constant.Routes.MYEID_IDENTIFICATION_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.MYEID_PIN_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.MYEID_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.PROXY_SERVICES_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.RECENT_DOCUMENTS_FROM_ENCRYPT_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.RECENT_DOCUMENTS_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.RECENT_DOCUMENTS_SCREEN_FROM_SIGNING_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.RECIPIENT_DETAIL_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.ROOT_SCREEN
import ee.ria.DigiDoc.utils.Constant.Routes.SETTINGS_LANGUAGE_CHOOSER_SCREEN
Expand Down Expand Up @@ -82,9 +79,6 @@ class RouteTest {
assertEquals(SIGNER_DETAIL_SCREEN, Route.SignerDetail.route)
assertEquals(CERTIFICATE_DETAIL_SCREEN, Route.CertificateDetail.route)
assertEquals(RECIPIENT_DETAIL_SCREEN, Route.RecipientDetail.route)
assertEquals(RECENT_DOCUMENTS_SCREEN, Route.RecentDocuments.route)
assertEquals(RECENT_DOCUMENTS_SCREEN_FROM_SIGNING_SCREEN, Route.RecentDocumentsFromSigning.route)
assertEquals(RECENT_DOCUMENTS_FROM_ENCRYPT_SCREEN, Route.RecentDocumentsFromEncrypt.route)
assertEquals(SETTINGS_SCREEN, Route.Settings.route)
assertEquals(SETTINGS_LANGUAGE_CHOOSER_SCREEN, Route.SettingsLanguageChooser.route)
assertEquals(SETTINGS_THEME_CHOOSER_SCREEN, Route.SettingsThemeChooser.route)
Expand Down
265 changes: 0 additions & 265 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/RecentDocumentsViewModelTest.kt
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import ee.ria.DigiDoc.utils.locale.LocaleUtilImpl
import ee.ria.DigiDoc.utils.secure.SecureUtil
import ee.ria.DigiDoc.utilsLib.R.string.main_diagnostics_logging_key
import ee.ria.DigiDoc.utilsLib.R.string.main_diagnostics_logging_running_key
import ee.ria.DigiDoc.utilsLib.container.ContainerUtil
import ee.ria.DigiDoc.utilsLib.file.FileUtil.getExternalFileUris
import ee.ria.DigiDoc.utilsLib.file.FileUtil.getLogsDirectory
import ee.ria.DigiDoc.utilsLib.locale.LocaleUtil.getLocale
Expand Down Expand Up @@ -159,6 +160,9 @@ class MainActivity :
fileTypeSetup.initializeApplicationFileTypesAssociation(componentClassName)
librarySetup.setupLibraries(applicationContext, isLoggingEnabled)

ContainerUtil.removeSignatureContainersDir(applicationContext)
ContainerUtil.removeCryptoContainersDir(applicationContext)

isAppReady = true

setContent {
Expand Down
38 changes: 10 additions & 28 deletions app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import ee.ria.DigiDoc.fragment.MyEidIdentificationFragment
import ee.ria.DigiDoc.fragment.MyEidIdentificationMethodChooserFragment
import ee.ria.DigiDoc.fragment.MyEidPinFragment
import ee.ria.DigiDoc.fragment.ProxyServicesSettingsFragment
import ee.ria.DigiDoc.fragment.RecentDocumentsFragment
import ee.ria.DigiDoc.fragment.RootFragment
import ee.ria.DigiDoc.fragment.SignatureInputFragment
import ee.ria.DigiDoc.fragment.SignatureMethodFragment
Expand Down Expand Up @@ -181,6 +180,16 @@ fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
sharedRecipientViewModel = sharedRecipientViewModel,
)
}
composable(route = Route.Encrypted.route) {
EncryptFragment(
modifier = Modifier.safeDrawingPadding(),
navController = navController,
sharedMenuViewModel = sharedMenuViewModel,
sharedContainerViewModel = sharedContainerViewModel,
sharedRecipientViewModel = sharedRecipientViewModel,
withEncryption = true,
)
}
composable(route = Route.DecryptScreen.route) {
DecryptFragment(
modifier = Modifier.safeDrawingPadding(),
Expand Down Expand Up @@ -220,33 +229,6 @@ fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
sharedSettingsViewModel = sharedSettingsViewModel,
)
}
composable(route = Route.RecentDocuments.route) {
RecentDocumentsFragment(
modifier = Modifier.safeDrawingPadding(),
navController = navController,
sharedMenuViewModel = sharedMenuViewModel,
sharedContainerViewModel = sharedContainerViewModel,
fileOpeningMethod = FileOpeningMethod.ALL,
)
}
composable(route = Route.RecentDocumentsFromSigning.route) {
RecentDocumentsFragment(
modifier = Modifier.safeDrawingPadding(),
navController = navController,
sharedMenuViewModel = sharedMenuViewModel,
sharedContainerViewModel = sharedContainerViewModel,
fileOpeningMethod = FileOpeningMethod.SIGNING,
)
}
composable(route = Route.RecentDocumentsFromEncrypt.route) {
RecentDocumentsFragment(
modifier = Modifier.safeDrawingPadding(),
navController = navController,
sharedMenuViewModel = sharedMenuViewModel,
sharedContainerViewModel = sharedContainerViewModel,
fileOpeningMethod = FileOpeningMethod.CRYPTO,
)
}
composable(route = Route.Settings.route) {
AdvancedSettingsFragment(
modifier = Modifier.safeDrawingPadding(),
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ fun EncryptFragment(
sharedMenuViewModel: SharedMenuViewModel,
sharedContainerViewModel: SharedContainerViewModel,
sharedRecipientViewModel: SharedRecipientViewModel,
withEncryption: Boolean = false,
) {
Surface(
modifier =
Expand All @@ -67,6 +68,7 @@ fun EncryptFragment(
sharedMenuViewModel = sharedMenuViewModel,
sharedContainerViewModel = sharedContainerViewModel,
sharedRecipientViewModel = sharedRecipientViewModel,
withEncryption = withEncryption,
)
}
}
Expand Down
Loading
Loading