Merge branch 'develop'

Jeff Yanta · Jeff Yanta · commit 3441c7e061d7 · 2024-06-12T16:29:37.000-04:00
diff --git a/app/src/main/java/com/getcode/util/Biometrics.kt b/app/src/main/java/com/getcode/util/Biometrics.kt
@@ -0,0 +1,81 @@
+package com.getcode.util
+
+import android.content.Context
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.fragment.app.FragmentActivity
+import com.getcode.R
+import kotlinx.coroutines.suspendCancellableCoroutine
+import timber.log.Timber
+import java.util.concurrent.Executors
+import kotlin.coroutines.resume
+
+class BiometricsException(
+    val error: BiometricsError,
+    private val messageString: CharSequence = ""
+) : Exception(Throwable("$messageString (${error.ordinal})")) {
+    override val message: String
+        get() = "${error.javaClass.simpleName} $messageString"
+
+    constructor(code: Int, message: CharSequence): this(BiometricsError.fromValue(code), message)
+}
+
+enum class BiometricsError {
+    Unknown, // BIOMETRICS_SUCCESS is 0 so using this
+    HardwareUnavailable,
+    UnableToProcess,
+    Timeout,
+    NoSpace,
+    Cancelled,
+    Lockout,
+    Vendor,
+    LockoutPermanent,
+    UserCancelled,
+    NoBiometrics,
+    HardwareNotPresent,
+    NegativeButton,
+    NoDeviceCredential;
+
+    companion object {
+        fun fromValue(code: Int): BiometricsError  {
+            return entries.toList().getOrNull(code - 1) ?: Unknown
+        }
+    }
+}
+
+object Biometrics {
+    suspend fun prompt(context: Context): Result<Unit> = suspendCancellableCoroutine { cont ->
+        val activity = context as FragmentActivity
+        val executor = Executors.newSingleThreadExecutor()
+        val biometricPrompt = BiometricPrompt(
+            activity,
+            executor,
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    Timber.d("Biometric Authentication successful")
+                    cont.resume(Result.success(Unit))
+                }
+
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                    val error = BiometricsException(errorCode, errString)
+                    Timber.e(t = error.cause, message = "onAuthenticationErrorForBiometrics")
+                    cont.resume(Result.failure(error))
+                }
+
+                override fun onAuthenticationFailed() {
+                    Timber.e("onAuthenticationFailedForBiometrics")
+                }
+            })
+
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle(context.getString(R.string.title_biometricAuthentication))
+            .setDescription(context.getString(R.string.description_biometricAuthentication))
+            .setAllowedAuthenticators(
+                BiometricManager.Authenticators.BIOMETRIC_STRONG
+                        or BiometricManager.Authenticators.DEVICE_CREDENTIAL
+            )
+            .build()
+
+        biometricPrompt.authenticate(promptInfo)
+    }
+}
diff --git a/app/src/main/java/com/getcode/util/Context.kt b/app/src/main/java/com/getcode/util/Context.kt
@@ -27,74 +27,3 @@ fun Context.shareDownloadLink() {
     val intent = IntentUtils.share(url)
     ContextCompat.startActivity(this, intent, null)
 }
-
-fun Context.biometricPrompt(
-    onSuccess: () -> Unit,
-    onError: (BiometricsException) -> Unit,
-) {
-    println("biometrics prompt")
-    val activity = this as FragmentActivity
-    val executor = Executors.newSingleThreadExecutor()
-    val biometricPrompt = BiometricPrompt(
-        activity,
-        executor,
-        object : BiometricPrompt.AuthenticationCallback() {
-            override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-                Timber.d("Biometric Authentication successful")
-                onSuccess()
-            }
-
-            override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                val error = BiometricsException(errorCode, errString)
-                Timber.e(t = error.cause, message = "onAuthenticationErrorForBiometrics")
-                onError(error)
-            }
-
-            override fun onAuthenticationFailed() {
-                Timber.e("onAuthenticationFailedForBiometrics")
-            }
-        })
-
-    val promptInfo = BiometricPrompt.PromptInfo.Builder()
-        .setTitle(getString(R.string.title_biometricAuthentication))
-        .setDescription(getString(R.string.description_biometricAuthentication))
-        .setNegativeButtonText(getString(R.string.action_cancel))
-        .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG)
-        .build()
-
-    biometricPrompt.authenticate(promptInfo)
-}
-
-
-class BiometricsException(
-    val error: BiometricsError,
-    private val messageString: CharSequence = ""
-) : Exception(Throwable("$messageString (${error.ordinal})")) {
-    override val message: String
-        get() = "${error.javaClass.simpleName} $messageString"
-
-    constructor(code: Int, message: CharSequence): this(BiometricsError.fromValue(code), message)
-}
-
-enum class BiometricsError {
-    Unknown, // BIOMETRICS_SUCCESS is 0 so using this
-    HardwareUnavailable,
-    UnableToProcess,
-    Timeout,
-    NoSpace,
-    Cancelled,
-    Lockout,
-    Vendor,
-    LockoutPermanent,
-    UserCancelled,
-    NoBiometrics,
-    HardwareNotPresent,
-    NegativeButton,
-    NoDeviceCredential;
-    
-    companion object {
-        fun fromValue(code: Int): BiometricsError  {
-            return entries.toList().getOrNull(code - 1) ?: Unknown
-        }
-    }
-}
diff --git a/app/src/main/java/com/getcode/view/main/home/HomeScan.kt b/app/src/main/java/com/getcode/view/main/home/HomeScan.kt
@@ -167,17 +167,18 @@ private fun HomeScan(
         mutableStateOf(requestPayload)
     }
 
-    LaunchedEffect(previewing, dataState.balance, deepLinkSaved, requestPayloadSaved) {
+    val biometricsState = LocalBiometricsState.current
+    LaunchedEffect(biometricsState, previewing, dataState.balance, deepLinkSaved, requestPayloadSaved) {
         if (previewing) {
             focusManager.clearFocus()
         }
 
-        if (!deepLinkSaved.isNullOrBlank()) {
+        if (biometricsState.passed && !deepLinkSaved.isNullOrBlank()) {
             homeViewModel.openCashLink(deepLink)
             deepLinkSaved = null
         }
 
-        if (!requestPayloadSaved.isNullOrBlank() && dataState.balance != null) {
+        if (biometricsState.passed && !requestPayloadSaved.isNullOrBlank() && dataState.balance != null) {
             delay(500.milliseconds)
             homeViewModel.handleRequest(requestPayload)
             requestPayloadSaved = null
diff --git a/app/src/main/java/com/getcode/view/main/home/components/BiometricsBlockingView.kt b/app/src/main/java/com/getcode/view/main/home/components/BiometricsBlockingView.kt
@@ -32,8 +32,9 @@ import com.getcode.R
 import com.getcode.theme.BrandOverlay
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.OnLifecycleEvent
+import com.getcode.util.Biometrics
 import com.getcode.util.BiometricsError
-import com.getcode.util.biometricPrompt
+import com.getcode.util.BiometricsException
 import timber.log.Timber
 
 @Composable
@@ -114,19 +115,21 @@ internal fun rememberBiometricsState(
 
     LaunchedEffect(checkBiometrics, requireBiometrics) {
         if (checkBiometrics && requireBiometrics == true) {
-            context.biometricPrompt(
-                onSuccess = {
-                    biometricsPassed = true
-                    checkBiometrics = false
-                },
-                onError = {
-                    if (it.error == BiometricsError.NoBiometrics) {
-                        Timber.e("missing biometrics")
-                        onBiometricsNotEnrolled()
+            Biometrics.prompt(context)
+                .onFailure {
+                    val error = it as? BiometricsException
+                    error?.let { exception ->
+                        if (exception.error == BiometricsError.NoBiometrics) {
+                            Timber.e("missing biometrics")
+                            onBiometricsNotEnrolled()
+                        }
                     }
                     checkBiometrics = false
                 }
-            )
+                .onSuccess {
+                    biometricsPassed = true
+                    checkBiometrics = false
+                }
         }
     }
 
diff --git a/app/src/main/java/com/getcode/view/main/home/components/CodeScanner.kt b/app/src/main/java/com/getcode/view/main/home/components/CodeScanner.kt
@@ -15,17 +15,21 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.asFlow
 import com.getcode.theme.CodeTheme
+import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.utils.AnimationUtils
 import com.getcode.utils.trace
 import com.kik.kikx.kikcodes.implementation.KikCodeAnalyzer
@@ -35,6 +39,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.util.concurrent.Executors
@@ -77,12 +82,23 @@ fun CodeScanner(
         KikCodeAnalyzer(scanner, onCodeScanned)
     }
 
+    val scope = rememberCoroutineScope()
     LaunchedEffect(scanner) {
         val cameraProvider = context.getCameraProvider()
         cameraProvider.unbindAll()
         cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
     }
 
+    OnLifecycleEvent { _, event ->
+        if (event == Lifecycle.Event.ON_STOP) {
+            scope.launch {
+                val cameraProvider = context.getCameraProvider()
+                cameraProvider.unbindAll()
+            }
+        }
+
+    }
+
     var streamState by remember(previewView) {
         mutableStateOf(PreviewView.StreamState.IDLE)
     }

Original file line number	Diff line number	Diff line change
`@@ -167,17 +167,18 @@ private fun HomeScan(`
`167`	`167`	`mutableStateOf(requestPayload)`
`168`	`168`	`}`
`169`	`169`
`170`		`- LaunchedEffect(previewing, dataState.balance, deepLinkSaved, requestPayloadSaved) {`
	`170`	`+ val biometricsState = LocalBiometricsState.current`
	`171`	`+ LaunchedEffect(biometricsState, previewing, dataState.balance, deepLinkSaved, requestPayloadSaved) {`
`171`	`172`	`if (previewing) {`
`172`	`173`	`focusManager.clearFocus()`
`173`	`174`	`}`
`174`	`175`
`175`		`- if (!deepLinkSaved.isNullOrBlank()) {`
	`176`	`+ if (biometricsState.passed && !deepLinkSaved.isNullOrBlank()) {`
`176`	`177`	`homeViewModel.openCashLink(deepLink)`
`177`	`178`	`deepLinkSaved = null`
`178`	`179`	`}`
`179`	`180`
`180`		`- if (!requestPayloadSaved.isNullOrBlank() && dataState.balance != null) {`
	`181`	`+ if (biometricsState.passed && !requestPayloadSaved.isNullOrBlank() && dataState.balance != null) {`
`181`	`182`	`delay(500.milliseconds)`
`182`	`183`	`homeViewModel.handleRequest(requestPayload)`
`183`	`184`	`requestPayloadSaved = null`