feat: Implement forced logout on app restart and prioritize last logged public key in UnlockScreen
This commit is contained in:
@@ -93,9 +93,16 @@ fun UnlockScreen(
|
||||
)
|
||||
}
|
||||
|
||||
// Select account
|
||||
val targetPublicKey = selectedAccountId ?: accountManager.currentPublicKey.first()
|
||||
// Select account - prioritize: selectedAccountId > lastLoggedPublicKey > currentPublicKey > first account
|
||||
val lastLoggedKey = accountManager.getLastLoggedPublicKey()
|
||||
val currentKey = accountManager.currentPublicKey.first()
|
||||
val targetPublicKey = selectedAccountId ?: lastLoggedKey ?: currentKey
|
||||
|
||||
Log.d("UnlockScreen", "selectedAccountId=$selectedAccountId, lastLoggedKey=$lastLoggedKey, currentKey=$currentKey, targetPublicKey=$targetPublicKey")
|
||||
Log.d("UnlockScreen", "accounts=${accounts.map { it.publicKey }}")
|
||||
|
||||
selectedAccount = accounts.find { it.publicKey == targetPublicKey } ?: accounts.firstOrNull()
|
||||
Log.d("UnlockScreen", "selectedAccount=${selectedAccount?.publicKey}")
|
||||
}
|
||||
|
||||
// Filter accounts by search
|
||||
|
||||
Reference in New Issue
Block a user