From 5fc04bd0795fb442dcd76e67818a79dcfc0129e9 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 20 Oct 2023 20:26:04 +0200
Subject: [PATCH] Fix compilation

---
 .../android/features/lockscreen/impl/pin/model/PinEntry.kt   | 3 +--
 .../features/lockscreen/impl/unlock/PinUnlockPresenter.kt    | 3 ++-
 .../featureflag/impl/PreferencesFeatureFlagProvider.kt       | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
index 76331bd38f..92dda869a6 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
@@ -18,11 +18,10 @@ package io.element.android.features.lockscreen.impl.pin.model
 
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toPersistentList
-import java.io.Serializable
 
 data class PinEntry(
     val digits: ImmutableList<PinDigit>,
-): Serializable {
+) {
 
     companion object {
         fun empty(size: Int): PinEntry {
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
index d6b77f799c..a6f06158d4 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import io.element.android.features.lockscreen.api.LockScreenStateService
@@ -37,7 +38,7 @@ class PinUnlockPresenter @Inject constructor(
 
     @Composable
     override fun present(): PinUnlockState {
-        var pinEntry by rememberSaveable {
+        var pinEntry by remember {
             mutableStateOf(PinEntry.empty(4))
         }
         var remainingAttempts by rememberSaveable {
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
index 23ff977da2..ddffdebd34 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
@@ -24,7 +24,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.preferencesDataStore
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.featureflag.api.Feature
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -45,10 +44,10 @@ class PreferencesFeatureFlagProvider @Inject constructor(@ApplicationContext con
         }
     }
 
-    override fun isFeatureEnabled(feature: Feature): Flow<Boolean> {
+    override suspend fun isFeatureEnabled(feature: Feature): Boolean {
         return store.data.map { prefs ->
             prefs[booleanPreferencesKey(feature.key)] ?: feature.defaultValue
-        }
+        }.first()
     }
 
     override fun hasFeature(feature: Feature): Boolean {