Skip to content

Commit 1aba2e6

Browse files
Counter178Counter178
authored
Merge pull request #310 from open-eid/MOPPAND-1716
CDOC2 settings fixes.
2 parents 964c01c + 8a5eede commit 1aba2e6

File tree

30 files changed

+141
-130
lines changed

30 files changed

+141
-130
lines changed

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import android.content.Context
2525
import android.content.SharedPreferences
2626
import androidx.preference.PreferenceManager
2727
import androidx.test.platform.app.InstrumentationRegistry
28+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
2829
import ee.ria.DigiDoc.common.preferences.EncryptedPreferences
2930
import ee.ria.DigiDoc.configuration.repository.ConfigurationRepository
3031
import ee.ria.DigiDoc.domain.model.methods.SigningMethod
@@ -36,7 +37,6 @@ import ee.ria.DigiDoc.libdigidoclib.init.Initialization
3637
import ee.ria.DigiDoc.libdigidoclib.init.LibdigidocLibraryLoader
3738
import ee.ria.DigiDoc.network.proxy.ProxySetting
3839
import ee.ria.DigiDoc.network.siva.SivaSetting
39-
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
4040
import kotlinx.coroutines.runBlocking
4141
import org.junit.Assert.assertEquals
4242
import org.junit.Assert.assertFalse
@@ -383,14 +383,14 @@ class DataStoreTest {
383383
fun dataStore_setCdocSetting_success() {
384384
dataStore.setCdocSetting(CDOCSetting.CDOC2)
385385

386-
val result = dataStore.getCdocSetting()
386+
val result = dataStore.getCdocSetting(false)
387387

388388
assertEquals(CDOCSetting.CDOC2, result)
389389
}
390390

391391
@Test
392392
fun dataStore_getCdocSetting_success() {
393-
val result = dataStore.getCdocSetting()
393+
val result = dataStore.getCdocSetting(false)
394394

395395
assertEquals(CDOCSetting.CDOC1, result)
396396
}

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/utils/ConstantTest.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ class ConstantTest {
3131
assertEquals("en", Constant.Languages.ENGLISH_LANGUAGE)
3232
}
3333

34-
@Test
35-
fun constantTest_Defaults_success() {
36-
assertEquals("00000000-0000-0000-0000-000000000000", Constant.Defaults.DEFAULT_UUID_VALUE)
37-
}
38-
3934
@Test
4035
fun constantTest_Routes_success() {
4136
assertEquals("init_route", Constant.Routes.INIT_SCREEN)

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.lifecycle.MutableLiveData
3131
import androidx.test.platform.app.InstrumentationRegistry
3232
import com.google.gson.Gson
3333
import ee.ria.DigiDoc.R
34+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
3435
import ee.ria.DigiDoc.configuration.ConfigurationProperty
3536
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
3637
import ee.ria.DigiDoc.configuration.loader.ConfigurationLoader
@@ -47,7 +48,6 @@ import ee.ria.DigiDoc.libdigidoclib.init.Initialization
4748
import ee.ria.DigiDoc.libdigidoclib.init.LibdigidocLibraryLoader
4849
import ee.ria.DigiDoc.network.proxy.ManualProxy
4950
import ee.ria.DigiDoc.network.proxy.ProxySetting
50-
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
5151
import ee.ria.DigiDoc.utilsLib.file.FileUtil
5252
import junit.framework.TestCase.assertEquals
5353
import junit.framework.TestCase.assertTrue
@@ -113,15 +113,16 @@ class DiagnosticsViewModelTest {
113113
configurationUpdateDate = null,
114114
cdoc2Conf =
115115
mapOf(
116-
"00000000-0000-0000-0000-000000000000" to
116+
DEFAULT_UUID_VALUE to
117117
ConfigurationProvider.CDOC2Conf(
118118
name = "RIA",
119119
post = "https://cdoc2.id.ee:8443",
120120
fetch = "https://cdoc2.id.ee:8444",
121121
),
122122
),
123+
cdoc2Default = false,
123124
cdoc2UseKeyServer = false,
124-
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
125+
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
125126
)
126127

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

294295
assertEquals(File(diagnosticsFilePath, diagnosticsFileName).path, resultFile.path)
295296
assertTrue(resultFile.exists())
@@ -375,7 +376,7 @@ class DiagnosticsViewModelTest {
375376
dataStore.setCdocSetting(CDOCSetting.CDOC2)
376377
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)
377378

378-
val isCdoc2Selected = viewModel.isCdoc2Selected()
379+
val isCdoc2Selected = viewModel.isCdoc2Selected(configurationProvider)
379380

380381
assertTrue(isCdoc2Selected)
381382
}
@@ -385,7 +386,7 @@ class DiagnosticsViewModelTest {
385386
dataStore.setCdocSetting(CDOCSetting.CDOC1)
386387
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)
387388

388-
val isCdoc2Selected = viewModel.isCdoc2Selected()
389+
val isCdoc2Selected = viewModel.isCdoc2Selected(configurationProvider)
389390

390391
assertFalse(isCdoc2Selected)
391392
}
@@ -396,7 +397,7 @@ class DiagnosticsViewModelTest {
396397
dataStore.setUseOnlineEncryption(true)
397398
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)
398399

399-
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed()
400+
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed(configurationProvider)
400401

401402
assertTrue(isCdoc2KeyServerUsed)
402403
}
@@ -407,7 +408,7 @@ class DiagnosticsViewModelTest {
407408
dataStore.setUseOnlineEncryption(false)
408409
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)
409410

410-
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed()
411+
val isCdoc2KeyServerUsed = viewModel.isCdoc2KeyServerUsed(configurationProvider)
411412

412413
assertFalse(isCdoc2KeyServerUsed)
413414
}
@@ -418,11 +419,12 @@ class DiagnosticsViewModelTest {
418419
dataStore.setCDOC2UUID(DEFAULT_UUID_VALUE)
419420
viewModel.updatedConfiguration = MutableLiveData(configurationProvider)
420421

421-
val cdoc2KeyServerUUID = viewModel.getCdoc2KeyServerUUID()
422+
val cdoc2KeyServerUUID = viewModel.getCdoc2KeyServerUUID(configurationProvider)
422423

423424
assertEquals(DEFAULT_UUID_VALUE, cdoc2KeyServerUUID)
424425
}
425426

427+
@Suppress("SameParameterValue")
426428
private fun createTempFileWithStringContent(
427429
filename: String,
428430
content: String,

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.test.core.app.ActivityScenario
3131
import androidx.test.platform.app.InstrumentationRegistry
3232
import com.google.gson.Gson
3333
import ee.ria.DigiDoc.R
34+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
3435
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
3536
import ee.ria.DigiDoc.configuration.ConfigurationProperty
3637
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
@@ -134,15 +135,16 @@ class MobileIdViewModelTest {
134135
configurationUpdateDate = null,
135136
cdoc2Conf =
136137
mapOf(
137-
"00000000-0000-0000-0000-000000000000" to
138+
DEFAULT_UUID_VALUE to
138139
ConfigurationProvider.CDOC2Conf(
139140
name = "RIA",
140141
post = "https://cdoc2.id.ee:8443",
141142
fetch = "https://cdoc2.id.ee:8444",
142143
),
143144
),
145+
cdoc2Default = false,
144146
cdoc2UseKeyServer = false,
145-
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
147+
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
146148
)
147149

148150
companion object {

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.test.core.app.ActivityScenario
3131
import androidx.test.platform.app.InstrumentationRegistry
3232
import com.google.gson.Gson
3333
import ee.ria.DigiDoc.R
34+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
3435
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
3536
import ee.ria.DigiDoc.configuration.ConfigurationProperty
3637
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
@@ -141,15 +142,16 @@ class SmartIdViewModelTest {
141142
configurationUpdateDate = null,
142143
cdoc2Conf =
143144
mapOf(
144-
"00000000-0000-0000-0000-000000000000" to
145+
DEFAULT_UUID_VALUE to
145146
ConfigurationProvider.CDOC2Conf(
146147
name = "RIA",
147148
post = "https://cdoc2.id.ee:8443",
148149
fetch = "https://cdoc2.id.ee:8444",
149150
),
150151
),
152+
cdoc2Default = false,
151153
cdoc2UseKeyServer = false,
152-
cdoc2DefaultKeyServer = "00000000-0000-0000-0000-000000000000",
154+
cdoc2DefaultKeyServer = DEFAULT_UUID_VALUE,
153155
)
154156

155157
companion object {

‎app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/shared/SharedSettingsViewModelTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.documentfile.provider.DocumentFile
2929
import androidx.test.platform.app.InstrumentationRegistry
3030
import com.google.gson.Gson
3131
import ee.ria.DigiDoc.common.Constant.DIR_TSA_CERT
32+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
3233
import ee.ria.DigiDoc.common.testfiles.asset.AssetFile
3334
import ee.ria.DigiDoc.configuration.ConfigurationProperty
3435
import ee.ria.DigiDoc.configuration.ConfigurationSignatureVerifierImpl
@@ -46,7 +47,6 @@ import ee.ria.DigiDoc.manager.ActivityManager
4647
import ee.ria.DigiDoc.network.proxy.ManualProxy
4748
import ee.ria.DigiDoc.network.proxy.ProxySetting
4849
import ee.ria.DigiDoc.network.siva.SivaSetting
49-
import ee.ria.DigiDoc.utils.Constant
5050
import kotlinx.coroutines.runBlocking
5151
import org.apache.commons.io.FileUtils
5252
import org.junit.Assert.assertEquals
@@ -158,7 +158,7 @@ class SharedSettingsViewModelTest {
158158
viewModel.resetToDefaultSettings()
159159

160160
// resetSigningSettings
161-
assertEquals(Constant.Defaults.DEFAULT_UUID_VALUE, dataStore.getSettingsUUID())
161+
assertEquals(DEFAULT_UUID_VALUE, dataStore.getSettingsUUID())
162162
assertEquals("", dataStore.getSettingsTSAUrl())
163163
assertFalse(dataStore.getSettingsAskRoleAndAddress())
164164
assertFalse(dataStore.getIsTsaCertificateViewVisible())

‎app/src/main/kotlin/ee/ria/DigiDoc/domain/preferences/DataStore.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.core.content.edit
2828
import androidx.preference.PreferenceManager
2929
import ee.ria.DigiDoc.R
3030
import ee.ria.DigiDoc.common.Constant.Crypto.DECRYPT_METHOD_SETTING
31+
import ee.ria.DigiDoc.common.Constant.Defaults.DEFAULT_UUID_VALUE
3132
import ee.ria.DigiDoc.common.Constant.IS_CRASH_SENDING_ALWAYS_ENABLED
3233
import ee.ria.DigiDoc.common.Constant.KEY_LOCALE
3334
import ee.ria.DigiDoc.common.Constant.MyEID.IDENTIFICATION_METHOD_SETTING
@@ -43,7 +44,6 @@ import ee.ria.DigiDoc.domain.model.theme.ThemeSetting
4344
import ee.ria.DigiDoc.network.proxy.ManualProxy
4445
import ee.ria.DigiDoc.network.proxy.ProxySetting
4546
import ee.ria.DigiDoc.network.siva.SivaSetting
46-
import ee.ria.DigiDoc.utils.Constant.Defaults.DEFAULT_UUID_VALUE
4747
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
4848
import ee.ria.DigiDoc.utilsLib.locale.LocaleUtil.getLocale
4949
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
@@ -341,10 +341,10 @@ class DataStore
341341
}
342342
}
343343

344-
fun getUseEncryption(): Boolean =
344+
fun getUseEncryption(defaultValue: Boolean): Boolean =
345345
preferences.getBoolean(
346346
resources.getString(ee.ria.DigiDoc.cryptolib.R.string.crypto_settings_use_cdoc2_encryption),
347-
false,
347+
defaultValue,
348348
)
349349

350350
fun setUseEncryption(useEncryption: Boolean) {
@@ -436,8 +436,8 @@ class DataStore
436436
}
437437
}
438438

439-
fun getCdocSetting(): CDOCSetting {
440-
if (getUseEncryption()) {
439+
fun getCdocSetting(defaultValue: Boolean): CDOCSetting {
440+
if (getUseEncryption(defaultValue)) {
441441
return CDOCSetting.CDOC2
442442
}
443443
return CDOCSetting.CDOC1

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ fun DiagnosticsScreen(
256256
onClickItem = {
257257
try {
258258
val diagnosticsFile =
259-
diagnosticsViewModel.createDiagnosticsFile(context)
259+
diagnosticsViewModel.createDiagnosticsFile(context, currentConfiguration)
260260
actionFile = diagnosticsFile
261261
val saveIntent =
262262
Intent.createChooser(
@@ -518,7 +518,7 @@ fun DiagnosticsScreen(
518518
testTagsAsResourceId = true
519519
}.testTag("mainDiagnosticsCdoc2Default"),
520520
stringResource(id = R.string.main_diagnostics_cdoc2_default_title),
521-
diagnosticsViewModel.isCdoc2Selected().toString(),
521+
diagnosticsViewModel.isCdoc2Selected(currentConfiguration).toString(),
522522
)
523523
DiagnosticsText(
524524
modifier =
@@ -527,7 +527,7 @@ fun DiagnosticsScreen(
527527
testTagsAsResourceId = true
528528
}.testTag("mainDiagnosticsCdoc2UseKeyserver"),
529529
stringResource(id = R.string.main_diagnostics_cdoc2_use_keyserver_title),
530-
diagnosticsViewModel.isCdoc2KeyServerUsed().toString(),
530+
diagnosticsViewModel.isCdoc2KeyServerUsed(currentConfiguration).toString(),
531531
)
532532
DiagnosticsText(
533533
modifier =
@@ -536,7 +536,7 @@ fun DiagnosticsScreen(
536536
testTagsAsResourceId = true
537537
}.testTag("mainDiagnosticsCdoc2DefaultKeyserver"),
538538
stringResource(id = R.string.main_diagnostics_cdoc2_default_keyserver_title),
539-
diagnosticsViewModel.getCdoc2KeyServerUUID(),
539+
diagnosticsViewModel.getCdoc2KeyServerUUID(currentConfiguration),
540540
)
541541
HorizontalDivider(
542542
modifier =

0 commit comments

Comments
 (0)