Improved navigation to home screen
This commit is contained in:
@ -260,7 +260,9 @@ class MainActivity : ComponentActivity() {
|
|||||||
navController.navigate(route)
|
navController.navigate(route)
|
||||||
}
|
}
|
||||||
is NavigationCommand.NavigateToHome -> {
|
is NavigationCommand.NavigateToHome -> {
|
||||||
navController.navigate("main")
|
navController.navigate("main") {
|
||||||
|
popUpTo("main") { inclusive = true }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2603,6 +2603,7 @@ fun handleIntent(ctx: Context, viewModel: ViewModel, intent: Intent, action: Str
|
|||||||
Log.w(TAG, "handleIntent 'call' did not find ua $uap")
|
Log.w(TAG, "handleIntent 'call' did not find ua $uap")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
viewModel.navigateToHome()
|
||||||
viewModel.dialerState.callUri.value = intent.getStringExtra("peer")!!
|
viewModel.dialerState.callUri.value = intent.getStringExtra("peer")!!
|
||||||
spinToAor(viewModel, ua.account.aor)
|
spinToAor(viewModel, ua.account.aor)
|
||||||
if (ev[0] == "call") {
|
if (ev[0] == "call") {
|
||||||
@ -2617,6 +2618,7 @@ fun handleIntent(ctx: Context, viewModel: ViewModel, intent: Intent, action: Str
|
|||||||
Log.w(TAG, "handleIntent '$action' did not find call $callp")
|
Log.w(TAG, "handleIntent '$action' did not find call $callp")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
viewModel.navigateToHome()
|
||||||
val ua = call.ua
|
val ua = call.ua
|
||||||
spinToAor(viewModel, ua.account.aor, call)
|
spinToAor(viewModel, ua.account.aor, call)
|
||||||
if (ev[0] == "call answer")
|
if (ev[0] == "call answer")
|
||||||
|
|||||||
Reference in New Issue
Block a user