Moves onCreate intent evaluation to the App Navigation

This commit is contained in:
Vitor Pamplona
2023-08-02 13:29:04 -04:00
parent c53b1571a3
commit 6cbee81e72
2 changed files with 4 additions and 6 deletions
@@ -56,9 +56,6 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val uri = intent?.data?.toString()
val startingPage = uriToRoute(uri)
LocalPreferences.migrateSingleUserPrefs() LocalPreferences.migrateSingleUserPrefs()
val language = LocalPreferences.getPreferredLanguage() val language = LocalPreferences.getPreferredLanguage()
if (language.isNotBlank()) { if (language.isNotBlank()) {
@@ -65,7 +65,6 @@ fun AppNavigation(
navController: NavHostController, navController: NavHostController,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
startingPage: String? = null,
themeViewModel: ThemeViewModel themeViewModel: ThemeViewModel
) { ) {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
@@ -250,7 +249,10 @@ fun AppNavigation(
} }
} }
var actionableNextPage by remember { mutableStateOf(startingPage) } val activity = LocalContext.current.getActivity()
var actionableNextPage by remember {
mutableStateOf(uriToRoute(activity.intent?.data?.toString()?.ifBlank { null }))
}
actionableNextPage?.let { actionableNextPage?.let {
LaunchedEffect(it) { LaunchedEffect(it) {
navController.navigate(it) { navController.navigate(it) {
@@ -261,7 +263,6 @@ fun AppNavigation(
actionableNextPage = null actionableNextPage = null
} }
val activity = LocalContext.current.getActivity()
DisposableEffect(navController) { DisposableEffect(navController) {
val consumer = Consumer<Intent> { intent -> val consumer = Consumer<Intent> { intent ->
val uri = intent?.data?.toString() val uri = intent?.data?.toString()