Skip to content

CDOC2 settings fixes. #310

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

Merged
Counter178 merged 2 commits into from
Dec 2, 2025
Merged

CDOC2 settings fixes. #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a8c2b6
MOPPAND-1716 CDOC2 settings fixes.
ambrose40 Dec 2, 2025
8a5eede
MOPPAND-1716 Update libcdoc library: open-eid/libcdoc#79. x-expiry-ti…
ambrose40 Dec 2, 2025
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
6 changes: 3 additions & 3 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import android.content.Context
import android.content.SharedPreferences
import androidx.preference.PreferenceManager
import androidx.test.platform.app.InstrumentationRegistry
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.preferences.EncryptedPreferences
import ee.ria.DigiDoc.configuration.repository.ConfigurationRepository
import ee.ria.DigiDoc.domain.model.methods.SigningMethod
Expand All @@ -36,7 +37,6 @@ import ee.ria.DigiDoc.libdigidoclib.init.Initialization
import ee.ria.DigiDoc.libdigidoclib.init.LibdigidocLibraryLoader
import ee.ria.DigiDoc.network.proxy.ProxySetting
import ee.ria.DigiDoc.network.siva.SivaSetting
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
Expand Down Expand Up @@ -383,14 +383,14 @@ class DataStoreTest {
fun dataStore_setCdocSetting_success() {
dataStore.setCdocSetting(CDOCSetting.CDOC2)

val result = dataStore.getCdocSetting()
val result = dataStore.getCdocSetting(false)

assertEquals(CDOCSetting.CDOC2, result)
}

@Test
fun dataStore_getCdocSetting_success() {
val result = dataStore.getCdocSetting()
val result = dataStore.getCdocSetting(false)

assertEquals(CDOCSetting.CDOC1, result)
}
Expand Down
5 changes: 0 additions & 5 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 @@ -31,11 +31,6 @@ class ConstantTest {
assertEquals("en", Constant.Languages.ENGLISH_LANGUAGE)
}

@Test
fun constantTest_Defaults_success() {
assertEquals("00000000-0000-0000-0000-000000000000", Constant.Defaults.DEFAULT_UUID_VALUE)
}

@Test
fun constantTest_Routes_success() {
assertEquals("init_route", Constant.Routes.INIT_SCREEN)
Expand Down
20 changes: 11 additions & 9 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.test.platform.app.InstrumentationRegistry
import com.google.gson.Gson
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.configuration.ConfigurationProperty
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
import ee.ria.DigiDoc.configuration.loader.ConfigurationLoader
Expand All @@ -47,7 +48,6 @@ import ee.ria.DigiDoc.libdigidoclib.init.Initialization
import ee.ria.DigiDoc.libdigidoclib.init.LibdigidocLibraryLoader
import ee.ria.DigiDoc.network.proxy.ManualProxy
import ee.ria.DigiDoc.network.proxy.ProxySetting
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.utilsLib.file.FileUtil
import junit.framework.TestCase.assertEquals
import junit.framework.TestCase.assertTrue
Expand Down Expand Up @@ -113,15 +113,16 @@ class DiagnosticsViewModelTest {
configurationUpdateDate = null,
cdoc2Conf =
mapOf(
"00000000-0000-0000-0000-000000000000" to
DEFAULT_UUID_VALUE to
ConfigurationProvider.CDOC2Conf(
name = "RIA",
post = "https://cdoc2.id.ee:8443",
fetch = "https://cdoc2.id.ee:8444",
),
),
cdoc2Default = false,
cdoc2UseKeyServer = false,
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
)

private lateinit var proxySetting: ProxySetting
Expand Down Expand Up @@ -289,7 +290,7 @@ class DiagnosticsViewModelTest {
val diagnosticsFileName =
"ria_digidoc_${viewModel.getAppVersion()}.${viewModel.getAppVersionCode()}_diagnostics.log"
val diagnosticsFilePath: String = File(context.filesDir.path, "diagnostics").path
val resultFile = viewModel.createDiagnosticsFile(context)
val resultFile = viewModel.createDiagnosticsFile(context, configurationProvider)

assertEquals(File(diagnosticsFilePath, diagnosticsFileName).path, resultFile.path)
assertTrue(resultFile.exists())
Expand Down Expand Up @@ -375,7 +376,7 @@ class DiagnosticsViewModelTest {
dataStore.setCdocSetting(CDOCSetting.CDOC2)
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)

val isCdoc2Selected = viewModel.isCdoc2Selected()
val isCdoc2Selected = viewModel.isCdoc2Selected(configurationProvider)

assertTrue(isCdoc2Selected)
}
Expand All @@ -385,7 +386,7 @@ class DiagnosticsViewModelTest {
dataStore.setCdocSetting(CDOCSetting.CDOC1)
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)

val isCdoc2Selected = viewModel.isCdoc2Selected()
val isCdoc2Selected = viewModel.isCdoc2Selected(configurationProvider)

assertFalse(isCdoc2Selected)
}
Expand All @@ -396,7 +397,7 @@ class DiagnosticsViewModelTest {
dataStore.setUseOnlineEncryption(true)
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)

val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed()
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed(configurationProvider)

assertTrue(isCdoc2KeyServerUsed)
}
Expand All @@ -407,7 +408,7 @@ class DiagnosticsViewModelTest {
dataStore.setUseOnlineEncryption(false)
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)

val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed()
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed(configurationProvider)

assertFalse(isCdoc2KeyServerUsed)
}
Expand All @@ -418,11 +419,12 @@ class DiagnosticsViewModelTest {
dataStore.setCDOC2UUID(DEFAULT_UUID_VALUE)
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)

val cdoc2KeyServerUUID = viewModel.getCdoc2KeyServerUUID()
val cdoc2KeyServerUUID = viewModel.getCdoc2KeyServerUUID(configurationProvider)

assertEquals(DEFAULT_UUID_VALUE, cdoc2KeyServerUUID)
}

@Suppress("SameParameterValue")
private fun createTempFileWithStringContent(
filename: String,
content: String,
Expand Down
6 changes: 4 additions & 2 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import com.google.gson.Gson
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
import ee.ria.DigiDoc.configuration.ConfigurationProperty
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
Expand Down Expand Up @@ -134,15 +135,16 @@ class MobileIdViewModelTest {
configurationUpdateDate = null,
cdoc2Conf =
mapOf(
"00000000-0000-0000-0000-000000000000" to
DEFAULT_UUID_VALUE to
ConfigurationProvider.CDOC2Conf(
name = "RIA",
post = "https://cdoc2.id.ee:8443",
fetch = "https://cdoc2.id.ee:8444",
),
),
cdoc2Default = false,
cdoc2UseKeyServer = false,
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
)

companion object {
Expand Down
6 changes: 4 additions & 2 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import com.google.gson.Gson
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
import ee.ria.DigiDoc.configuration.ConfigurationProperty
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
Expand Down Expand Up @@ -141,15 +142,16 @@ class SmartIdViewModelTest {
configurationUpdateDate = null,
cdoc2Conf =
mapOf(
"00000000-0000-0000-0000-000000000000" to
DEFAULT_UUID_VALUE to
ConfigurationProvider.CDOC2Conf(
name = "RIA",
post = "https://cdoc2.id.ee:8443",
fetch = "https://cdoc2.id.ee:8444",
),
),
cdoc2Default = false,
cdoc2UseKeyServer = false,
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
)

companion object {
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/shared/SharedSettingsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.documentfile.provider.DocumentFile
import androidx.test.platform.app.InstrumentationRegistry
import com.google.gson.Gson
import ee.ria.DigiDoc.common.Constant.DIR_TSA_CERT
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
import ee.ria.DigiDoc.configuration.ConfigurationProperty
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
Expand All @@ -46,7 +47,6 @@ import ee.ria.DigiDoc.manager.ActivityManager
import ee.ria.DigiDoc.network.proxy.ManualProxy
import ee.ria.DigiDoc.network.proxy.ProxySetting
import ee.ria.DigiDoc.network.siva.SivaSetting
import ee.ria.DigiDoc.utils.Constant
import kotlinx.coroutines.runBlocking
import org.apache.commons.io.FileUtils
import org.junit.Assert.assertEquals
Expand Down Expand Up @@ -158,7 +158,7 @@ class SharedSettingsViewModelTest {
viewModel.resetToDefaultSettings()

// resetSigningSettings
assertEquals(Constant.Defaults.DEFAULT_UUID_VALUE, dataStore.getSettingsUUID())
assertEquals(DEFAULT_UUID_VALUE, dataStore.getSettingsUUID())
assertEquals("", dataStore.getSettingsTSAUrl())
assertFalse(dataStore.getSettingsAskRoleAndAddress())
assertFalse(dataStore.getIsTsaCertificateViewVisible())
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/kotlin/ee/ria/DigiDoc/domain/preferences/DataStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import androidx.core.content.edit
import androidx.preference.PreferenceManager
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.common.Constant.Crypto.DECRYPT_METHOD_SETTING
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.common.Constant.IS_CRASH_SENDING_ALWAYS_ENABLED
import ee.ria.DigiDoc.common.Constant.KEY_LOCALE
import ee.ria.DigiDoc.common.Constant.MyEID.IDENTIFICATION_METHOD_SETTING
Expand All @@ -43,7 +44,6 @@ import ee.ria.DigiDoc.domain.model.theme.ThemeSetting
import ee.ria.DigiDoc.network.proxy.ManualProxy
import ee.ria.DigiDoc.network.proxy.ProxySetting
import ee.ria.DigiDoc.network.siva.SivaSetting
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
import ee.ria.DigiDoc.utilsLib.locale.LocaleUtil.getLocale
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
Expand Down Expand Up @@ -341,10 +341,10 @@ class DataStore
}
}

fun getUseEncryption(): Boolean =
fun getUseEncryption(defaultValue: Boolean): Boolean =
preferences.getBoolean(
resources.getString(ee.ria.DigiDoc.cryptolib.R.string.crypto_settings_use_cdoc2_encryption),
false,
defaultValue,
)

fun setUseEncryption(useEncryption: Boolean) {
Expand Down Expand Up @@ -436,8 +436,8 @@ class DataStore
}
}

fun getCdocSetting(): CDOCSetting {
if (getUseEncryption()) {
fun getCdocSetting(defaultValue: Boolean): CDOCSetting {
if (getUseEncryption(defaultValue)) {
return CDOCSetting.CDOC2
}
return CDOCSetting.CDOC1
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fun DiagnosticsScreen(
onClickItem = {
try {
val diagnosticsFile =
diagnosticsViewModel.createDiagnosticsFile(context)
diagnosticsViewModel.createDiagnosticsFile(context, currentConfiguration)
actionFile = diagnosticsFile
val saveIntent =
Intent.createChooser(
Expand Down Expand Up @@ -518,7 +518,7 @@ fun DiagnosticsScreen(
testTagsAsResourceId = true
}.testTag("mainDiagnosticsCdoc2Default"),
stringResource(id = R.string.main_diagnostics_cdoc2_default_title),
diagnosticsViewModel.isCdoc2Selected().toString(),
diagnosticsViewModel.isCdoc2Selected(currentConfiguration).toString(),
)
DiagnosticsText(
modifier =
Expand All @@ -527,7 +527,7 @@ fun DiagnosticsScreen(
testTagsAsResourceId = true
}.testTag("mainDiagnosticsCdoc2UseKeyserver"),
stringResource(id = R.string.main_diagnostics_cdoc2_use_keyserver_title),
diagnosticsViewModel.isCdoc2KeyServerUsed().toString(),
diagnosticsViewModel.isCdoc2KeyServerUsed(currentConfiguration).toString(),
)
DiagnosticsText(
modifier =
Expand All @@ -536,7 +536,7 @@ fun DiagnosticsScreen(
testTagsAsResourceId = true
}.testTag("mainDiagnosticsCdoc2DefaultKeyserver"),
stringResource(id = R.string.main_diagnostics_cdoc2_default_keyserver_title),
diagnosticsViewModel.getCdoc2KeyServerUUID(),
diagnosticsViewModel.getCdoc2KeyServerUUID(currentConfiguration),
)
HorizontalDivider(
modifier =
Expand Down
Loading
Loading