Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ class AccessibilityUtilTest {
@Test
fun accessibilityUtilTest_sendAccessibilityEvent_success() {
// This is a void method, so we're just testing that it doesn't throw an exception
sendAccessibilityEvent(context, 0, "Test")
sendAccessibilityEvent(context, "Test")
}
}
3 changes: 0 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@

<uses-permission android:name="android.permission.INTERNET" />

<!-- Needed for Android SDK 21+ -->
<uses-permission android:name="android.permission.WAKE_LOCK" />

<!-- Needed for Android SDK 28+ -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<!-- Needed for Android SDK 33+ -->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<application
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ class MainActivity :
setPackage(pkg)
}
@Suppress("QueryPermissionsNeeded")
packageManager.resolveActivity(browseIntent, PackageManager.MATCH_DEFAULT_ONLY) != null
packageManager.resolveActivity(
browseIntent,
PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY.toLong()),
) != null
}
}
5 changes: 0 additions & 5 deletions app/src/main/kotlin/ee/ria/DigiDoc/di/AppModules.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import ee.ria.DigiDoc.common.BuildVersionProvider
import ee.ria.DigiDoc.common.BuildVersionProviderImpl
import ee.ria.DigiDoc.common.certificate.CertificateService
import ee.ria.DigiDoc.configuration.deserializer.Cdoc2ConfDeserializer
import ee.ria.DigiDoc.configuration.provider.ConfigurationProvider
Expand Down Expand Up @@ -129,9 +127,6 @@ class AppModules {
@Singleton
fun provideCryptoInitialization(): CryptoInitialization = CryptoInitialization()

@Provides
fun provideBuildVersionProvider(): BuildVersionProvider = BuildVersionProviderImpl()

@Provides
@Singleton
fun provideActivityManager(): ActivityManager = ActivityManagerImpl()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.ui.theme.buttonRoundCornerShape
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
import ee.ria.DigiDoc.utils.snackbar.SnackbarType
Expand Down Expand Up @@ -132,7 +131,7 @@ fun DiagnosticsScreen(
enableOneTimeLogGeneration = false
diagnosticsViewModel.dataStore.setIsLogFileGenerationEnabled(false)
closeRestartConfirmationDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), settingValueChangeCancelled)
sendAccessibilityEvent(context, settingValueChangeCancelled)
}
val saveFileLauncher =
rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
Expand All @@ -155,7 +154,7 @@ fun DiagnosticsScreen(
diagnosticsViewModel.dataStore.setIsLogFileGenerationEnabled(false)
diagnosticsViewModel.dataStore.setIsLogFileGenerationRunning(false)
diagnosticsViewModel.resetLogs(context)
sendAccessibilityEvent(context, getAccessibilityEventType(), settingValueChanged)
sendAccessibilityEvent(context, settingValueChanged)
sharedSettingsViewModel.recreateActivity(true)
}
}
Expand Down Expand Up @@ -287,7 +286,6 @@ fun DiagnosticsScreen(
diagnosticsViewModel.resetLogs(context)
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
settingValueChanged,
)
sharedSettingsViewModel.recreateActivity(true)
Expand Down Expand Up @@ -628,7 +626,6 @@ fun DiagnosticsScreen(
closeRestartConfirmationDialog()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
settingValueChanged,
)
sharedSettingsViewModel.recreateActivity(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.invisibleElementHeight
import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.extensions.reachedBottom
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
Expand Down Expand Up @@ -173,7 +172,7 @@ fun EncryptRecipientScreen(
}
val dismissRemoveRecipientDialog = {
closeRecipientDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), recipientRemovalCancelled)
sendAccessibilityEvent(context, recipientRemovalCancelled)
}

val encryptViewModel: EncryptViewModel =
Expand Down Expand Up @@ -209,7 +208,6 @@ fun EncryptRecipientScreen(
.getContainerRecipientList(sharedContainerViewModel)
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
recipientAddedSuccessText,
)
encryptRecipientViewModel.handleIsRecipientAdded(false)
Expand All @@ -225,7 +223,6 @@ fun EncryptRecipientScreen(
containerEncryptedSuccess.value = true
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerEncryptedSuccessText,
)
delay(2000)
Expand Down Expand Up @@ -427,7 +424,7 @@ fun EncryptRecipientScreen(
}

closeRecipientDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), recipientRemoved)
sendAccessibilityEvent(context, recipientRemoved)
},
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.invisibleElementHeight
import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.extensions.reachedBottom
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
Expand Down Expand Up @@ -179,7 +178,7 @@ fun RecentDocumentsScreen(
}
val dismissRemoveDocumentDialog = {
closeDocumentDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), documentRemovalCancelled)
sendAccessibilityEvent(context, documentRemovalCancelled)
}

val listState = rememberLazyListState()
Expand Down Expand Up @@ -553,7 +552,7 @@ fun RecentDocumentsScreen(
recentDocumentList.value = recentDocumentsViewModel.getRecentDocumentList(fileOpeningMethod)
dismissSearch()
closeDocumentDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), documentRemoved)
sendAccessibilityEvent(context, documentRemoved)
},
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import ee.ria.DigiDoc.ui.component.shared.TopBar
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.viewmodel.shared.SharedMenuViewModel
import ee.ria.DigiDoc.viewmodel.shared.SharedSettingsViewModel
Expand Down Expand Up @@ -120,7 +119,6 @@ fun ThemeChooserScreen(
setThemeSetting(sharedSettingsViewModel, themeItem.setting)
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
themeChanged,
)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import androidx.navigation.NavHostController
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.component.shared.LoadingScreen
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
import ee.ria.DigiDoc.viewmodel.CryptoFileOpeningViewModel
Expand Down Expand Up @@ -135,7 +134,6 @@ fun CryptoFileOpeningNavigation(

sendAccessibilityEvent(
context,
getAccessibilityEventType(),
announcementText,
)
delay(1000)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.loadingBarSize
import ee.ria.DigiDoc.ui.theme.Dimensions.screenViewLargePadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.extensions.reachedBottom
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
Expand Down Expand Up @@ -196,7 +195,6 @@ fun EncryptNavigation(
closeRemoveFileDialog()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
fileRemovalCancelled,
)
}
Expand All @@ -212,7 +210,6 @@ fun EncryptNavigation(
openEditContainerNameDialog.value = false
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerNameChangeCancelled,
)
}
Expand Down Expand Up @@ -246,7 +243,6 @@ fun EncryptNavigation(
closeRecipientDialog()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
recipientRemovalCancelled,
)
}
Expand Down Expand Up @@ -446,7 +442,6 @@ fun EncryptNavigation(
containerEncryptedSuccess.value = true
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerEncryptedSuccessText,
)
delay(2000)
Expand Down Expand Up @@ -478,7 +473,7 @@ fun EncryptNavigation(
showRecipientsLoadingIndicator.value = false
val newTime = System.currentTimeMillis()
if (newTime >= (pastTime + 2 * 1000)) {
sendAccessibilityEvent(context, getAccessibilityEventType(), recipientsLoaded)
sendAccessibilityEvent(context, recipientsLoaded)
}
}
}
Expand Down Expand Up @@ -513,7 +508,6 @@ fun EncryptNavigation(
containerDecryptedSuccess.value = true
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerDecryptedSuccessText,
)
containerDecryptedSuccess.value = false
Expand All @@ -533,7 +527,6 @@ fun EncryptNavigation(
containerDecryptedSuccess.value = true
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerDecryptedSuccessText,
)
containerDecryptedSuccess.value = false
Expand Down Expand Up @@ -908,7 +901,6 @@ fun EncryptNavigation(
openEditContainerNameDialog.value = false
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
containerNameChanged,
)
},
Expand Down Expand Up @@ -972,7 +964,7 @@ fun EncryptNavigation(
}
}
closeRemoveFileDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), fileRemoved)
sendAccessibilityEvent(context, fileRemoved)
},
)
InvisibleElement(modifier = modifier)
Expand Down Expand Up @@ -1016,7 +1008,7 @@ fun EncryptNavigation(
)
}
closeRecipientDialog()
sendAccessibilityEvent(context, getAccessibilityEventType(), recipientRemoved)
sendAccessibilityEvent(context, recipientRemoved)
},
)
InvisibleElement(modifier = modifier)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import ee.ria.DigiDoc.ui.theme.BlueBackground
import ee.ria.DigiDoc.ui.theme.Dimensions.MPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utilsLib.locale.LocaleUtil.getLocale
import ee.ria.DigiDoc.viewmodel.shared.SharedSettingsViewModel
Expand Down Expand Up @@ -86,7 +85,6 @@ fun LanguageChoiceButtonGroup(
sharedSettingsViewModel.recreateActivity()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
languageChanged,
)
onClickAction()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.MPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeM
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.isTalkBackEnabled
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.extensions.notAccessible
Expand Down Expand Up @@ -269,7 +268,6 @@ fun MyEidPinScreen(
if (isTalkBackEnabled(context) && pinErrorText.value.isNotEmpty()) {
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
pinErrorText.value.lowercase(),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.theme.Dimensions.MSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.addInvisibleElement
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.isTalkBackEnabled
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.extensions.notAccessible
Expand Down Expand Up @@ -120,7 +119,7 @@ fun PrimaryTextField(

LaunchedEffect(errorText) {
if (errorText.isNotEmpty()) {
sendAccessibilityEvent(context, getAccessibilityEventType(), errorText)
sendAccessibilityEvent(context, errorText)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent

@OptIn(ExperimentalComposeUiApi::class)
Expand Down Expand Up @@ -75,7 +74,6 @@ fun RadioButtonItem(
onSelect()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
changedText,
)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import ee.ria.DigiDoc.common.model.FileOpeningMethod
import ee.ria.DigiDoc.ui.component.shared.LoadingScreen
import ee.ria.DigiDoc.ui.component.shared.dialog.SivaConfirmationDialog
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
import ee.ria.DigiDoc.utils.snackbar.SnackBarManager.showMessage
import ee.ria.DigiDoc.viewmodel.FileOpeningViewModel
Expand Down Expand Up @@ -210,7 +209,6 @@ fun FileOpeningNavigation(

sendAccessibilityEvent(
context,
getAccessibilityEventType(),
announcementText,
)
fileOpeningViewModel.resetFilesAdded()
Expand Down
Loading
Loading