Merge branch 'develop'

Jeff Yanta · Jeff Yanta · commit 05796d9befe5 · 2024-06-18T15:23:55.000-04:00
diff --git a/api/src/main/java/com/getcode/model/Limits.kt b/api/src/main/java/com/getcode/model/Limits.kt
@@ -49,9 +49,6 @@ data class Limits(
             val sends = sendLimits
                 .mapNotNull { (k, v) ->
                     val code = CurrencyCode.tryValueOf(k) ?: return@mapNotNull null
-                    if (code == CurrencyCode.USD) {
-                        println("limit=${v.maxPerDay.toDouble()}")
-                    }
                     val limit = SendLimit(
                         nextTransaction = v.nextTransaction.toDouble(),
                         maxPerDay = v.maxPerDay.toDouble(),
diff --git a/app/src/main/java/com/getcode/CodeApp.kt b/app/src/main/java/com/getcode/CodeApp.kt
@@ -46,6 +46,7 @@ import com.getcode.ui.components.TopBarContainer
 import com.getcode.ui.utils.getActivity
 import com.getcode.ui.utils.getActivityScopedViewModel
 import com.getcode.ui.utils.measured
+import com.getcode.util.BiometricsError
 import com.getcode.view.main.home.components.BiometricsBlockingView
 import com.getcode.view.main.home.components.rememberBiometricsState
 import dev.bmcreations.tipkit.TipScaffold
@@ -58,7 +59,11 @@ fun CodeApp(tipsEngine: TipsEngine) {
     val activity = LocalContext.current.getActivity()
     val biometricsState = rememberBiometricsState(
         requireBiometrics = state.requireBiometrics,
-        onBiometricsNotEnrolled = { tlvm.onMissingBiometrics() }
+        onError = { error ->
+            if (error == BiometricsError.NoBiometrics) {
+                tlvm.onMissingBiometrics()
+            }
+        }
     )
 
     OnLifecycleEvent { _, event ->
diff --git a/app/src/main/java/com/getcode/ui/tips/definitions/DownloadCodeTip.kt b/app/src/main/java/com/getcode/ui/tips/definitions/DownloadCodeTip.kt
@@ -52,7 +52,6 @@ class DownloadCodeTip @Inject constructor(
             { homeOpenCount >= 1 },
             {
                 val accountCreatedAtMillis = SessionManager.getOrganizer()?.createdAtMillis
-                println("millis=$accountCreatedAtMillis")
                 val millis = accountCreatedAtMillis ?: return@listOf false
                 val createdAt = Instant.fromEpochMilliseconds(millis)
                 createdAt.plus(1.days) < now
diff --git a/app/src/main/java/com/getcode/util/Biometrics.kt b/app/src/main/java/com/getcode/util/Biometrics.kt
@@ -3,8 +3,12 @@ package com.getcode.util
 import android.content.Context
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.fragment.app.FragmentActivity
 import com.getcode.R
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
 import timber.log.Timber
 import java.util.concurrent.Executors
@@ -44,38 +48,49 @@ enum class BiometricsError {
 }
 
 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))
-                }
+    var promptActive by mutableStateOf(false)
+        private set
 
-                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                    val error = BiometricsException(errorCode, errString)
-                    Timber.e(t = error.cause, message = "onAuthenticationErrorForBiometrics")
-                    cont.resume(Result.failure(error))
-                }
+    suspend fun prompt(
+        context: Context,
+        delay: Long = 0L,
+        authenticators: Int = BiometricManager.Authenticators.BIOMETRIC_WEAK
+                or BiometricManager.Authenticators.DEVICE_CREDENTIAL,
+    ): Result<Unit> {
+        promptActive = true
+        delay(delay)
+        return 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")
+                        promptActive = false
+                        cont.resume(Result.success(Unit))
+                    }
 
-                override fun onAuthenticationFailed() {
-                    Timber.e("onAuthenticationFailedForBiometrics")
-                }
-            })
+                    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                        val error = BiometricsException(errorCode, errString)
+                        Timber.e(t = error.cause, message = "onAuthenticationErrorForBiometrics")
+                        promptActive = false
+                        cont.resume(Result.failure(error))
+                    }
 
-        val promptInfo = BiometricPrompt.PromptInfo.Builder()
-            .setTitle(context.getString(R.string.title_biometricAuthentication))
-            .setDescription(context.getString(R.string.description_biometricAuthentication))
-            .setAllowedAuthenticators(
-                BiometricManager.Authenticators.BIOMETRIC_WEAK
-                        or BiometricManager.Authenticators.DEVICE_CREDENTIAL
-            )
-            .build()
+                    override fun onAuthenticationFailed() {
+                        Timber.e("onAuthenticationFailedForBiometrics")
+                    }
+                })
 
-        biometricPrompt.authenticate(promptInfo)
+            val promptInfo = BiometricPrompt.PromptInfo.Builder()
+                .setTitle(context.getString(R.string.title_biometricAuthentication))
+                .setDescription(context.getString(R.string.description_biometricAuthentication))
+                .setAllowedAuthenticators(authenticators)
+                .build()
+
+            biometricPrompt.authenticate(promptInfo)
+        }
     }
 }
diff --git a/app/src/main/java/com/getcode/view/main/account/AppSettingsScreen.kt b/app/src/main/java/com/getcode/view/main/account/AppSettingsScreen.kt
@@ -4,15 +4,22 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 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.res.stringResource
+import com.getcode.LocalBiometricsState
+import com.getcode.model.AppSetting
 import com.getcode.model.PrefsBool
 import com.getcode.ui.components.SettingsRow
 import com.getcode.util.Biometrics
+import com.getcode.view.main.home.components.rememberBiometricsState
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -45,7 +52,7 @@ fun AppSettingsScreen(
                         PrefsBool.CAMERA_START_BY_DEFAULT -> toggle()
                         PrefsBool.REQUIRE_BIOMETRICS -> {
                             scope.launch {
-                                Biometrics.prompt(context)
+                                Biometrics.prompt(context, delay = 300)
                                     .onSuccess { toggle() }
                             }
                         }
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
@@ -157,6 +157,10 @@ private fun HomeScan(
         mutableStateOf(false)
     }
 
+    var cameraStarted by remember {
+        mutableStateOf(dataState.autoStartCamera == true)
+    }
+
     val focusManager = LocalFocusManager.current
 
     var deepLinkSaved by remember(deepLink) {
@@ -202,8 +206,10 @@ private fun HomeScan(
         navigator = navigator,
         isPaused = isPaused,
         isCameraReady = previewing,
+        isCameraStarted = cameraStarted,
         dataState = dataState,
         homeViewModel = homeViewModel,
+        onStartCamera = { cameraStarted = true },
         scannerView = {
             CodeScanner(
                 scanningEnabled = previewing,
@@ -227,6 +233,9 @@ private fun HomeScan(
 
             Lifecycle.Event.ON_STOP -> {
                 Timber.d("onStop")
+                if (dataState.autoStartCamera == false) {
+                    cameraStarted = false
+                }
             }
 
             Lifecycle.Event.ON_PAUSE -> {
@@ -272,10 +281,12 @@ private fun BillContainer(
     modifier: Modifier = Modifier,
     navigator: CodeNavigator,
     isCameraReady: Boolean,
+    isCameraStarted: Boolean,
     isPaused: Boolean,
     dataState: HomeUiModel,
     homeViewModel: HomeViewModel,
     scannerView: @Composable () -> Unit,
+    onStartCamera: () -> Unit,
     showBottomSheet: (HomeBottomSheet) -> Unit,
 ) {
     val onPermissionResult =
@@ -308,9 +319,9 @@ private fun BillContainer(
             dataState.isCameraPermissionGranted == true || dataState.isCameraPermissionGranted == null -> {
                 if (dataState.autoStartCamera == null) {
                     // waiting for result
-                } else if (!dataState.autoStartCamera) {
+                } else if (!dataState.autoStartCamera && !isCameraStarted) {
                     CameraDisabledView(modifier = Modifier.fillMaxSize()) {
-                        homeViewModel.onStartCamera()
+                        onStartCamera()
                     }
                 } else {
                     scannerView()
diff --git a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt
@@ -381,10 +381,6 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-    fun onStartCamera() {
-        uiFlow.update { it.copy(autoStartCamera = true) }
-    }
-
     fun onCameraPermissionChanged(isGranted: Boolean) {
         uiFlow.update { it.copy(isCameraPermissionGranted = isGranted) }
     }
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
@@ -64,13 +64,14 @@ data class BiometricsState(
     val passed: Boolean = false,
     val request: () -> Unit = { },
 ) {
-    val isAwaitingAuthentication = checking || !passed
+    val isAwaitingAuthentication: Boolean
+        get() = checking || !passed
 }
 
 @Composable
 internal fun rememberBiometricsState(
     requireBiometrics: Boolean?,
-    onBiometricsNotEnrolled: () -> Unit,
+    onError: (BiometricsError) -> Unit = { },
 ): BiometricsState {
     val context = LocalContext.current
 
@@ -92,11 +93,9 @@ internal fun rememberBiometricsState(
                 .onFailure {
                     val error = it as? BiometricsException
                     error?.let { exception ->
-                        if (exception.error == BiometricsError.NoBiometrics) {
-                            Timber.e("missing biometrics")
-                            onBiometricsNotEnrolled()
-                        }
+                        onError(exception.error)
                     }
+                    biometricsPassed = false
                     checkBiometrics = false
                 }
                 .onSuccess {
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
@@ -28,9 +28,11 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.asFlow
+import com.getcode.LocalBiometricsState
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.utils.AnimationUtils
+import com.getcode.util.Biometrics
 import com.getcode.utils.trace
 import com.kik.kikx.kikcodes.implementation.KikCodeAnalyzer
 import com.kik.kikx.kikcodes.implementation.KikCodeScannerImpl
@@ -86,12 +88,19 @@ fun CodeScanner(
         mutableStateOf(false)
     }
 
+    val biometricsState = LocalBiometricsState.current
+
     val scope = rememberCoroutineScope()
-    LaunchedEffect(scanner) {
+    LaunchedEffect(scanner, biometricsState.isAwaitingAuthentication, Biometrics.promptActive) {
+        val active = Biometrics.promptActive || biometricsState.isAwaitingAuthentication
         val cameraProvider = context.getCameraProvider()
-        cameraProvider.unbindAll()
-        cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
-        bound = true
+        if (!active) {
+            cameraProvider.unbindAll()
+            cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
+            bound = true
+        } else {
+            cameraProvider.unbindAll()
+        }
     }
 
     OnLifecycleEvent { _, event ->
@@ -104,15 +113,17 @@ fun CodeScanner(
         } else if (event == Lifecycle.Event.ON_RESUME) {
             scope.launch {
                 if (!bound) {
-                    val cameraProvider = context.getCameraProvider()
-                    cameraProvider.unbindAll()
-                    cameraProvider.bindToLifecycle(
-                        lifecycleOwner,
-                        cameraSelector,
-                        preview,
-                        imageAnalysis
-                    )
-                    bound = true
+                    if (!biometricsState.isAwaitingAuthentication) {
+                        val cameraProvider = context.getCameraProvider()
+                        cameraProvider.unbindAll()
+                        cameraProvider.bindToLifecycle(
+                            lifecycleOwner,
+                            cameraSelector,
+                            preview,
+                            imageAnalysis
+                        )
+                        bound = true
+                    }
                 }
             }
         }
diff --git a/vendor/tipkit/tipkit/src/main/kotlin/dev/bmcreations/tipkit/Tip.kt b/vendor/tipkit/tipkit/src/main/kotlin/dev/bmcreations/tipkit/Tip.kt
@@ -78,7 +78,6 @@ abstract class Tip(
      * for display.
      */
     suspend fun show(): Boolean {
-        println("show tip?")
         return criteria().all { it() }
     }
 
diff --git a/vendor/tipkit/tipkit/src/main/kotlin/dev/bmcreations/tipkit/engines/EventEngine.kt b/vendor/tipkit/tipkit/src/main/kotlin/dev/bmcreations/tipkit/engines/EventEngine.kt
@@ -37,7 +37,6 @@ class EventEngine(
     internal fun clearCompletions() {
         dataScope.launch {
             completions.edit { it.clear() }
-            println("clearCompletions")
         }
     }
 
@@ -55,7 +54,6 @@ class EventEngine(
     internal fun removeAllOccurrences() {
         dataScope.launch {
             occurrenceInstances.edit { it.clear() }
-            println("removeAllOccurrences")
         }
     }
 
@@ -229,10 +227,9 @@ class EventEngine(
     }
 
     suspend fun isComplete(name: String): Boolean {
-        println("checking $name")
-        return (completions.data.map { prefs ->
+        return completions.data.map { prefs ->
             prefs[longPreferencesKey("$name-completedAt")]
-        }.firstOrNull() != null).also { println("seen=$it") }
+        }.firstOrNull() != null
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ class DownloadCodeTip @Inject constructor(`
`52`	`52`	`{ homeOpenCount >= 1 },`
`53`	`53`	`{`
`54`	`54`	`val accountCreatedAtMillis = SessionManager.getOrganizer()?.createdAtMillis`
`55`		`- println("millis=$accountCreatedAtMillis")`
`56`	`55`	`val millis = accountCreatedAtMillis ?: return@listOf false`
`57`	`56`	`val createdAt = Instant.fromEpochMilliseconds(millis)`
`58`	`57`	`createdAt.plus(1.days) < now`
Original file line number	Diff line number	Diff line change
`@@ -381,10 +381,6 @@ class HomeViewModel @Inject constructor(`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`
`384`		`- fun onStartCamera() {`
`385`		`- uiFlow.update { it.copy(autoStartCamera = true) }`
`386`		`- }`
`387`		`-`
`388`	`384`	`fun onCameraPermissionChanged(isGranted: Boolean) {`
`389`	`385`	`uiFlow.update { it.copy(isCameraPermissionGranted = isGranted) }`
`390`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ abstract class Tip(`
`78`	`78`	`* for display.`
`79`	`79`	`*/`
`80`	`80`	`suspend fun show(): Boolean {`
`81`		`- println("show tip?")`
`82`	`81`	`return criteria().all { it() }`
`83`	`82`	`}`
`84`	`83`