diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt index 2e2216eb5..2311a4728 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt +++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModelTest.kt @@ -100,7 +100,6 @@ class DiagnosticsViewModelTest { tslUrl = "https://www.example.com", tslCerts = listOf("CERT0000111122224444"), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt index 3ad2e86de..d621e0439 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt +++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/MobileIdViewModelTest.kt @@ -122,7 +122,6 @@ class MobileIdViewModelTest { tslUrl = "https://www.example.com", tslCerts = listOf("CERT0000111122224444"), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt index 88901b8d3..049221807 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt +++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/SmartIdViewModelTest.kt @@ -129,7 +129,6 @@ class SmartIdViewModelTest { tslUrl = "https://www.example.com", tslCerts = listOf("CERT0000111122224444"), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/domain/model/ConfigurationViewModelTest.kt b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/domain/model/ConfigurationViewModelTest.kt index 174fa2083..fb306e3ee 100644 --- a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/domain/model/ConfigurationViewModelTest.kt +++ b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/domain/model/ConfigurationViewModelTest.kt @@ -129,7 +129,6 @@ class ConfigurationViewModelTest { "tslUrl", emptyList(), "tsaUrl", - emptyMap(), "ldapPersonUrl", ldapPersonUrls = listOf("ldapPersonUrl"), "ldapCorpUrl", diff --git a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/loader/ConfigurationLoaderTest.kt b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/loader/ConfigurationLoaderTest.kt index d4cc9a6ba..def1c751a 100644 --- a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/loader/ConfigurationLoaderTest.kt +++ b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/loader/ConfigurationLoaderTest.kt @@ -394,7 +394,6 @@ class ConfigurationLoaderTest { "eE/VmJs0niWtKlX4UURG0HAGjZIQ/pJejV+7GzknFMZmuiwJQe4yT4mw=", ), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/repository/ConfigurationRepositoryTest.kt b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/repository/ConfigurationRepositoryTest.kt index 94b61d406..9d11a4943 100644 --- a/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/repository/ConfigurationRepositoryTest.kt +++ b/config-lib/src/androidTest/kotlin/ee/ria/DigiDoc/configuration/repository/ConfigurationRepositoryTest.kt @@ -169,7 +169,6 @@ class ConfigurationRepositoryTest { "eE/VmJs0niWtKlX4UURG0HAGjZIQ/pJejV+7GzknFMZmuiwJQe4yT4mw=\n", ), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/config-lib/src/main/kotlin/ee/ria/DigiDoc/configuration/provider/ConfigurationProvider.kt b/config-lib/src/main/kotlin/ee/ria/DigiDoc/configuration/provider/ConfigurationProvider.kt index 0b5630b94..96b6c54b8 100644 --- a/config-lib/src/main/kotlin/ee/ria/DigiDoc/configuration/provider/ConfigurationProvider.kt +++ b/config-lib/src/main/kotlin/ee/ria/DigiDoc/configuration/provider/ConfigurationProvider.kt @@ -34,7 +34,6 @@ data class ConfigurationProvider( @SerializedName("TSL-URL") val tslUrl: String, @SerializedName("TSL-CERTS") val tslCerts: List, @SerializedName("TSA-URL") val tsaUrl: String, - @SerializedName("OCSP-URL-ISSUER") val ocspUrls: Map, @SerializedName("LDAP-PERSON-URL") val ldapPersonUrl: String, @SerializedName("LDAP-PERSON-URLS") val ldapPersonUrls: List, @SerializedName("LDAP-CORP-URL") val ldapCorpUrl: String, diff --git a/crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt b/crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt index c70854ef7..417461d8b 100644 --- a/crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt +++ b/crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt @@ -123,7 +123,6 @@ class CryptoContainerTest { tslUrl = "https://www.example.com", tslCerts = listOf("CER00001", "CER00002"), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt b/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt index 05e4b8d08..635aed4de 100644 --- a/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt +++ b/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt @@ -60,7 +60,6 @@ class InitializationTest { tslUrl = "https://www.example.com", tslCerts = listOf(), tsaUrl = "https://www.example.com", - ocspUrls = mapOf("issuer" to "https://www.example.com"), ldapPersonUrl = "https://www.example.com", ldapPersonUrls = listOf("https://www.example.com"), ldapCorpUrl = "https://www.example.com", diff --git a/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt b/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt index 53be13b07..d1b645168 100644 --- a/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt +++ b/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt @@ -54,7 +54,6 @@ import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog import ee.ria.libdigidocpp.Conf import ee.ria.libdigidocpp.DigiDocConf -import ee.ria.libdigidocpp.StringMap import ee.ria.libdigidocpp.digidoc import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO @@ -192,7 +191,6 @@ class Initialization overrideTSLUrl(configurationProvider.tslUrl) overrideTSLCert(configurationProvider.tslCerts) overrideSivaUrl(configurationProvider.sivaUrl) - overrideOCSPUrls(configurationProvider.ocspUrls) overrideTSCerts(configurationProvider.certBundle) overrideTSUrl(configurationProvider.tsaUrl) overrideVerifyServiceCert(configurationProvider.certBundle) @@ -421,14 +419,6 @@ class Initialization } } - private fun overrideOCSPUrls(ocspUrls: Map) { - val stringMap = StringMap() - for ((key, value) in ocspUrls) { - stringMap[key] = value - } - DigiDocConf.instance().setOCSPUrls(stringMap) - } - private fun loadConfiguration(context: Context) { configurationRepository.getConfiguration()?.let { overrideConfiguration(context, it) } CoroutineScope(Main).launch {