From 166dc46c2447abfd1214161f9f9574c5a2cea427 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 23 Feb 2020 17:00:57 -0800 Subject: Remove koincomponent from BiometricUtils --- .../main/kotlin/com/pitchedapps/frost/utils/BiometricUtils.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/BiometricUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/BiometricUtils.kt index 5a157a36..a7fb3b2d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/BiometricUtils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/BiometricUtils.kt @@ -39,13 +39,11 @@ typealias BiometricDeferred = CompletableDeferred * Container for [BiometricPrompt] * Inspired by coroutine's CommonPool */ -object BiometricUtils : KoinComponent { +object BiometricUtils { private val executor: Executor get() = pool ?: getOrCreatePoolSync() - private val prefs: Prefs by inject() - @Volatile private var pool: ExecutorService? = null @@ -68,7 +66,7 @@ object BiometricUtils : KoinComponent { private fun getOrCreatePoolSync(): Executor = pool ?: Executors.newSingleThreadExecutor().also { pool = it } - private fun shouldPrompt(context: Context): Boolean { + private fun shouldPrompt(context: Context, prefs: Prefs): Boolean { return prefs.biometricsEnabled && System.currentTimeMillis() - lastUnlockTime > UNLOCK_TIME_INTERVAL } @@ -77,9 +75,9 @@ object BiometricUtils : KoinComponent { * Note that the underlying request will call [androidx.fragment.app.FragmentTransaction.commit], * so this cannot happen after onSaveInstanceState. */ - fun authenticate(activity: FragmentActivity, force: Boolean = false): BiometricDeferred { + fun authenticate(activity: FragmentActivity, prefs: Prefs, force: Boolean = false): BiometricDeferred { val deferred: BiometricDeferred = CompletableDeferred() - if (!force && !shouldPrompt(activity)) { + if (!force && !shouldPrompt(activity, prefs)) { deferred.complete(null) return deferred } -- cgit v1.2.3