mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-15 07:47:37 +00:00
Start at LoginDetails page if logging in via intent (#772)
* Start at LoginDetails page if login via intent has data * Ignore intent on re-creation
This commit is contained in:
parent
aafcb2e94a
commit
9c6c95a249
|
@ -109,7 +109,13 @@ class LoginActivity @Inject constructor(): AppCompatActivity() {
|
|||
super.onCreate(savedInstanceState)
|
||||
|
||||
// start with login info from Intent
|
||||
model.updateLoginInfo(loginInfoFromIntent(intent))
|
||||
if (savedInstanceState == null) {
|
||||
val loginInfo = loginInfoFromIntent(intent)
|
||||
if (loginInfo.baseUri != null) {
|
||||
model.updateLoginInfo(loginInfo)
|
||||
model.navToPage(LoginScreenModel.Page.LoginDetails)
|
||||
}
|
||||
}
|
||||
|
||||
setContent {
|
||||
LoginScreen(
|
||||
|
|
|
@ -53,6 +53,10 @@ class LoginScreenModel @Inject constructor(
|
|||
|
||||
// navigation events
|
||||
|
||||
fun navToPage(toPage: Page) {
|
||||
page = toPage
|
||||
}
|
||||
|
||||
fun navToNextPage() {
|
||||
when (page) {
|
||||
Page.LoginType -> {
|
||||
|
|
Loading…
Reference in a new issue