Merge pull request #308 from open-eid/MOPPAND-1661

Re-enable and unhide CDOC2 functionality.

Author: Counter178

app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/repository/FileOpeningRepositoryImplTest.kt

@@ -111,7 +111,7 @@ class FileOpeningRepositoryImplTest {
             sivaService = mock(SivaService::class.java)
             context = InstrumentationRegistry.getInstrumentation().targetContext
             contentResolver = mock(ContentResolver::class.java)
-            cdoc2Settings = CDOC2Settings(context)
+            cdoc2Settings = CDOC2Settings(context, configurationRepository)
             fileOpeningRepository = FileOpeningRepositoryImpl(fileOpeningService, sivaService, cdoc2Settings)
 
             signedPdfDocument =

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

@@ -162,7 +162,7 @@ class FileOpeningViewModelTest {
     @Before
     fun setup() {
         MockitoAnnotations.openMocks(this)
-        cdoc2Settings = CDOC2Settings(context)
+        cdoc2Settings = CDOC2Settings(context, configurationRepository)
         viewModel =
             FileOpeningViewModel(
                 context,

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

@@ -149,8 +149,8 @@ class IdCardViewModelTest {
         `when`(mockContext.resources).thenReturn(resources)
         `when`(smartCardReaderManager.connectedReader()).thenReturn(mockSmartCardReader)
         `when`(mockSmartCardReader.atr()).thenReturn(Hex.decode("3bdb960080b1fe451f830012233f536549440f9000f1"))
-        cdoc2Settings = CDOC2Settings(context)
         configurationRepository = mock(ConfigurationRepository::class.java)
+        cdoc2Settings = CDOC2Settings(context, configurationRepository)
         viewModel = IdCardViewModel(smartCardReaderManager, idCardService, cdoc2Settings, configurationRepository)
 
         container =

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

@@ -116,8 +116,8 @@ class NFCViewModelTest {
         `when`(mockContext.resources).thenReturn(resources)
 
         containerWrapper = ContainerWrapperImpl()
-        cdoc2Settings = CDOC2Settings(context)
         configurationRepository = mock(ConfigurationRepository::class.java)
+        cdoc2Settings = CDOC2Settings(context, configurationRepository)
 
         viewModel =
             NFCViewModel(

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

@@ -124,7 +124,7 @@ class RecentDocumentsViewModelTest {
     fun setup() {
         MockitoAnnotations.openMocks(this)
         mimeTypeResolver = MimeTypeResolverImpl(mimeTypeCache)
-        cdoc2Settings = CDOC2Settings(context)
+        cdoc2Settings = CDOC2Settings(context, configurationRepository)
         viewModel = RecentDocumentsViewModel(context, sivaRepository, mimeTypeResolver, cdoc2Settings)
 
         container =

app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt

@@ -28,7 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -287,7 +287,6 @@ fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
                 navController = navController,
                 sharedMenuViewModel = sharedMenuViewModel,
                 sharedSettingsViewModel = sharedSettingsViewModel,
-                sharedCertificateViewModel = sharedCertificateViewModel,
             )
         }
         composable(route = Route.SettingsLanguageChooser.route) {

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

app/src/main/kotlin/ee/ria/DigiDoc/fragment/AccessibilityFragment.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import ee.ria.DigiDoc.fragment.screen.AccessibilityScreen

app/src/main/kotlin/ee/ria/DigiDoc/fragment/AdvancedSettingsFragment.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import ee.ria.DigiDoc.fragment.screen.AdvancedSettingsScreen

app/src/main/kotlin/ee/ria/DigiDoc/fragment/CryptoFileOpeningFragment.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import ee.ria.DigiDoc.fragment.screen.CryptoFileOpeningScreen