AND-4784 Improved the biometrics feature initialization

tangem · Oct 4, 2023 · 0f449e2 · 0f449e2
1 parent 3e21a68
commit 0f449e2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/tangem-sdk-android-demo/src/main/java/com/tangem/demo/DemoActivity.kt b/tangem-sdk-android-demo/src/main/java/com/tangem/demo/DemoActivity.kt
@@ -24,7 +24,7 @@ import com.tangem.sdk.DefaultSessionViewDelegate
 import com.tangem.sdk.extensions.createLogger
 import com.tangem.sdk.extensions.getWordlist
 import com.tangem.sdk.extensions.initBiometricManager
-import com.tangem.sdk.extensions.initCryptographyManager
+import com.tangem.sdk.extensions.initKeystoreManager
 import com.tangem.sdk.extensions.initNfcManager
 import com.tangem.sdk.storage.create
 import com.tangem.tangem_demo.R
@@ -100,7 +100,7 @@ class DemoActivity : AppCompatActivity() {
             wordlist = Wordlist.getWordlist(this),
             config = config,
             authenticationManager = authenticationManager,
-            keystoreManager = TangemSdk.initCryptographyManager(authenticationManager, secureStorage),
+            keystoreManager = TangemSdk.initKeystoreManager(authenticationManager, secureStorage),
         )
     }
 

diff --git a/...m-sdk-android/src/main/java/com/tangem/sdk/authentication/AndroidAuthenticationManager.kt b/...m-sdk-android/src/main/java/com/tangem/sdk/authentication/AndroidAuthenticationManager.kt
@@ -13,6 +13,9 @@ import com.tangem.common.core.TangemError
 import com.tangem.common.core.TangemSdkError
 import com.tangem.sdk.R
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
@@ -37,18 +40,24 @@ internal class AndroidAuthenticationManager(
     }
 
     private val authenticationMutex = Mutex()
+    private val canAuthenticateInternal: MutableStateFlow<Boolean?> = MutableStateFlow(value = null)
+    private val needEnrollBiometricsInternal: MutableStateFlow<Boolean?> = MutableStateFlow(value = null)
 
-    override var canAuthenticate: Boolean = false
-        private set
-    override var canEnrollBiometrics: Boolean = false
-        private set
+    override val canAuthenticate: Boolean
+        get() = requireNotNull(canAuthenticateInternal.value) {
+            "`canAuthenticate` has not been initialized"
+        }
+    override val needEnrollBiometrics: Boolean
+        get() = requireNotNull(needEnrollBiometricsInternal.value) {
+            "`needEnrollBiometrics` has not been initialized"
+        }
 
     override fun onResume(owner: LifecycleOwner) {
-        owner.lifecycleScope.launch(Dispatchers.Main) {
+        owner.lifecycleScope.launch {
             val (available, canBeEnrolled) = checkBiometricsAvailabilityStatus()
 
-            canAuthenticate = available
-            canEnrollBiometrics = canBeEnrolled
+            canAuthenticateInternal.value = available
+            needEnrollBiometricsInternal.value = canBeEnrolled
         }
     }
 
@@ -60,6 +69,7 @@ internal class AndroidAuthenticationManager(
         authenticationMutex.withLock {
             Log.debug { "$TAG - Trying to authenticate a user" }
 
+            val canAuthenticate = canAuthenticateInternal.filterNotNull().first()
             if (canAuthenticate) {
                 withContext(Dispatchers.Main) {
                     authenticateInternal()

diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/extensions/TangemSdk.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/extensions/TangemSdk.kt
@@ -56,8 +56,8 @@ fun TangemSdk.Companion.initWithBiometrics(activity: FragmentActivity, config: C
         reader = nfcManager.reader,
         viewDelegate = viewDelegate,
         secureStorage = secureStorage,
-        authenticationManager = initBiometricManager(activity),
-        keystoreManager = initCryptographyManager(authenticationManager, secureStorage),
+        authenticationManager = authenticationManager,
+        keystoreManager = initKeystoreManager(authenticationManager, secureStorage),
         wordlist = Wordlist.getWordlist(activity),
         config = config,
     )
@@ -122,7 +122,7 @@ fun TangemSdk.Companion.initBiometricManager(activity: FragmentActivity): Authen
     }
 }
 
-fun TangemSdk.Companion.initCryptographyManager(
+fun TangemSdk.Companion.initKeystoreManager(
     authenticationManager: AuthenticationManager,
     secureStorage: SecureStorage,
 ): KeystoreManager {

diff --git a/tangem-sdk-core/src/main/java/com/tangem/common/authentication/AuthenticationManager.kt b/tangem-sdk-core/src/main/java/com/tangem/common/authentication/AuthenticationManager.kt
@@ -17,7 +17,7 @@ interface AuthenticationManager {
      * Checks if biometrics can be enrolled. Returns `true` if the hardware is available
      * but there is no biometric data enrolled.
      */
-    val canEnrollBiometrics: Boolean
+    val needEnrollBiometrics: Boolean
 
     /**
      * Initiates the authentication process. Depending on the implementation,

diff --git a/tangem-sdk-core/src/main/java/com/tangem/common/authentication/DummyAuthenticationManager.kt b/tangem-sdk-core/src/main/java/com/tangem/common/authentication/DummyAuthenticationManager.kt
@@ -4,7 +4,7 @@ class DummyAuthenticationManager : AuthenticationManager {
     override val canAuthenticate: Boolean
         get() = false
 
-    override val canEnrollBiometrics: Boolean
+    override val needEnrollBiometrics: Boolean
         get() = false
 
     override suspend fun authenticate() = Unit