FIX: Solves BBug-3 Issue (#25)

isaacsa51 · Sep 13, 2024 · fcfae16 · fcfae16
1 parent 6ba3c17
commit fcfae16
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/app/src/main/java/com/serranoie/android/buybuddy/ui/settings/SettingsScreen.kt b/app/src/main/java/com/serranoie/android/buybuddy/ui/settings/SettingsScreen.kt
@@ -1,5 +1,6 @@
 package com.serranoie.android.buybuddy.ui.settings
 
+import android.content.Context
 import android.os.Build
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -91,7 +92,7 @@ fun SettingsScreen(navController: NavController, userEventsTracker: UserEventsTr
         ) {
             item { DisplaySettings(viewModel = viewModel, userEventsTracker) }
 
-            item { BehaviourSettings(viewModel = viewModel, userEventsTracker) }
+            item { BehaviourSettings(viewModel = viewModel, userEventsTracker, context = context) }
 
             item { InfoSettings(navController = navController, userEventsTracker) }
 
@@ -201,8 +202,11 @@ fun InfoSettings(navController: NavController, userEventsTracker: UserEventsTrac
 }
 
 @Composable
-fun BehaviourSettings(viewModel: SettingsViewModel, userEventsTracker: UserEventsTracker) {
-
+fun BehaviourSettings(
+    viewModel: SettingsViewModel,
+    userEventsTracker: UserEventsTracker,
+    context: Context
+) {
     val categoryVisibilityValue =
         remember { mutableStateOf(viewModel.getCategoryVisibilityValue()) }
 
@@ -222,14 +226,19 @@ fun BehaviourSettings(viewModel: SettingsViewModel, userEventsTracker: UserEvent
             }
         )
 
-        SettingsItemSwitch(title = stringResource(R.string.security_app_lock),
+        SettingsItemSwitch(
+            title = stringResource(R.string.security_app_lock),
             description = stringResource(R.string.app_lock_setting_desc),
             icon = Icons.Rounded.Lock,
             switchState = appLockValue,
             onCheckChange = { newValue ->
-                userEventsTracker.logButtonAction("app_lock_toggle: $newValue")
-                appLockValue.value = newValue
-                viewModel.setAppLock(newValue)
+                if (viewModel.isBiometricAvailable(context)) {
+                    userEventsTracker.logButtonAction("app_lock_toggle: $newValue")
+                    appLockValue.value = newValue
+                    viewModel.setAppLock(newValue)
+                } else {
+                    context.getString(R.string.no_fingerprints_enrolled).toToast(context)
+                }
             }
         )
     }

diff --git a/app/src/main/java/com/serranoie/android/buybuddy/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/serranoie/android/buybuddy/ui/settings/SettingsViewModel.kt
@@ -1,6 +1,10 @@
 package com.serranoie.android.buybuddy.ui.settings
 
+import android.content.Context
+import android.hardware.fingerprint.FingerprintManager
+import android.os.Build
 import androidx.annotation.VisibleForTesting
+import androidx.biometric.BiometricManager
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -91,4 +95,14 @@ class SettingsViewModel @Inject constructor(
             if (isSystemInDarkTheme()) ThemeMode.Dark else ThemeMode.Light
         } else currentTheme.value
     }
+
+    fun isBiometricAvailable(context: Context): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val biometricManager = BiometricManager.from(context)
+            biometricManager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) == BiometricManager.BIOMETRIC_SUCCESS
+        } else {
+            val fingerprintManager = context.getSystemService(Context.FINGERPRINT_SERVICE) as FingerprintManager
+            fingerprintManager.isHardwareDetected && fingerprintManager.hasEnrolledFingerprints()
+        }
+    }
 }
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -110,7 +110,7 @@
     <string name="app_lock_button_icon_desc">Desbloquear App</string>
     <string name="app_lock_unable_to_authenticate">El bloqueo de aplicaciones está deshabilitado porque el dispositivo no puede autenticarse</string>
     <string name="biometric_not_available">Autenticación biométrica no disponible para este dispositivo.</string>
-    <string name="biometric_temporary_not_available">Autenticación biométrica no disponible en este momento.</string>"
+    <string name="biometric_temporary_not_available">Autenticación biométrica no disponible en este momento.</string>
     <string name="biometric_available_not_enrolled">Primero debe registrar/agregar una huella digital/identificación facial…</string>
     <string name="unlock_button">Desbloquear app</string>
 
@@ -123,6 +123,7 @@
     <string name="auth_successful">La autenticación fue exitosa!</string>
     <string name="auth_failed">La autenticación falló!</string>
     <string name="auth_error">Error de autenticación: %s</string>
+    <string name="no_fingerprints_enrolled">No se han registrado huellas dactilares. Registre al menos una huella dactilar para habilitar el bloqueo biométrico.</string>
 
     <!--  Info Values  -->
     <string name="misc_setting_title">Información</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -130,6 +130,7 @@
     <string name="auth_failed">Authentication failed!</string>
     <string name="auth_error">Authentication error: %s</string>]
     <string name="unlock_button">Unlock app</string>
+    <string name="no_fingerprints_enrolled">No fingerprints are enrolled. Please enroll at least one fingerprint to enable biometric lock.</string>
 
     <!--  Info Values  -->
     <string name="misc_setting_title">Information</string>