mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-06 03:18:23 +00:00
Improve navigation logic for external requests in MainScreen
- Ensure `localRoute` defaults to `Route.IncomingRequest.route` when `isExternalRequest` is true. - Update `LaunchedEffect` to prioritize routing to the incoming request screen when an external request is detected.
This commit is contained in:
@@ -209,10 +209,20 @@ fun MainScreen(
|
||||
)
|
||||
}
|
||||
|
||||
var localRoute by remember { mutableStateOf(route.value ?: if (intents.isEmpty() && bunkerRequests.isEmpty()) Route.Applications.route else Route.IncomingRequest.route) }
|
||||
LaunchedEffect(Unit, route.value, intents, bunkerRequests) {
|
||||
var localRoute by remember {
|
||||
mutableStateOf(
|
||||
if (isExternalRequest) {
|
||||
Route.IncomingRequest.route
|
||||
} else {
|
||||
route.value ?: if (intents.isEmpty() && bunkerRequests.isEmpty()) Route.Applications.route else Route.IncomingRequest.route
|
||||
}
|
||||
)
|
||||
}
|
||||
LaunchedEffect(Unit, route.value, intents, bunkerRequests, isExternalRequest) {
|
||||
launch(Dispatchers.Main) {
|
||||
if (route.value != null) {
|
||||
if (isExternalRequest) {
|
||||
localRoute = Route.IncomingRequest.route
|
||||
} else if (route.value != null) {
|
||||
localRoute = route.value!!
|
||||
route.value = null
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user