Skip to content

Commit 470c789

Browse files
SanderKondratjevNortalaarmam
authored andcommitted
NFC-50 Handle web-eid-mobile intent and skip file parsing in MainActivity
1 parent fb66fba commit 470c789

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,15 @@ class MainActivity :
120120

121121
val componentClassName = this.javaClass.name
122122

123-
val externalFileUris = getExternalFileUris(intent)
124123
val locale = dataStore.getLocale() ?: getLocale("en")
124+
val webEidUri = intent?.data?.takeIf { it.scheme == "web-eid-mobile" }
125+
126+
val externalFileUris = if (webEidUri != null) {
127+
listOf()
128+
} else {
129+
getExternalFileUris(intent)
130+
}
131+
125132
localeUtil.updateLocale(applicationContext, locale)
126133

127134
// Observe if activity needs to be recreated for changes to take effect (eg. Settings)
@@ -163,7 +170,10 @@ class MainActivity :
163170

164171
setContent {
165172
RIADigiDocTheme(darkTheme = useDarkMode) {
166-
RIADigiDocAppScreen(externalFileUris)
173+
RIADigiDocAppScreen(
174+
externalFileUris = externalFileUris,
175+
webEidUri = webEidUri
176+
)
167177
}
168178
}
169179
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import ee.ria.DigiDoc.viewmodel.shared.SharedSettingsViewModel
7575
import ee.ria.DigiDoc.viewmodel.shared.SharedSignatureViewModel
7676

7777
@Composable
78-
fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
78+
fun RIADigiDocAppScreen(externalFileUris: List<Uri>, webEidUri: Uri? = null) {
7979
val navController = rememberNavController()
8080
val sharedMenuViewModel: SharedMenuViewModel = hiltViewModel()
8181
val sharedContainerViewModel: SharedContainerViewModel = hiltViewModel()
@@ -383,6 +383,7 @@ fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
383383
@Composable
384384
fun RIADigiDocAppScreenPreview() {
385385
RIADigiDocTheme {
386-
RIADigiDocAppScreen(listOf())
386+
RIADigiDocAppScreen(listOf(),
387+
webEidUri = null)
387388
}
388389
}

0 commit comments

Comments
 (0)