Fix saving encryption services settings

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

@@ -72,6 +72,7 @@ import java.nio.file.Files
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
+import java.util.UUID
 
 @RunWith(MockitoJUnitRunner::class)
 class DiagnosticsViewModelTest {
@@ -115,6 +116,7 @@ class DiagnosticsViewModelTest {
                 mapOf(
                     DEFAULT_UUID_VALUE to
                         ConfigurationProvider.CDOC2Conf(
+                            uuid = UUID.randomUUID(),
                             name = "RIA",
                             post = "https://cdoc2.id.ee:8443",
                             fetch = "https://cdoc2.id.ee:8444",

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

@@ -71,6 +71,7 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.any
 import org.mockito.kotlin.atLeastOnce
 import org.mockito.kotlin.eq
+import java.util.UUID
 
 @RunWith(MockitoJUnitRunner::class)
 class MobileIdViewModelTest {
@@ -137,6 +138,7 @@ class MobileIdViewModelTest {
                 mapOf(
                     DEFAULT_UUID_VALUE to
                         ConfigurationProvider.CDOC2Conf(
+                            uuid = UUID.randomUUID(),
                             name = "RIA",
                             post = "https://cdoc2.id.ee:8443",
                             fetch = "https://cdoc2.id.ee:8444",

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

@@ -72,6 +72,7 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.any
 import org.mockito.kotlin.atLeastOnce
 import org.mockito.kotlin.eq
+import java.util.UUID
 
 @RunWith(MockitoJUnitRunner::class)
 class SmartIdViewModelTest {
@@ -144,6 +145,7 @@ class SmartIdViewModelTest {
                 mapOf(
                     DEFAULT_UUID_VALUE to
                         ConfigurationProvider.CDOC2Conf(
+                            uuid = UUID.randomUUID(),
                             name = "RIA",
                             post = "https://cdoc2.id.ee:8443",
                             fetch = "https://cdoc2.id.ee:8444",

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

@@ -26,6 +26,8 @@ import android.content.ContentResolver
 import android.content.Context
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -34,6 +36,8 @@ import dagger.hilt.components.SingletonComponent
 import ee.ria.DigiDoc.common.BuildVersionProvider
 import ee.ria.DigiDoc.common.BuildVersionProviderImpl
 import ee.ria.DigiDoc.common.certificate.CertificateService
+import ee.ria.DigiDoc.configuration.deserializer.Cdoc2ConfDeserializer
+import ee.ria.DigiDoc.configuration.provider.ConfigurationProvider
 import ee.ria.DigiDoc.configuration.repository.ConfigurationRepository
 import ee.ria.DigiDoc.cryptolib.CDOC2Settings
 import ee.ria.DigiDoc.cryptolib.init.CryptoInitialization
@@ -141,7 +145,14 @@ class AppModules {
     fun provideActivityManager(): ActivityManager = ActivityManagerImpl()
 
     @Provides
-    fun provideGson(): Gson = Gson()
+    @Singleton
+    fun provideGson(): Gson {
+        val type = object : TypeToken<Map<String, ConfigurationProvider.CDOC2Conf>>() {}.type
+
+        return GsonBuilder()
+            .registerTypeAdapter(type, Cdoc2ConfDeserializer())
+            .create()
+    }
 
     @Provides
     fun provideRootChecker(): RootChecker = RootCheckerImpl()

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

@@ -102,8 +102,7 @@ class DataStore
             }
             errorLog(
                 logTag,
-                "Un" +
-                    "able to read CAN",
+                "Unable to read CAN",
             )
             return ""
         }