Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix compilation

Browse source
This commit is contained in:
ganfra 2023-10-20 20:26:04 +02:00
parent 9104e7d585
commit 5fc04bd079
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
View file

@ -18,11 +18,10 @@ package io.element.android.features.lockscreen.impl.pin.model
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toPersistentList import kotlinx.collections.immutable.toPersistentList
import java.io.Serializable
data class PinEntry( data class PinEntry(
val digits: ImmutableList<PinDigit>, val digits: ImmutableList<PinDigit>,
): Serializable { ) {
companion object { companion object {
fun empty(size: Int): PinEntry { fun empty(size: Int): PinEntry {

3
features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
View file

@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import io.element.android.features.lockscreen.api.LockScreenStateService import io.element.android.features.lockscreen.api.LockScreenStateService
@ -37,7 +38,7 @@ class PinUnlockPresenter @Inject constructor(
@Composable @Composable
override fun present(): PinUnlockState { override fun present(): PinUnlockState {
var pinEntry by rememberSaveable { var pinEntry by remember {
mutableStateOf(PinEntry.empty(4)) mutableStateOf(PinEntry.empty(4))
} }
var remainingAttempts by rememberSaveable { var remainingAttempts by rememberSaveable {

5
libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
View file

@ -24,7 +24,6 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.preferencesDataStore import androidx.datastore.preferences.preferencesDataStore
import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.featureflag.api.Feature import io.element.android.libraries.featureflag.api.Feature
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import javax.inject.Inject 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 -> return store.data.map { prefs ->
prefs[booleanPreferencesKey(feature.key)] ?: feature.defaultValue prefs[booleanPreferencesKey(feature.key)] ?: feature.defaultValue
} }.first()
} }
override fun hasFeature(feature: Feature): Boolean { override fun hasFeature(feature: Feature): Boolean {