chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

fix relogin bug (#2609)

Browse source 
* fix relogin bug

* fix ktlint
This commit is contained in:
Konrad Pozniak 2022-07-05 18:18:12 +02:00 committed by GitHub
parent e91c750cb0
commit a8a97b6834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt
View file

@ -72,14 +72,18 @@ class AccountManager @Inject constructor(db: AppDatabase) {
accountDao.insertOrReplace(it) accountDao.insertOrReplace(it)
} }
// check if this is a relogin with an existing account, if yes update it, otherwise create a new one // check if this is a relogin with an existing account, if yes update it, otherwise create a new one
val newAccountEntity = accounts.find { account -> val existingAccountIndex = accounts.indexOfFirst { account ->
domain == account.domain && newAccount.id == account.accountId domain == account.domain && newAccount.id == account.accountId
}?.copy( }
accessToken = accessToken, val newAccountEntity = if (existingAccountIndex != -1) {
clientId = clientId, accounts[existingAccountIndex].copy(
clientSecret = clientSecret, accessToken = accessToken,
oauthScopes = oauthScopes clientId = clientId,
) ?: run { clientSecret = clientSecret,
oauthScopes = oauthScopes,
isActive = true
).also { accounts[existingAccountIndex] = it }
} else {
val maxAccountId = accounts.maxByOrNull { it.id }?.id ?: 0 val maxAccountId = accounts.maxByOrNull { it.id }?.id ?: 0
val newAccountId = maxAccountId + 1 val newAccountId = maxAccountId + 1
AccountEntity( AccountEntity(