MOPPAND-1661 Fix CDOC2 online decryption, use key capsule value from container.

Author: ambrose40

app/src/main/kotlin/ee/ria/DigiDoc/di/AppModules.kt

@@ -84,9 +84,11 @@ class AppModules {
     @Provides
     fun provideCDOC2Settings(
         @ApplicationContext context: Context,
+        configurationRepository: ConfigurationRepository,
     ): CDOC2Settings =
         CDOC2Settings(
             context = context,
+            configurationRepository,
         )
 
     @Provides

crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CDOC2Settings.kt

@@ -26,13 +26,15 @@ import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import ee.ria.DigiDoc.common.Constant.DIR_CRYPTO_CERT
+import ee.ria.DigiDoc.configuration.repository.ConfigurationRepository
 import ee.ria.DigiDoc.utilsLib.file.FileUtil
 import javax.inject.Inject
 
 class CDOC2Settings
     @Inject
     constructor(
         private var context: Context,
+        private var configurationRepository: ConfigurationRepository,
     ) {
         private var preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
         private var resources: Resources = context.resources
@@ -55,17 +57,29 @@ class CDOC2Settings
                 "",
             ) ?: ""
 
-        fun getCDOC2PostURL(): String =
-            preferences.getString(
-                resources.getString(R.string.crypto_settings_use_cdoc2_post_url),
-                "",
-            ) ?: ""
+        fun getCDOC2PostURL(domain: String): String {
+            val configurationProvider = configurationRepository.getConfiguration()
+            val configPostUrl =
+                configurationProvider?.cdoc2Conf?.get(domain)?.post
+                    ?: return preferences.getString(
+                        resources.getString(R.string.crypto_settings_use_cdoc2_post_url),
+                        "",
+                    ) ?: ""
 
-        fun getCDOC2FetchURL(): String =
-            preferences.getString(
-                resources.getString(R.string.crypto_settings_use_cdoc2_fetch_url),
-                "",
-            ) ?: ""
+            return configPostUrl
+        }
+
+        fun getCDOC2FetchURL(domain: String): String {
+            val configurationProvider = configurationRepository.getConfiguration()
+            val configFetchUrl =
+                configurationProvider?.cdoc2Conf?.get(domain)?.fetch
+                    ?: return preferences.getString(
+                        resources.getString(R.string.crypto_settings_use_cdoc2_fetch_url),
+                        "",
+                    ) ?: ""
+
+            return configFetchUrl
+        }
 
         fun getCDOC2Cert(): String? {
             val cryptoCertName =

crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt

@@ -359,9 +359,9 @@ class CryptoContainer
                 if (recipients.isEmpty()) {
                     throw RecipientsEmptyException("Cannot create crypto container without recipients")
                 }
-
-                val conf = CryptoLibConf(cdoc2Settings)
                 val configurationProvider = configurationRepository.getConfiguration()
+                val conf = CryptoLibConf(cdoc2Settings)
+
                 val network = Network(cdoc2Settings, configurationProvider, context)
 
                 val version =
@@ -531,12 +531,12 @@ class CryptoContainer
                 private val cdoc2Settings: CDOC2Settings,
             ) : Configuration() {
                 override fun getValue(
-                    domain: String?,
-                    param: String?,
+                    domain: String,
+                    param: String,
                 ): String =
                     when (param) {
-                        KEYSERVER_FETCH_URL -> cdoc2Settings.getCDOC2FetchURL()
-                        KEYSERVER_SEND_URL -> cdoc2Settings.getCDOC2PostURL()
+                        KEYSERVER_FETCH_URL -> cdoc2Settings.getCDOC2FetchURL(domain)
+                        KEYSERVER_SEND_URL -> cdoc2Settings.getCDOC2PostURL(domain)
                         else -> ""
                     }
             }