Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main

2023-08-09 08:37:45 +00:00
parent e22ab2c94b f8cdda45aa
commit 33d480ed56
2 changed files with 16 additions and 40 deletions
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.kt
+++ b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.kt
@@ -507,20 +507,13 @@ class AutoCredentialViewModelTest {
        var challenge = CredentialModel.INVALID_CHALLENGE
        var callbackRunCount = 0

-        private var _callback: AutoCredentialViewModel.GenerateChallengeCallback? = null
-
-        override fun getCallback(): AutoCredentialViewModel.GenerateChallengeCallback? {
-            return _callback
-        }
-
-        override fun setCallback(callback: AutoCredentialViewModel.GenerateChallengeCallback?) {
-            _callback = callback
-        }
+        override var callback: AutoCredentialViewModel.GenerateChallengeCallback? = null

        override fun generateChallenge(userId: Int) {
-            val callback = _callback ?: return
-            callback.onChallengeGenerated(sensorId, this.userId, challenge)
-            ++callbackRunCount
+            callback?.let {
+                it.onChallengeGenerated(sensorId, this.userId, challenge)
+                ++callbackRunCount
+            }
        }
    }