diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/repository/FileOpeningRepositoryImplTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/repository/FileOpeningRepositoryImplTest.kt index 8b0c7fb36..4043f941c 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/repository/FileOpeningRepositoryImplTest.kt +++ b/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 = diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/FileOpeningViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/FileOpeningViewModelTest.kt index ed315b33e..d44e80514 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/FileOpeningViewModelTest.kt +++ b/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, diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/IdCardViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/IdCardViewModelTest.kt index 8c8f6cff0..b3dc6a500 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/IdCardViewModelTest.kt +++ b/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 = diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModelTest.kt index d518c9527..b61d301da 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModelTest.kt +++ b/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( diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/RecentDocumentsViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/RecentDocumentsViewModelTest.kt index abe6cfc02..3a7204596 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/RecentDocumentsViewModelTest.kt +++ b/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 = diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt b/app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt index 9611f8293..df0e2583b 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt +++ b/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) { navController = navController, sharedMenuViewModel = sharedMenuViewModel, sharedSettingsViewModel = sharedSettingsViewModel, - sharedCertificateViewModel = sharedCertificateViewModel, ) } composable(route = Route.SettingsLanguageChooser.route) { diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/di/AppModules.kt b/app/src/main/kotlin/ee/ria/DigiDoc/di/AppModules.kt index 6eb586178..a32c8c930 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/di/AppModules.kt +++ b/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 diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AccessibilityFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AccessibilityFragment.kt index 4c5d0a56f..81118d148 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AccessibilityFragment.kt +++ b/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 diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AdvancedSettingsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AdvancedSettingsFragment.kt index 007e64d37..7762d8256 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/AdvancedSettingsFragment.kt +++ b/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 diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/CryptoFileOpeningFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/CryptoFileOpeningFragment.kt index a7d2a3f76..81764c1ea 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/CryptoFileOpeningFragment.kt +++ b/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 diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptFragment.kt index a416fe9f1..da5cb9348 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptFragment.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.DecryptScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptMethodChooserFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptMethodChooserFragment.kt index cd0744318..487618def 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptMethodChooserFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptMethodChooserFragment.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.DecryptMethodChooserScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DiagnosticsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DiagnosticsFragment.kt index acb160250..e66061120 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DiagnosticsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/DiagnosticsFragment.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.DiagnosticsScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.kt index e5f582500..d29795256 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.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.EncryptScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptRecipientFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptRecipientFragment.kt index d639a3c8b..2cf06e87a 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptRecipientFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptRecipientFragment.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.EncryptRecipientScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptionServicesSettingsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptionServicesSettingsFragment.kt index d83fa51e2..6248ee448 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptionServicesSettingsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptionServicesSettingsFragment.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.EncryptionServicesSettingsScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/FileOpeningFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/FileOpeningFragment.kt index 06fb2d530..364c6c16d 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/FileOpeningFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/FileOpeningFragment.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.common.model.FileOpeningMethod diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/HomeFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/HomeFragment.kt index be00a9eef..4839c18e4 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/HomeFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/HomeFragment.kt @@ -35,7 +35,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.HomeScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/InfoFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/InfoFragment.kt index 84adfd9ce..4b1e06b3e 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/InfoFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/InfoFragment.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.InfoScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/LanguageChooserFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/LanguageChooserFragment.kt index bc30ccf9a..ab419b162 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/LanguageChooserFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/LanguageChooserFragment.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.LanguageChooserScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidFragment.kt index c1846f9ca..0d7576ed4 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidFragment.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.ui.component.myeid.MyEidScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationFragment.kt index 7e24347c4..009b09aa3 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationFragment.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.MyEidIdentificationScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationMethodChooserFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationMethodChooserFragment.kt index ab8add630..4abfd1552 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationMethodChooserFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidIdentificationMethodChooserFragment.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.MyEidIdentificationMethodChooserScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidPinFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidPinFragment.kt index d259d1bf8..db8d07934 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidPinFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/MyEidPinFragment.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.ui.component.myeid.pinandcertificate.MyEidPinScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ProxyServicesSettingsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ProxyServicesSettingsFragment.kt index 72d5de791..ecee27fc9 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ProxyServicesSettingsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ProxyServicesSettingsFragment.kt @@ -33,12 +33,11 @@ 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.ProxyServicesSettingsScreen import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme -import ee.ria.DigiDoc.viewmodel.shared.SharedCertificateViewModel import ee.ria.DigiDoc.viewmodel.shared.SharedMenuViewModel import ee.ria.DigiDoc.viewmodel.shared.SharedSettingsViewModel @@ -49,7 +48,6 @@ fun ProxyServicesSettingsFragment( modifier: Modifier = Modifier, sharedMenuViewModel: SharedMenuViewModel, sharedSettingsViewModel: SharedSettingsViewModel, - sharedCertificateViewModel: SharedCertificateViewModel, ) { Surface( modifier = @@ -79,7 +77,6 @@ fun ProxyServicesSettingsFragmentPreview() { navController = rememberNavController(), sharedMenuViewModel = hiltViewModel(), sharedSettingsViewModel = hiltViewModel(), - sharedCertificateViewModel = hiltViewModel(), ) } } diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/RecentDocumentsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/RecentDocumentsFragment.kt index ce3dbad59..b33477262 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/RecentDocumentsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/RecentDocumentsFragment.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.common.model.FileOpeningMethod diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureInputFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureInputFragment.kt index 14988c221..290408894 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureInputFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureInputFragment.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.SignatureInputScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureMethodFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureMethodFragment.kt index 76ec08bc7..483e3f5d8 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureMethodFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SignatureMethodFragment.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.SignatureMethodScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningFragment.kt index a99adf23c..f9f3abcf0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningFragment.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.SigningScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningServicesSettingsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningServicesSettingsFragment.kt index 00d3d0ced..014b80b0c 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningServicesSettingsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/SigningServicesSettingsFragment.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.SigningServicesSettingsScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ThemeChooserFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ThemeChooserFragment.kt index 64e74bfd9..ff47db71d 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ThemeChooserFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ThemeChooserFragment.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.ThemeChooserScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ValidationServicesSettingsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ValidationServicesSettingsFragment.kt index 1b56516b8..9a29a0695 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ValidationServicesSettingsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/ValidationServicesSettingsFragment.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.ValidationServicesSettingsScreen diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AccessibilityScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AccessibilityScreen.kt index 569a8461e..beb02633e 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AccessibilityScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AccessibilityScreen.kt @@ -55,7 +55,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType -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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AdvancedSettingsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AdvancedSettingsScreen.kt index d2cd67ce1..1d83cc980 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AdvancedSettingsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AdvancedSettingsScreen.kt @@ -65,7 +65,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/CryptoFileOpeningScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/CryptoFileOpeningScreen.kt index 8508c6297..e193c6ac0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/CryptoFileOpeningScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/CryptoFileOpeningScreen.kt @@ -25,7 +25,7 @@ import android.content.res.Configuration import androidx.compose.runtime.Composable 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.NavHostController import androidx.navigation.compose.rememberNavController import ee.ria.DigiDoc.ui.component.crypto.CryptoFileOpeningNavigation diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptMethodChooserScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptMethodChooserScreen.kt index 2a06dd4ef..c1db2f324 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptMethodChooserScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptMethodChooserScreen.kt @@ -58,7 +58,7 @@ import androidx.compose.ui.semantics.heading 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptScreen.kt index ebb150d24..52405c733 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DecryptScreen.kt @@ -69,7 +69,7 @@ import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt index e816f9b38..30be9316c 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt @@ -65,7 +65,7 @@ import androidx.compose.ui.res.stringResource 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.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController @@ -506,40 +506,38 @@ fun DiagnosticsScreen( stringResource(id = R.string.main_diagnostics_rpuuid_title), stringResource(diagnosticsViewModel.getRpUuid()), ) - if (diagnosticsViewModel.isCdoc2Enabled) { - SpannableBoldText( - modifier = modifier, - stringResource(id = R.string.main_diagnostics_cdoc2_title), - "", - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCdoc2Default"), - stringResource(id = R.string.main_diagnostics_cdoc2_default_title), - diagnosticsViewModel.isCdoc2Selected().toString(), - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCdoc2UseKeyserver"), - stringResource(id = R.string.main_diagnostics_cdoc2_use_keyserver_title), - diagnosticsViewModel.isCdoc2KeyServerUsed().toString(), - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCdoc2DefaultKeyserver"), - stringResource(id = R.string.main_diagnostics_cdoc2_default_keyserver_title), - diagnosticsViewModel.getCdoc2KeyServerUUID(), - ) - } + SpannableBoldText( + modifier = modifier, + stringResource(id = R.string.main_diagnostics_cdoc2_title), + "", + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCdoc2Default"), + stringResource(id = R.string.main_diagnostics_cdoc2_default_title), + diagnosticsViewModel.isCdoc2Selected().toString(), + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCdoc2UseKeyserver"), + stringResource(id = R.string.main_diagnostics_cdoc2_use_keyserver_title), + diagnosticsViewModel.isCdoc2KeyServerUsed().toString(), + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCdoc2DefaultKeyserver"), + stringResource(id = R.string.main_diagnostics_cdoc2_default_keyserver_title), + diagnosticsViewModel.getCdoc2KeyServerUUID(), + ) HorizontalDivider( modifier = modifier diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptRecipientScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptRecipientScreen.kt index 2ed44fe2e..00b6161db 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptRecipientScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptRecipientScreen.kt @@ -72,7 +72,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.core.text.isDigitsOnly -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptScreen.kt index 2a8278c48..7ad4a6bc7 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptScreen.kt @@ -25,7 +25,7 @@ import android.content.res.Configuration import androidx.compose.runtime.Composable 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.NavHostController import androidx.navigation.compose.rememberNavController import ee.ria.DigiDoc.ui.component.crypto.EncryptNavigation diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt index 324e72a30..90d6f26c9 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt @@ -365,8 +365,6 @@ fun EncryptionServicesSettingsScreen( val fetchUrlFocusRequester = remember { FocusRequester() } val postUrlFocusRequester = remember { FocusRequester() } - val isCdoc2Enabled = false - LaunchedEffect(messages) { messages.forEach { message -> snackBarScope.launch { @@ -462,498 +460,496 @@ fun EncryptionServicesSettingsScreen( } } - if (isCdoc2Enabled) { - Card( + Card( + modifier = + modifier + .fillMaxWidth() + .padding(top = XSPadding, bottom = SPadding), + shape = buttonRoundedCornerShape, + border = + BorderStroke( + width = XSBorder, + color = MaterialTheme.colorScheme.onSurface, + ), + colors = CardDefaults.cardColors(containerColor = Color.Transparent), + ) { + Column( modifier = modifier - .fillMaxWidth() - .padding(top = XSPadding, bottom = SPadding), - shape = buttonRoundedCornerShape, - border = - BorderStroke( - width = XSBorder, - color = MaterialTheme.colorScheme.onSurface, - ), - colors = CardDefaults.cardColors(containerColor = Color.Transparent), + .padding(SPadding) + .fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, ) { - Column( + Row( modifier = modifier - .padding(SPadding) - .fillMaxWidth(), - horizontalAlignment = Alignment.CenterHorizontally, + .clickable { + settingsCdocServiceChoice.value = CDOCSetting.CDOC2.name + setCdocSetting(CDOCSetting.CDOC2) + }, + verticalAlignment = Alignment.CenterVertically, ) { - Row( + Text( + text = useCDOC2Label, + style = MaterialTheme.typography.bodyLarge, + modifier = + modifier + .weight(1f) + .notAccessible(), + ) + RadioButton( modifier = modifier - .clickable { - settingsCdocServiceChoice.value = CDOCSetting.CDOC2.name - setCdocSetting(CDOCSetting.CDOC2) + .semantics { + contentDescription = useCDOC2Label }, - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - text = useCDOC2Label, - style = MaterialTheme.typography.bodyLarge, - modifier = - modifier - .weight(1f) - .notAccessible(), - ) - RadioButton( + selected = settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name, + onClick = { + settingsCdocServiceChoice.value = CDOCSetting.CDOC2.name + setCdocSetting(CDOCSetting.CDOC2) + }, + ) + } + + if (settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name) { + Spacer(modifier = modifier.height(LPadding)) + + SettingsSwitchItem( + modifier = modifier, + checked = useKeyTransfer.value, + onCheckedChange = { + useKeyTransfer.value = it + setUseOnlineEncryption(it) + saveParameters() + }, + title = keyTransferText, + contentDescription = keyTransferText, + testTag = "encryptionServicesManuallySpecifiedKeySwitch", + ) + + if (useKeyTransfer.value) { + Box( modifier = modifier + .fillMaxWidth() .semantics { - contentDescription = useCDOC2Label + contentDescription = serverLabel }, - selected = settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name, - onClick = { - settingsCdocServiceChoice.value = CDOCSetting.CDOC2.name - setCdocSetting(CDOCSetting.CDOC2) - }, - ) - } - - if (settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name) { - Spacer(modifier = modifier.height(LPadding)) - - SettingsSwitchItem( - modifier = modifier, - checked = useKeyTransfer.value, - onCheckedChange = { - useKeyTransfer.value = it - setUseOnlineEncryption(it) - saveParameters() - }, - title = keyTransferText, - contentDescription = keyTransferText, - testTag = "encryptionServicesManuallySpecifiedKeySwitch", - ) - - if (useKeyTransfer.value) { - Box( + ) { + OutlinedTextField( + label = { + Text(serverLabel) + }, + value = nameChoices[settingsCdocNameChoiceInt.intValue], + onValueChange = {}, + readOnly = true, + singleLine = true, modifier = modifier .fillMaxWidth() - .semantics { - contentDescription = serverLabel + .focusRequester(nameFocusRequester) + .onGloballyPositioned { coordinates -> + textFieldSize = coordinates.size.toSize() }, - ) { - OutlinedTextField( - label = { - Text(serverLabel) - }, - value = nameChoices[settingsCdocNameChoiceInt.intValue], - onValueChange = {}, - readOnly = true, - singleLine = true, + trailingIcon = { + Icon( + imageVector = + ImageVector.vectorResource( + R.drawable.ic_baseline_keyboard_arrow_down_24, + ), + contentDescription = serverLabel, + modifier = + modifier.clickable { + openOptionChooserDialog = !openOptionChooserDialog + }, + ) + }, + ) + + if (!openOptionChooserDialog) { + Box( modifier = modifier - .fillMaxWidth() - .focusRequester(nameFocusRequester) - .onGloballyPositioned { coordinates -> - textFieldSize = coordinates.size.toSize() - }, - trailingIcon = { - Icon( - imageVector = - ImageVector.vectorResource( - R.drawable.ic_baseline_keyboard_arrow_down_24, - ), - contentDescription = serverLabel, - modifier = - modifier.clickable { - openOptionChooserDialog = !openOptionChooserDialog + .matchParentSize() + .clickable( + onClick = { + openOptionChooserDialog = true }, - ) - }, + interactionSource = interactionSource, + indication = null, + ).semantics { + contentDescription = serverLabel + }, ) - - if (!openOptionChooserDialog) { - Box( - modifier = - modifier - .matchParentSize() - .clickable( - onClick = { - openOptionChooserDialog = true - }, - interactionSource = interactionSource, - indication = null, - ).semantics { - contentDescription = serverLabel - }, - ) - } else { - BasicAlertDialog( + } else { + BasicAlertDialog( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }, + onDismissRequest = { + openOptionChooserDialog = false + }, + ) { + Surface( modifier = modifier - .semantics { - testTagsAsResourceId = true - }, - onDismissRequest = { - openOptionChooserDialog = false - }, + .wrapContentHeight() + .wrapContentWidth() + .verticalScroll(rememberScrollState()) + .padding(XSPadding) + .testTag("encryptionServicesNameDialog"), ) { - Surface( - modifier = - modifier - .wrapContentHeight() - .wrapContentWidth() - .verticalScroll(rememberScrollState()) - .padding(XSPadding) - .testTag("encryptionServicesNameDialog"), - ) { - OptionChooserDialog( - modifier = modifier, - title = R.string.choose_server_option, - choices = nameChoices, - selectedChoice = settingsCdocNameChoiceInt.intValue, - cancelButtonClick = { - openOptionChooserDialog = false - }, - okButtonClick = { selectedIndex -> - settingsCdocNameChoiceInt.intValue = selectedIndex - useDefaultKeyTransferServer.value = - nameChoices[selectedIndex] == settingsCdocNameChoice.value - saveParameters() - openOptionChooserDialog = false - }, - ) - InvisibleElement(modifier = modifier) - } + OptionChooserDialog( + modifier = modifier, + title = R.string.choose_server_option, + choices = nameChoices, + selectedChoice = settingsCdocNameChoiceInt.intValue, + cancelButtonClick = { + openOptionChooserDialog = false + }, + okButtonClick = { selectedIndex -> + settingsCdocNameChoiceInt.intValue = selectedIndex + useDefaultKeyTransferServer.value = + nameChoices[selectedIndex] == settingsCdocNameChoice.value + saveParameters() + openOptionChooserDialog = false + }, + ) + InvisibleElement(modifier = modifier) } } } + } - Spacer(modifier = modifier.padding(MSPadding)) + Spacer(modifier = modifier.padding(MSPadding)) - Row( + Row( + modifier = + modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.Start, + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + enabled = + settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && + useKeyTransfer.value && + !useDefaultKeyTransferServer.value, + value = uuidText, + singleLine = true, + onValueChange = { + uuidText = it.copy(selection = TextRange(it.text.length)) + setCDOC2UUID(it.text) + }, + shape = RectangleShape, + label = { Text(uuidLabel) }, modifier = modifier - .fillMaxWidth(), - horizontalArrangement = Arrangement.Start, - verticalAlignment = Alignment.CenterVertically, - ) { - OutlinedTextField( - enabled = - settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && - useKeyTransfer.value && - !useDefaultKeyTransferServer.value, - value = uuidText, - singleLine = true, - onValueChange = { - uuidText = it.copy(selection = TextRange(it.text.length)) - setCDOC2UUID(it.text) - }, - shape = RectangleShape, - label = { Text(uuidLabel) }, - modifier = - modifier - .focusRequester(uuidFocusRequester) - .weight(1f) - .fillMaxWidth() - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesUuidTextField"), - trailingIcon = { - if (!isTalkBackEnabled(context) && uuidText.text.isNotEmpty()) { - IconButton(onClick = { - uuidText = TextFieldValue("") - }) { - Icon( - imageVector = - ImageVector.vectorResource( - R.drawable.ic_icon_remove, - ), - contentDescription = "$clearButtonText $buttonName", - ) - } - } - }, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = MaterialTheme.colorScheme.primary, - unfocusedBorderColor = MaterialTheme.colorScheme.primary, - ), - keyboardOptions = - KeyboardOptions.Default.copy( - imeAction = ImeAction.Next, - keyboardType = KeyboardType.Text, - ), - ) - - if (isTalkBackEnabled(context) && uuidText.text.isNotEmpty()) { - IconButton(onClick = { - uuidText = TextFieldValue("") - scope.launch(Main) { - uuidFocusRequester.requestFocus() - focusManager.clearFocus() - delay(200) - uuidFocusRequester.requestFocus() + .focusRequester(uuidFocusRequester) + .weight(1f) + .fillMaxWidth() + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesUuidTextField"), + trailingIcon = { + if (!isTalkBackEnabled(context) && uuidText.text.isNotEmpty()) { + IconButton(onClick = { + uuidText = TextFieldValue("") + }) { + Icon( + imageVector = + ImageVector.vectorResource( + R.drawable.ic_icon_remove, + ), + contentDescription = "$clearButtonText $buttonName", + ) } - }) { - Icon( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesUuidRemoveIconButton"), - imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), - contentDescription = "$clearButtonText $buttonName", - ) } + }, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.primary, + ), + keyboardOptions = + KeyboardOptions.Default.copy( + imeAction = ImeAction.Next, + keyboardType = KeyboardType.Text, + ), + ) + + if (isTalkBackEnabled(context) && uuidText.text.isNotEmpty()) { + IconButton(onClick = { + uuidText = TextFieldValue("") + scope.launch(Main) { + uuidFocusRequester.requestFocus() + focusManager.clearFocus() + delay(200) + uuidFocusRequester.requestFocus() + } + }) { + Icon( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesUuidRemoveIconButton"), + imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), + contentDescription = "$clearButtonText $buttonName", + ) } } + } - Spacer(modifier = modifier.height(MSPadding)) + Spacer(modifier = modifier.height(MSPadding)) - Row( + Row( + modifier = + modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.Start, + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + enabled = + settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && + useKeyTransfer.value && + !useDefaultKeyTransferServer.value, + value = fetchUrlText, + singleLine = true, + onValueChange = { + fetchUrlText = + it.copy(selection = TextRange(it.text.length)) + setCDOC2FetchURL(it.text) + }, + shape = RectangleShape, + label = { Text(fetchUrlLabel) }, modifier = modifier - .fillMaxWidth(), - horizontalArrangement = Arrangement.Start, - verticalAlignment = Alignment.CenterVertically, - ) { - OutlinedTextField( - enabled = - settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && - useKeyTransfer.value && - !useDefaultKeyTransferServer.value, - value = fetchUrlText, - singleLine = true, - onValueChange = { - fetchUrlText = - it.copy(selection = TextRange(it.text.length)) - setCDOC2FetchURL(it.text) - }, - shape = RectangleShape, - label = { Text(fetchUrlLabel) }, - modifier = - modifier - .focusRequester(fetchUrlFocusRequester) - .weight(1f) - .fillMaxWidth() - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesFetchUrlTextField"), - trailingIcon = { - if (!isTalkBackEnabled(context) && fetchUrlText.text.isNotEmpty()) { - IconButton(onClick = { - fetchUrlText = TextFieldValue("") - }) { - Icon( - imageVector = - ImageVector.vectorResource( - R.drawable.ic_icon_remove, - ), - contentDescription = "$clearButtonText $buttonName", - ) - } - } - }, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = MaterialTheme.colorScheme.primary, - unfocusedBorderColor = MaterialTheme.colorScheme.primary, - ), - keyboardOptions = - KeyboardOptions.Default.copy( - imeAction = ImeAction.Next, - keyboardType = KeyboardType.Uri, - ), - ) - - if (isTalkBackEnabled(context) && fetchUrlText.text.isNotEmpty()) { - IconButton(onClick = { - fetchUrlText = TextFieldValue("") - scope.launch(Main) { - fetchUrlFocusRequester.requestFocus() - focusManager.clearFocus() - delay(200) - fetchUrlFocusRequester.requestFocus() + .focusRequester(fetchUrlFocusRequester) + .weight(1f) + .fillMaxWidth() + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesFetchUrlTextField"), + trailingIcon = { + if (!isTalkBackEnabled(context) && fetchUrlText.text.isNotEmpty()) { + IconButton(onClick = { + fetchUrlText = TextFieldValue("") + }) { + Icon( + imageVector = + ImageVector.vectorResource( + R.drawable.ic_icon_remove, + ), + contentDescription = "$clearButtonText $buttonName", + ) } - }) { - Icon( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesFetchUrlRemoveIconButton"), - imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), - contentDescription = "$clearButtonText $buttonName", - ) } + }, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.primary, + ), + keyboardOptions = + KeyboardOptions.Default.copy( + imeAction = ImeAction.Next, + keyboardType = KeyboardType.Uri, + ), + ) + + if (isTalkBackEnabled(context) && fetchUrlText.text.isNotEmpty()) { + IconButton(onClick = { + fetchUrlText = TextFieldValue("") + scope.launch(Main) { + fetchUrlFocusRequester.requestFocus() + focusManager.clearFocus() + delay(200) + fetchUrlFocusRequester.requestFocus() + } + }) { + Icon( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesFetchUrlRemoveIconButton"), + imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), + contentDescription = "$clearButtonText $buttonName", + ) } } + } - Spacer(modifier = modifier.height(MSPadding)) + Spacer(modifier = modifier.height(MSPadding)) - Row( + Row( + modifier = + modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.Start, + verticalAlignment = Alignment.CenterVertically, + ) { + OutlinedTextField( + enabled = + settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && + useKeyTransfer.value && + !useDefaultKeyTransferServer.value, + value = postUrlText, + singleLine = true, + onValueChange = { + postUrlText = it.copy(selection = TextRange(it.text.length)) + setCDOC2PostURL(it.text) + }, + shape = RectangleShape, + label = { Text(postUrlLabel) }, modifier = modifier - .fillMaxWidth(), - horizontalArrangement = Arrangement.Start, - verticalAlignment = Alignment.CenterVertically, - ) { - OutlinedTextField( - enabled = - settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && - useKeyTransfer.value && - !useDefaultKeyTransferServer.value, - value = postUrlText, - singleLine = true, - onValueChange = { - postUrlText = it.copy(selection = TextRange(it.text.length)) - setCDOC2PostURL(it.text) - }, - shape = RectangleShape, - label = { Text(postUrlLabel) }, - modifier = - modifier - .focusRequester(postUrlFocusRequester) - .weight(1f) - .fillMaxWidth() - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesPostUrlTextField"), - trailingIcon = { - if (!isTalkBackEnabled(context) && postUrlText.text.isNotEmpty()) { - IconButton(onClick = { - postUrlText = TextFieldValue("") - }) { - Icon( - imageVector = - ImageVector.vectorResource( - R.drawable.ic_icon_remove, - ), - contentDescription = "$clearButtonText $buttonName", - ) - } - } - }, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = MaterialTheme.colorScheme.primary, - unfocusedBorderColor = MaterialTheme.colorScheme.primary, - ), - keyboardOptions = - KeyboardOptions.Default.copy( - imeAction = ImeAction.Done, - keyboardType = KeyboardType.Uri, - ), - ) - - if (isTalkBackEnabled(context) && postUrlText.text.isNotEmpty()) { - IconButton(onClick = { - postUrlText = TextFieldValue("") - scope.launch(Main) { - postUrlFocusRequester.requestFocus() - focusManager.clearFocus() - delay(200) - postUrlFocusRequester.requestFocus() + .focusRequester(postUrlFocusRequester) + .weight(1f) + .fillMaxWidth() + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesPostUrlTextField"), + trailingIcon = { + if (!isTalkBackEnabled(context) && postUrlText.text.isNotEmpty()) { + IconButton(onClick = { + postUrlText = TextFieldValue("") + }) { + Icon( + imageVector = + ImageVector.vectorResource( + R.drawable.ic_icon_remove, + ), + contentDescription = "$clearButtonText $buttonName", + ) } - }) { - Icon( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("encryptionServicesPostUrlRemoveIconButton"), - imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), - contentDescription = "$clearButtonText $buttonName", - ) } + }, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.primary, + ), + keyboardOptions = + KeyboardOptions.Default.copy( + imeAction = ImeAction.Done, + keyboardType = KeyboardType.Uri, + ), + ) + + if (isTalkBackEnabled(context) && postUrlText.text.isNotEmpty()) { + IconButton(onClick = { + postUrlText = TextFieldValue("") + scope.launch(Main) { + postUrlFocusRequester.requestFocus() + focusManager.clearFocus() + delay(200) + postUrlFocusRequester.requestFocus() + } + }) { + Icon( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("encryptionServicesPostUrlRemoveIconButton"), + imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove), + contentDescription = "$clearButtonText $buttonName", + ) } } - if (settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && - useKeyTransfer.value && - !useDefaultKeyTransferServer.value - ) { - Spacer(modifier = modifier.height(SPadding)) + } + if (settingsCdocServiceChoice.value == CDOCSetting.CDOC2.name && + useKeyTransfer.value && + !useDefaultKeyTransferServer.value + ) { + Spacer(modifier = modifier.height(SPadding)) + Text( + modifier = + modifier + .fillMaxWidth() + .semantics { + heading() + }, + text = stringResource(R.string.main_settings_crypto_certificate_title), + style = MaterialTheme.typography.bodyLarge, + ) + + if (cryptoCertificate != null) { Text( - modifier = - modifier - .fillMaxWidth() - .semantics { - heading() - }, - text = stringResource(R.string.main_settings_crypto_certificate_title), - style = MaterialTheme.typography.bodyLarge, + modifier = modifier.fillMaxWidth(), + text = "$issuedToTitleText $issuedTo", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (cryptoCertificate != null) { - Text( - modifier = modifier.fillMaxWidth(), - text = "$issuedToTitleText $issuedTo", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - - Text( - modifier = modifier.fillMaxWidth(), - text = "$validToTitleText $validTo", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } else { - Text( - modifier = modifier.fillMaxWidth(), - text = noCertificateFoundText, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } + Text( + modifier = modifier.fillMaxWidth(), + text = "$validToTitleText $validTo", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + Text( + modifier = modifier.fillMaxWidth(), + text = noCertificateFoundText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } - Spacer(modifier = modifier.height(SPadding)) + Spacer(modifier = modifier.height(SPadding)) - FlowRow( - modifier = modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.End, - verticalArrangement = Arrangement.Center, - ) { - if (cryptoCertificate != null) { - TextButton(onClick = { - cryptoCertificate?.let { - sharedCertificateViewModel.setCertificate( - it, - ) - navController.navigate( - Route.CertificateDetail.route, - ) - } - }) { - Text( - modifier = - modifier - .semantics { - contentDescription = - "$showCertificateButtonText $buttonName" - testTagsAsResourceId = true - }.testTag("encryptionServicesShowCertificateActionButton"), - text = showCertificateButtonText, - color = MaterialTheme.colorScheme.primary, + FlowRow( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End, + verticalArrangement = Arrangement.Center, + ) { + if (cryptoCertificate != null) { + TextButton(onClick = { + cryptoCertificate?.let { + sharedCertificateViewModel.setCertificate( + it, + ) + navController.navigate( + Route.CertificateDetail.route, ) } - } - - TextButton(onClick = { - filePicker.launch("*/*") }) { Text( modifier = modifier .semantics { contentDescription = - "$addCertificateButtonText $buttonName" + "$showCertificateButtonText $buttonName" testTagsAsResourceId = true - }.testTag("encryptionServicesAddCertificateActionButton"), - text = addCertificateButtonText, + }.testTag("encryptionServicesShowCertificateActionButton"), + text = showCertificateButtonText, color = MaterialTheme.colorScheme.primary, ) } } + + TextButton(onClick = { + filePicker.launch("*/*") + }) { + Text( + modifier = + modifier + .semantics { + contentDescription = + "$addCertificateButtonText $buttonName" + testTagsAsResourceId = true + }.testTag("encryptionServicesAddCertificateActionButton"), + text = addCertificateButtonText, + color = MaterialTheme.colorScheme.primary, + ) + } } } } diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/FileOpeningScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/FileOpeningScreen.kt index 185ea7bf6..8622f18be 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/FileOpeningScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/FileOpeningScreen.kt @@ -25,7 +25,7 @@ import android.content.res.Configuration import androidx.compose.runtime.Composable 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.NavHostController import androidx.navigation.compose.rememberNavController import ee.ria.DigiDoc.common.model.FileOpeningMethod diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/HomeScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/HomeScreen.kt index 658b3dff1..837151387 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/HomeScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/HomeScreen.kt @@ -64,7 +64,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.semantics.traversalIndex import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt index 9bc5b5229..c7ee977b0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt @@ -72,7 +72,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp import androidx.core.net.toUri -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/LanguageChooserScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/LanguageChooserScreen.kt index 9331177e1..fc9c3700c 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/LanguageChooserScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/LanguageChooserScreen.kt @@ -44,7 +44,7 @@ import androidx.compose.ui.res.stringResource 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationMethodChooserScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationMethodChooserScreen.kt index 24398322c..40ca5d0ea 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationMethodChooserScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationMethodChooserScreen.kt @@ -58,7 +58,7 @@ import androidx.compose.ui.semantics.heading 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationScreen.kt index 67c1b12e4..7fa03f291 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/MyEidIdentificationScreen.kt @@ -72,7 +72,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/RecentDocumentsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/RecentDocumentsScreen.kt index a46a7cda8..6bf3c56a7 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/RecentDocumentsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/RecentDocumentsScreen.kt @@ -70,7 +70,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureInputScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureInputScreen.kt index 54737a830..c96dd6799 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureInputScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureInputScreen.kt @@ -73,7 +73,7 @@ import androidx.compose.ui.semantics.traversalIndex import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.zIndex -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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureMethodScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureMethodScreen.kt index 0d2a088d5..dfacddc78 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureMethodScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SignatureMethodScreen.kt @@ -58,7 +58,7 @@ import androidx.compose.ui.semantics.heading 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningScreen.kt index c3ca4e0a7..51fa6f707 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningScreen.kt @@ -25,7 +25,7 @@ import android.content.res.Configuration import androidx.compose.runtime.Composable 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.NavHostController import androidx.navigation.compose.rememberNavController import ee.ria.DigiDoc.ui.component.signing.SigningNavigation diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningServicesSettingsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningServicesSettingsScreen.kt index 70d693e3a..97c20b5ea 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningServicesSettingsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/SigningServicesSettingsScreen.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.res.stringResource 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ThemeChooserScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ThemeChooserScreen.kt index b97bfa0da..496a132b0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ThemeChooserScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ThemeChooserScreen.kt @@ -44,7 +44,7 @@ import androidx.compose.ui.res.stringResource 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.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/CryptoFileOpeningNavigation.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/CryptoFileOpeningNavigation.kt index 4544f513f..1feb45c81 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/CryptoFileOpeningNavigation.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/CryptoFileOpeningNavigation.kt @@ -37,7 +37,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import ee.ria.DigiDoc.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/EncryptNavigation.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/EncryptNavigation.kt index f476cbaf7..df2031673 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/EncryptNavigation.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/EncryptNavigation.kt @@ -80,7 +80,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/recipient/RecipientDetailsView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/recipient/RecipientDetailsView.kt index f69271191..c35a566fb 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/recipient/RecipientDetailsView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/recipient/RecipientDetailsView.kt @@ -47,7 +47,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavHostController import ee.ria.DigiDoc.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageChoiceButtonGroup.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageChoiceButtonGroup.kt index 322ad893f..4148668c7 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageChoiceButtonGroup.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageChoiceButtonGroup.kt @@ -36,7 +36,7 @@ import androidx.compose.ui.res.stringResource 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 ee.ria.DigiDoc.R import ee.ria.DigiDoc.ui.theme.BlueBackground import ee.ria.DigiDoc.ui.theme.Dimensions.MPadding diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt index 278b5cc55..22eb67f41 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt @@ -75,7 +75,7 @@ import androidx.compose.ui.semantics.traversalIndex import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.zIndex -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavHostController diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/FileOpeningNavigation.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/FileOpeningNavigation.kt index d63a76d90..d41832a75 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/FileOpeningNavigation.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/FileOpeningNavigation.kt @@ -37,7 +37,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import ee.ria.DigiDoc.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/IdCardView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/IdCardView.kt index a1ab9f998..6dff69c43 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/IdCardView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/IdCardView.kt @@ -81,7 +81,7 @@ import androidx.compose.ui.semantics.traversalIndex import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.zIndex -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.common.Constant.NFCConstants.PIN1_MIN_LENGTH diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdSignatureUpdateContainer.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdSignatureUpdateContainer.kt index ad647b75a..c6c210ad0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdSignatureUpdateContainer.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdSignatureUpdateContainer.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource @@ -53,7 +52,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.ui.theme.Dimensions.LPadding @@ -71,7 +70,6 @@ fun MobileIdSignatureUpdateContainer( mobileIdViewModel: MobileIdViewModel, onError: () -> Unit = {}, ) { - val context = LocalContext.current val controlCode = stringResource(id = R.string.challenge_code_text) val controlCodeLoadingText = stringResource(id = R.string.control_code_loading) var challengeText by remember { mutableStateOf("") } diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdView.kt index 95680bc9b..fb658d3b6 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/MobileIdView.kt @@ -84,7 +84,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.libdigidoclib.domain.model.RoleData diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCSignatureUpdateContainer.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCSignatureUpdateContainer.kt index 9b62f5ee8..126d3bdfc 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCSignatureUpdateContainer.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCSignatureUpdateContainer.kt @@ -55,7 +55,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.ui.theme.Dimensions.LPadding diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt index c5feadb29..609d34453 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt @@ -89,7 +89,7 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.common.Constant.NFCConstants.CAN_LENGTH diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SigningNavigation.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SigningNavigation.kt index 79dc3b500..8f2599884 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SigningNavigation.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SigningNavigation.kt @@ -86,7 +86,7 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController @@ -273,16 +273,6 @@ fun SigningNavigation( ) } - val openSignatureDialog = rememberSaveable { mutableStateOf(false) } - val signingCancelled = stringResource(id = R.string.signing_cancelled) - val dismissDialog = { - openSignatureDialog.value = false - } - val cancelButtonClick = { - dismissDialog() - sendAccessibilityEvent(context, getAccessibilityEventType(), signingCancelled) - } - var signatures by remember { mutableStateOf>(emptyList()) } val showSignaturesLoadingIndicator = remember { mutableStateOf(false) } val signaturesLoading = stringResource(id = R.string.signatures_loading) diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdSignatureUpdateContainer.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdSignatureUpdateContainer.kt index d0cc613e8..066ea57c8 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdSignatureUpdateContainer.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdSignatureUpdateContainer.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource @@ -53,7 +52,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.ui.theme.Dimensions.LPadding @@ -71,7 +70,6 @@ fun SmartIdSignatureUpdateContainer( smartIdViewModel: SmartIdViewModel, onError: () -> Unit = {}, ) { - val context = LocalContext.current val controlCode = stringResource(id = R.string.challenge_code_text) val controlCodeLoadingText = stringResource(id = R.string.control_code_loading) var challengeText by remember { mutableStateOf("") } diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdView.kt index f1e0aa267..aeb8e22a0 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/SmartIdView.kt @@ -90,7 +90,7 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.toSize -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow import ee.ria.DigiDoc.R import ee.ria.DigiDoc.common.Constant diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/CertificateDetailsView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/CertificateDetailsView.kt index 3c9876ad7..c9a588b60 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/CertificateDetailsView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/CertificateDetailsView.kt @@ -58,7 +58,7 @@ import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.font.FontWeight -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavHostController import ee.ria.DigiDoc.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/SignerDetailsView.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/SignerDetailsView.kt index 573a5f82d..f31afce97 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/SignerDetailsView.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/certificate/SignerDetailsView.kt @@ -62,7 +62,7 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavHostController import ee.ria.DigiDoc.R diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/notifications/ContainerNotificationsFragment.kt b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/notifications/ContainerNotificationsFragment.kt index 2d180de65..f548245d5 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/notifications/ContainerNotificationsFragment.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/notifications/ContainerNotificationsFragment.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.ui.theme.RIADigiDocTheme diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModel.kt b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModel.kt index 780415934..ae2a662c7 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModel.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModel.kt @@ -82,8 +82,6 @@ class DiagnosticsViewModel private val _updatedConfiguration = MutableLiveData() var updatedConfiguration: LiveData = _updatedConfiguration - val isCdoc2Enabled = false - init { observeConfigurationUpdates(context) } @@ -358,32 +356,30 @@ class DiagnosticsViewModel )} ${context.getString(getRpUuid())}", ) - if (isCdoc2Enabled) { - // CDOC2 - appendLine() - appendLine(context.getString(R.string.main_diagnostics_cdoc2_title)) - appendLine( - "${ - context.getString( - R.string.main_diagnostics_cdoc2_default_title, - ) - } ${isCdoc2Selected()}", - ) - appendLine( - "${ - context.getString( - R.string.main_diagnostics_cdoc2_use_keyserver_title, - ) - } ${isCdoc2KeyServerUsed()}", - ) - appendLine( - "${ - context.getString( - R.string.main_diagnostics_cdoc2_default_keyserver_title, - ) - } ${getCdoc2KeyServerUUID()}", - ) - } + // CDOC2 + appendLine() + appendLine(context.getString(R.string.main_diagnostics_cdoc2_title)) + appendLine( + "${ + context.getString( + R.string.main_diagnostics_cdoc2_default_title, + ) + } ${isCdoc2Selected()}", + ) + appendLine( + "${ + context.getString( + R.string.main_diagnostics_cdoc2_use_keyserver_title, + ) + } ${isCdoc2KeyServerUsed()}", + ) + appendLine( + "${ + context.getString( + R.string.main_diagnostics_cdoc2_default_keyserver_title, + ) + } ${getCdoc2KeyServerUUID()}", + ) // Category appendLine() diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/EncryptRecipientViewModel.kt b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/EncryptRecipientViewModel.kt index b781eadf3..70b5fcc89 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/EncryptRecipientViewModel.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/EncryptRecipientViewModel.kt @@ -92,7 +92,7 @@ class EncryptRecipientViewModel private fun filterRecipients() = queryText - .combine(_recipientList) { text, recipients -> + .combine(_recipientList) { text, _ -> if (!text.isEmpty()) { var allRecipients: Pair, Int> = Pair(listOf(), 0) try { @@ -136,14 +136,16 @@ class EncryptRecipientViewModel ) { val cryptoContainer = sharedContainerViewModel.cryptoContainer.value - if (cryptoContainer?.getRecipients()?.contains(recipient) == true) { - _errorState.postValue(R.string.crypto_recipients_error_exists) - handleIsRecipientAdded(false) - return - } else { - cryptoContainer?.addRecipients(listOf(recipient)) + cryptoContainer?.getRecipients()?.forEach { + if (recipient.data.contentEquals(it.data)) { + _errorState.postValue(R.string.crypto_recipients_error_exists) + handleIsRecipientAdded(false) + return + } } + cryptoContainer?.addRecipients(listOf(recipient)) + sharedContainerViewModel.setCryptoContainer(cryptoContainer) handleIsRecipientAdded(true) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8786fa052..7d4b1efce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -558,7 +558,7 @@ Validation services Encryption settings Time-Stamping service - Mobile-ID ja Smart-ID + Mobile-ID and Smart-ID Ask role and address info on signing Role / resolution City diff --git a/commons-lib/src/androidTest/kotlin/ee/ria/DigiDoc/common/ConstantTest.kt b/commons-lib/src/androidTest/kotlin/ee/ria/DigiDoc/common/ConstantTest.kt index 9d52241cb..4ee0f1bd6 100644 --- a/commons-lib/src/androidTest/kotlin/ee/ria/DigiDoc/common/ConstantTest.kt +++ b/commons-lib/src/androidTest/kotlin/ee/ria/DigiDoc/common/ConstantTest.kt @@ -65,7 +65,7 @@ class ConstantTest { assertTrue(Constant.CONTAINER_EXTENSIONS.contains("asice")) assertTrue(Constant.ALL_CONTAINER_EXTENSIONS.contains("cdoc")) assertTrue(Constant.NON_LEGACY_CONTAINER_EXTENSIONS.contains("bdoc")) - assertTrue(Constant.CRYPTO_CONTAINER_EXTENSIONS.contains("cdocna")) + assertTrue(Constant.CRYPTO_CONTAINER_EXTENSIONS.contains("cdoc2")) } @Test diff --git a/commons-lib/src/main/kotlin/ee/ria/DigiDoc/common/Constant.kt b/commons-lib/src/main/kotlin/ee/ria/DigiDoc/common/Constant.kt index 6e7502a20..f975cfb7e 100644 --- a/commons-lib/src/main/kotlin/ee/ria/DigiDoc/common/Constant.kt +++ b/commons-lib/src/main/kotlin/ee/ria/DigiDoc/common/Constant.kt @@ -132,9 +132,7 @@ object Constant { const val DEFAULT_CONTAINER_EXTENSION = "asice" const val CDOC1_EXTENSION = "cdoc" - - // TODO: Change to "cdoc2" when enabled - const val CDOC2_EXTENSION = "cdocna" + const val CDOC2_EXTENSION = "cdoc2" const val LDAP_PORT = 636 const val CERT_BINARY_ATTR = "userCertificate;binary" diff --git a/crypto-lib/libs/libcdoc.jar b/crypto-lib/libs/libcdoc.jar index db598739a..3ed11bb17 100644 Binary files a/crypto-lib/libs/libcdoc.jar and b/crypto-lib/libs/libcdoc.jar differ 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 0cabd4784..0c564f865 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 @@ -62,7 +62,6 @@ import kotlinx.coroutines.test.runTest import org.apache.commons.io.FileUtils import org.junit.After import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Assume.assumeTrue @@ -180,7 +179,7 @@ class CryptoContainerTest { private var mockConfigurationRepository: ConfigurationRepository = mock() private lateinit var context: Context - + private lateinit var cdoc2Settings: CDOC2Settings private lateinit var recipientRepository: RecipientRepository private lateinit var testFile: File @@ -247,6 +246,7 @@ class CryptoContainerTest { fun setup() { MockitoAnnotations.openMocks(this) context = InstrumentationRegistry.getInstrumentation().targetContext + cdoc2Settings = CDOC2Settings(context, configurationRepository) preferences = PreferenceManager.getDefaultSharedPreferences(context) preferences.edit().clear().commit() resources = context.resources @@ -312,7 +312,6 @@ class CryptoContainerTest { val dataFiles = listOf(testFile) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val result = cryptoContainer.file @@ -333,7 +332,6 @@ class CryptoContainerTest { val dataFiles = listOf(dataFile1, dataFile2, dataFile3) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, dataFile1, dataFiles, cdoc2Settings) val result = cryptoContainer.file @@ -354,7 +352,6 @@ class CryptoContainerTest { val dataFiles = listOf(containerCDOC1) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC1, dataFiles, cdoc2Settings, true) val result = cryptoContainer.file @@ -377,7 +374,6 @@ class CryptoContainerTest { val dataFiles = listOf(testFile) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val result = cryptoContainer.file @@ -398,7 +394,6 @@ class CryptoContainerTest { val dataFiles = listOf(containerCDOC1) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC1, dataFiles, cdoc2Settings) val result = cryptoContainer.file @@ -419,14 +414,12 @@ class CryptoContainerTest { val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val result = cryptoContainer.file assertNotNull(result) - // TODO: Replace expected with "containerCDOC2.name" when CDOC2 enabled - assertEquals("example_cdoc2.cdocna", result.name) + assertEquals(containerCDOC2.name, result.name) } @Test @@ -441,7 +434,6 @@ class CryptoContainerTest { val dataFiles = listOf(containerRIACDOC1) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerRIACDOC1, dataFiles, cdoc2Settings) val result = cryptoContainer.file @@ -462,14 +454,12 @@ class CryptoContainerTest { val dataFiles = listOf(containerRIACDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerRIACDOC2, dataFiles, cdoc2Settings) val result = cryptoContainer.file assertNotNull(result) - // TODO: Replace with "containerRIACDOC2.name" when CDOC2 enabled - assertEquals("example_ria_cdoc2.cdocna", result.name) + assertEquals(containerRIACDOC2.name, result.name) } @Test(expected = CryptoException::class) @@ -487,21 +477,18 @@ class CryptoContainerTest { val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) } @Test(expected = DataFilesEmptyException::class) fun cryptoContainer_openOrCreate_dataFilesNullExpectException() = runTest { - val cdoc2Settings = CDOC2Settings(context) openOrCreate(context, testFile, listOf(), cdoc2Settings) } @Test(expected = DataFilesEmptyException::class) fun cryptoContainer_openOrCreate_dataFilesEmptyExpectException() = runTest { - val cdoc2Settings = CDOC2Settings(context) openOrCreate(context, testFile, listOf(), cdoc2Settings) } @@ -516,7 +503,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val token = mock(Token::class.java) @@ -544,7 +530,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val token = mock(Token::class.java) @@ -572,7 +557,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val token = mock(Token::class.java) @@ -603,7 +587,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val data = "+puuS4wUR3wz+5D3DknZmebWhrP0X7ngQlXiBuPBipow0mDXgixJ7OCwhxx/zkYg" val token = mock(Token::class.java) @@ -664,7 +647,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2Network) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2Network, dataFiles, cdoc2Settings) val data = "zumNg86dm4q97avNnIuTGSGvMyKTSPRi0QBG2HSri3HwTm9jVEJKWiGsCUZ1Nudz" val authData = @@ -746,7 +728,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2Network) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2Network, dataFiles, cdoc2Settings) val data = "zumNg86dm4q97avNnIuTGSGvMyKTSPRi0QBG2HSri3HwTm9jVEJKWiGsCUZ1Nudz" val authData = @@ -783,7 +764,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerCDOC2) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) val token = mock(Token::class.java) @@ -813,7 +793,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerRIACDOC1) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerRIACDOC1, dataFiles, cdoc2Settings) val data = "+puuS4wUR3wz+5D3DknZmebWhrP0X7ngQlXiBuPBipow0mDXgixJ7OCwhxx/zkYg" val token = mock(Token::class.java) @@ -842,7 +821,6 @@ class CryptoContainerTest { ).apply() val dataFiles = listOf(containerRIACDOC1) - val cdoc2Settings = CDOC2Settings(context) val cryptoContainer = openOrCreate(context, containerRIACDOC1, dataFiles, cdoc2Settings) val token = mock(Token::class.java) decrypt( @@ -874,7 +852,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles = listOf(testFile) @@ -905,7 +882,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles: List = listOf() @@ -945,7 +921,6 @@ class CryptoContainerTest { "https://cdoc2.id.ee:8443", ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles = listOf(testFile) @@ -972,7 +947,6 @@ class CryptoContainerTest { false, ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles = listOf(testFile) @@ -997,7 +971,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles = listOf(testFile) @@ -1015,7 +988,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val recipient = Addressee(Base64.getDecoder().decode(authCert)) val testFiles = listOf(testFile) @@ -1033,8 +1005,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val testFiles = listOf(testFile) val container = openOrCreate(context, testFile, testFiles, cdoc2Settings) encrypt(context, container.file, testFiles, listOf(), cdoc2Settings, configurationRepository) @@ -1050,8 +1020,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val testFiles = listOf(testFile) val container = openOrCreate(context, testFile, testFiles, cdoc2Settings) encrypt(context, container.file, testFiles, listOf(), cdoc2Settings, configurationRepository) @@ -1067,8 +1035,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val testFiles = listOf(testFile) val container = openOrCreate(context, testFile, testFiles, cdoc2Settings) @@ -1100,8 +1066,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(containerCDOC2) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) assertEquals(CONTAINER_MIME_TYPE, cryptoContainer.containerMimetype()) @@ -1117,13 +1081,9 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(containerCDOC2) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) - // TODO: Replace commented "assertEquals" when CDOC2 enabled -// assertEquals("example_cdoc2.cdoc2", cryptoContainer.getName()) - assertEquals("example_cdoc2.cdocna", cryptoContainer.getName()) + assertEquals("example_cdoc2.cdoc2", cryptoContainer.getName()) } @Test @@ -1136,14 +1096,10 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(containerCDOC2) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) cryptoContainer.setName("test_cdoc2.cdoc2") - // TODO: Replace commented "assertEquals" when CDOC2 enabled -// assertEquals("test_cdoc2.cdoc2", cryptoContainer.getName()) - assertEquals("test_cdoc2.cdoc2.asice", cryptoContainer.getName()) + assertEquals("test_cdoc2.cdoc2", cryptoContainer.getName()) } @Test @@ -1156,13 +1112,9 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(containerCDOC2) val cryptoContainer = openOrCreate(context, containerCDOC2, dataFiles, cdoc2Settings) - // TODO: Uncomment "assertTrue" when CDOC2 enabled -// assertTrue(cryptoContainer.hasRecipients()) - assertFalse(cryptoContainer.hasRecipients()) + assertTrue(cryptoContainer.hasRecipients()) } @Test @@ -1175,8 +1127,6 @@ class CryptoContainerTest { false, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val tempResourcesDir = Files.createTempDirectory("test_resources").toFile() @@ -1199,8 +1149,6 @@ class CryptoContainerTest { false, ).apply() - val cdoc2Settings = CDOC2Settings(context) - val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val tempResourcesDir = Files.createTempDirectory("test_resources").toFile() @@ -1220,7 +1168,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) cryptoContainer.addDataFiles(listOf(dataFile1, dataFile2, dataFile3)) @@ -1237,7 +1184,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) cryptoContainer.addRecipients(listOf(Addressee(Base64.getDecoder().decode(authCert)))) @@ -1254,7 +1200,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) cryptoContainer.addDataFiles(listOf(dataFile1, dataFile2, dataFile3)) @@ -1272,7 +1217,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) cryptoContainer.removeDataFile(testFile) @@ -1288,7 +1232,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val recipient = Addressee(Base64.getDecoder().decode(authCert)) @@ -1307,7 +1250,6 @@ class CryptoContainerTest { true, ).apply() - val cdoc2Settings = CDOC2Settings(context) val dataFiles = listOf(testFile) val cryptoContainer = openOrCreate(context, testFile, dataFiles, cdoc2Settings) val recipient = Addressee(Base64.getDecoder().decode(authCert)) diff --git a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so index 1187a2294..866b4ed47 100644 Binary files a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so differ diff --git a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so index 05702d8c1..c0f5b673b 100644 Binary files a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so differ diff --git a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so index bf5d29a8b..1016db842 100644 Binary files a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so differ diff --git a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so index 1187a2294..866b4ed47 100644 Binary files a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so differ diff --git a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so index 05702d8c1..c0f5b673b 100644 Binary files a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so differ diff --git a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so index bf5d29a8b..1016db842 100644 Binary files a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so differ diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt index 6c7bc3948..a2440dbc8 100644 --- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt +++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt @@ -93,6 +93,7 @@ class Addressee( val certType = when (type) { + "cert" -> CertType.IDCardType "ID-card" -> CertType.IDCardType "Digi-ID" -> CertType.DigiIDType "Digi-ID E-RESIDENT" -> CertType.EResidentType diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CDOC2Settings.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CDOC2Settings.kt index 0c2438061..91f62266c 100644 --- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CDOC2Settings.kt +++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CDOC2Settings.kt @@ -26,6 +26,7 @@ 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 @@ -33,6 +34,7 @@ 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 = diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt index e9a7a7867..42520b86c 100644 --- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt +++ b/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 = @@ -523,7 +523,7 @@ class CryptoContainer line: Int, message: String?, ) { - System.out.format("%s:%s %s %s\n", file, line, level, message) + debugLog("CryptoContainer", String.format("%s:%s %s %s\n", file, line, level, message)) } } @@ -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 -> "" } }