Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-23 00:57:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

only refresh when lifecycle state is resumed

Browse Source
This commit is contained in:
Adam Velebil 2023-01-13 10:11:14 +01:00
parent 5e0f316827
commit 2cc3ede286
No known key found for this signature in database
GPG Key ID: C9B1E4A3CBBD2E10
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
android/app/src/main/kotlin/com/yubico/authenticator/oath/OathManager.kt
View File

@ -19,6 +19,7 @@ package com.yubico.authenticator.oath
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import com.yubico.authenticator.* import com.yubico.authenticator.*
@ -144,11 +145,22 @@ class OathManager(
if (expirations.isNotEmpty()) { if (expirations.isNotEmpty()) {
val earliest = expirations.min() * 1000 val earliest = expirations.min() * 1000
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
refreshJob = coroutineScope.launch { refreshJob = coroutineScope.launch {
if (earliest > now) { val delayMs = earliest - now
delay(earliest - now) Log.d(TAG, "Will execute refresh in ${delayMs}ms")
if (delayMs > 0) {
delay(delayMs)
}
val currentState = lifecycleOwner.lifecycle.currentState
if (currentState.isAtLeast(Lifecycle.State.RESUMED)) {
requestRefresh()
} else {
Log.d(
TAG,
"Cannot run credential refresh in current lifecycle state: $currentState"
)
} }
requestRefresh()
} }
} }
} }
@ -448,7 +460,7 @@ class OathManager(
oathViewModel.updateCredentials( oathViewModel.updateCredentials(
calculateOathCodes(session).model(session.deviceId) calculateOathCodes(session).model(session.deviceId)
) )
} catch(apduException: ApduException) { } catch (apduException: ApduException) {
if (apduException.sw == SW.SECURITY_CONDITION_NOT_SATISFIED) { if (apduException.sw == SW.SECURITY_CONDITION_NOT_SATISFIED) {
Log.d(TAG, "Handled oath credential refresh on locked session.") Log.d(TAG, "Handled oath credential refresh on locked session.")
oathViewModel.setSessionState(session.model(keyManager.isRemembered(session.deviceId))) oathViewModel.setSessionState(session.model(keyManager.isRemembered(session.deviceId)))
@ -502,7 +514,7 @@ class OathManager(
// is that the user did not touch the key // is that the user did not touch the key
throw CancellationException() throw CancellationException()
} }
throw apduException throw apduException
} }
} }