mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 03:01:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Start at LoginDetails page if logging in via intent (#772)

Browse source 
* Start at LoginDetails page if login via intent has data

* Ignore intent on re-creation
This commit is contained in:
Sunik Kupfer 2024-05-02 12:43:08 +02:00 committed by GitHub
parent aafcb2e94a
commit 9c6c95a249
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt
View file

@ -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(

4
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt
View file

@ -53,6 +53,10 @@ class LoginScreenModel @Inject constructor(
// navigation events
fun navToPage(toPage: Page) {
page = toPage
}
fun navToNextPage() {
when (page) {
Page.LoginType -> {