Poison Pill PIN now supports alpha-numeric PINs

Author: Wavesonics

app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/PoisonPillPinCreationDialog.kt

@@ -77,16 +77,21 @@ fun PoisonPillPinCreationDialog(
 				// PIN input
 				OutlinedTextField(
 					value = pin,
-					onValueChange = {
-						if (it.length <= uiState.pinSize.max() && it.all { char -> char.isDigit() }) {
-							pin = it
+					onValueChange = { newPin ->
+						val isValid = if (uiState.alphanumericPinEnabled) {
+							newPin.all { char -> char.isLetterOrDigit() }
+						} else {
+							newPin.all { char -> char.isDigit() }
+						}
+						if (newPin.length <= uiState.pinSize.max() && isValid) {
+							pin = newPin
 							showError = null
 						}
 					},
 					label = { Text(stringResource(R.string.pin_creation_hint)) },
 					visualTransformation = PasswordVisualTransformation(),
 					keyboardOptions = KeyboardOptions(
-						keyboardType = KeyboardType.NumberPassword,
+						keyboardType = if (uiState.alphanumericPinEnabled) KeyboardType.Password else KeyboardType.NumberPassword,
 						imeAction = ImeAction.Next
 					),
 					singleLine = true,
@@ -98,16 +103,21 @@ fun PoisonPillPinCreationDialog(
 				// Confirm PIN input
 				OutlinedTextField(
 					value = confirmPin,
-					onValueChange = {
-						if (it.length <= uiState.pinSize.max() && it.all { char -> char.isDigit() }) {
-							confirmPin = it
+					onValueChange = { newConfirmPin ->
+						val isValid = if (uiState.alphanumericPinEnabled) {
+							newConfirmPin.all { char -> char.isLetterOrDigit() }
+						} else {
+							newConfirmPin.all { char -> char.isDigit() }
+						}
+						if (newConfirmPin.length <= uiState.pinSize.max() && isValid) {
+							confirmPin = newConfirmPin
 							showError = null
 						}
 					},
 					label = { Text(stringResource(R.string.pin_creation_confirm_hint)) },
 					visualTransformation = PasswordVisualTransformation(),
 					keyboardOptions = KeyboardOptions(
-						keyboardType = KeyboardType.NumberPassword,
+						keyboardType = if (uiState.alphanumericPinEnabled) KeyboardType.Password else KeyboardType.NumberPassword,
 						imeAction = ImeAction.Done
 					),
 					singleLine = true,
@@ -158,4 +168,4 @@ fun PoisonPillPinCreationDialog(
 			}
 		}
 	}
-}
+}

app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SettingsViewModel.kt

@@ -65,6 +65,12 @@ class SettingsViewModel(
 				_uiState.update { it.copy(locationPermissionStatus = status) }
 			}
 		}
+
+		viewModelScope.launch {
+			preferences.alphanumericPinEnabled.collect { enabled ->
+				_uiState.update { it.copy(alphanumericPinEnabled = enabled) }
+			}
+		}
 	}
 
 	private fun checkPoisonPillStatus() {
@@ -193,7 +199,7 @@ class SettingsViewModel(
 	}
 
 	suspend fun validatePoisonPillPin(pin: String, confirmPin: String): String? {
-		val strongPin = pinStrengthCheck.isPinStrongEnough(pin)
+		val strongPin = pinStrengthCheck.isPinStrongEnough(pin, uiState.value.alphanumericPinEnabled)
 		return if (pin != confirmPin || (pin.length in uiState.value.pinSize).not()) {
 			appContext.getString(R.string.pin_creation_error)
 		} else if (isSameAsAuthPin(pin)) {
@@ -223,4 +229,5 @@ data class SettingsUiState(
 	val poisonPillRemoved: Boolean = false,
 	val securityLevel: SecurityLevel = SecurityLevel.SOFTWARE,
 	val pinSize: IntRange,
+	val alphanumericPinEnabled: Boolean = false,
 )