Pin: add tests and make LockScreenConfig an injectable data class

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt

@@ -39,6 +39,7 @@ import javax.inject.Inject
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class DefaultLockScreenService @Inject constructor(
+    private val lockScreenConfig: LockScreenConfig,
     private val featureFlagService: FeatureFlagService,
     private val pinCodeManager: PinCodeManager,
     private val coroutineScope: CoroutineScope,
@@ -91,14 +92,14 @@ class DefaultLockScreenService @Inject constructor(
                 if (isInForeground) {
                     lockJob?.cancel()
                 } else {
-                    lockJob = lockIfNeeded(delayInMillis = LockScreenConfig.GRACE_PERIOD_IN_MILLIS)
+                    lockJob = lockIfNeeded(delayInMillis = lockScreenConfig.gracePeriodInMillis)
                 }
             }
         }
     }
 
     override suspend fun isSetupRequired(): Boolean {
-        return LockScreenConfig.IS_PIN_MANDATORY
+        return lockScreenConfig.isPinMandatory
             && featureFlagService.isFeatureEnabled(FeatureFlags.PinUnlock)
             && !pinCodeManager.isPinCodeAvailable()
     }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/storage/PreferencesPinCodeStore.kt

@@ -38,6 +38,7 @@ private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(na
 @ContributesBinding(AppScope::class)
 class PreferencesPinCodeStore @Inject constructor(
     @ApplicationContext private val context: Context,
+    private val lockScreenConfig: LockScreenConfig,
 ) : PinCodeStore {
 
     private val pinCodeKey = stringPreferencesKey("encoded_pin_code")
@@ -59,7 +60,7 @@ class PreferencesPinCodeStore @Inject constructor(
 
     override suspend fun resetCounter() {
         context.dataStore.edit { preferences ->
-            preferences[remainingAttemptsKey] = LockScreenConfig.MAX_PIN_CODE_ATTEMPTS_NUMBER_BEFORE_LOGOUT
+            preferences[remainingAttemptsKey] = lockScreenConfig.maxPinCodeAttemptsBeforeLogout
         }
     }
 
@@ -87,5 +88,5 @@ class PreferencesPinCodeStore @Inject constructor(
         }.first()
     }
 
-    private fun Preferences.getRemainingPinCodeAttemptsNumber() = this[remainingAttemptsKey] ?: LockScreenConfig.MAX_PIN_CODE_ATTEMPTS_NUMBER_BEFORE_LOGOUT
+    private fun Preferences.getRemainingPinCodeAttemptsNumber() = this[remainingAttemptsKey] ?: lockScreenConfig.maxPinCodeAttemptsBeforeLogout
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvents.kt

@@ -17,7 +17,7 @@
 package io.element.android.features.lockscreen.impl.settings
 
 sealed interface LockScreenSettingsEvents {
-    data object RemovePin : LockScreenSettingsEvents
+    data object OnRemovePin : LockScreenSettingsEvents
     data object ConfirmRemovePin : LockScreenSettingsEvents
     data object CancelRemovePin : LockScreenSettingsEvents
     data object ToggleBiometric : LockScreenSettingsEvents

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenter.kt

@@ -31,6 +31,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class LockScreenSettingsPresenter @Inject constructor(
+    private val lockScreenConfig: LockScreenConfig,
     private val pinCodeManager: PinCodeManager,
     private val coroutineScope: CoroutineScope,
 ) : Presenter<LockScreenSettingsState> {
@@ -50,7 +51,7 @@ class LockScreenSettingsPresenter @Inject constructor(
             mutableStateOf(false)
         }
         LaunchedEffect(triggerComputation) {
-            showRemovePinOption = !LockScreenConfig.IS_PIN_MANDATORY && pinCodeManager.isPinCodeAvailable()
+            showRemovePinOption = !lockScreenConfig.isPinMandatory && pinCodeManager.isPinCodeAvailable()
         }
 
         fun handleEvents(event: LockScreenSettingsEvents) {
@@ -58,12 +59,14 @@ class LockScreenSettingsPresenter @Inject constructor(
                 LockScreenSettingsEvents.CancelRemovePin -> showRemovePinConfirmation = false
                 LockScreenSettingsEvents.ConfirmRemovePin -> {
                     coroutineScope.launch {
-                        showRemovePinConfirmation = false
-                        pinCodeManager.deletePinCode()
-                        triggerComputation++
+                        if (showRemovePinConfirmation) {
+                            showRemovePinConfirmation = false
+                            pinCodeManager.deletePinCode()
+                            triggerComputation++
+                        }
                     }
                 }
-                LockScreenSettingsEvents.RemovePin -> showRemovePinConfirmation = true
+                LockScreenSettingsEvents.OnRemovePin -> showRemovePinConfirmation = true
                 LockScreenSettingsEvents.ToggleBiometric -> {
                     //TODO branch biometric logic
                 }
@@ -77,5 +80,4 @@ class LockScreenSettingsPresenter @Inject constructor(
             eventSink = ::handleEvents
         )
     }
-
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt

@@ -54,7 +54,7 @@ fun LockScreenSettingsView(
                     title = stringResource(id = R.string.screen_app_lock_settings_remove_pin),
                     tintColor = ElementTheme.colors.textCriticalPrimary,
                     onClick = {
-                        state.eventSink(LockScreenSettingsEvents.RemovePin)
+                        state.eventSink(LockScreenSettingsEvents.OnRemovePin)
                     }
                 )
             }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/SetupPinPresenter.kt

@@ -33,6 +33,7 @@ import kotlinx.coroutines.delay
 import javax.inject.Inject
 
 class SetupPinPresenter @Inject constructor(
+    private val lockScreenConfig: LockScreenConfig,
     private val pinValidator: PinValidator,
     private val buildMeta: BuildMeta,
     private val pinCodeManager: PinCodeManager,
@@ -41,10 +42,10 @@ class SetupPinPresenter @Inject constructor(
     @Composable
     override fun present(): SetupPinState {
         var choosePinEntry by remember {
-            mutableStateOf(PinEntry.createEmpty(LockScreenConfig.PIN_SIZE))
+            mutableStateOf(PinEntry.createEmpty(lockScreenConfig.pinSize))
         }
         var confirmPinEntry by remember {
-            mutableStateOf(PinEntry.createEmpty(LockScreenConfig.PIN_SIZE))
+            mutableStateOf(PinEntry.createEmpty(lockScreenConfig.pinSize))
         }
         var isConfirmationStep by remember {
             mutableStateOf(false)

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/validation/PinValidator.kt

@@ -20,10 +20,7 @@ import io.element.android.appconfig.LockScreenConfig
 import io.element.android.features.lockscreen.impl.pin.model.PinEntry
 import javax.inject.Inject
 
-class PinValidator internal constructor(private val pinBlacklist: Set<String>) {
-
-    @Inject
-    constructor() : this(LockScreenConfig.PIN_BLACKLIST)
+class PinValidator @Inject constructor(private val lockScreenConfig: LockScreenConfig) {
 
     sealed interface Result {
         data object Valid : Result
@@ -32,7 +29,7 @@ class PinValidator internal constructor(private val pinBlacklist: Set<String>) {
 
     fun isPinValid(pinEntry: PinEntry): Result {
         val pinAsText = pinEntry.toText()
-        val isBlacklisted = pinBlacklist.any { it == pinAsText }
+        val isBlacklisted = lockScreenConfig.pinBlacklist.any { it == pinAsText }
         return if (isBlacklisted) {
             Result.Invalid(SetupPinFailure.PinBlacklisted)
         } else {