From 26a7298978a42cd7b8b2987c60edd602124edc5c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 15 Jun 2023 14:02:05 +0530 Subject: [PATCH] fix: address `ComposeUnstableCollections` lint --- app/build.gradle.kts | 1 + app/lint-baseline.xml | 15 ++------------- .../java/app/passwordstore/ui/pgp/PGPKeyList.kt | 14 +++++++++----- .../util/viewmodel/PGPKeyListViewModel.kt | 7 +++++-- autofill-parser/lint-baseline.xml | 2 +- coroutine-utils/lint-baseline.xml | 2 +- crypto-common/lint-baseline.xml | 2 +- crypto-pgpainless/lint-baseline.xml | 2 +- format-common/lint-baseline.xml | 2 +- gradle/libs.versions.toml | 1 + passgen/diceware/lint-baseline.xml | 2 +- passgen/random/lint-baseline.xml | 2 +- sentry-stub/lint-baseline.xml | 2 +- ssh/lint-baseline.xml | 2 +- ui-compose/lint-baseline.xml | 2 +- 15 files changed, 28 insertions(+), 30 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aacca7a5b..5ba7b7a07 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,6 +71,7 @@ dependencies { implementation(libs.compose.ui.tooling) implementation(libs.dagger.hilt.android) + implementation(libs.kotlinx.collections.immutable) implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.coroutines.core) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index de1f0a60d..5ccbd2086 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -1,5 +1,5 @@ - + @@ -227,17 +227,6 @@ column="4"/> - - - - , + identifiers: ImmutableList, onItemClick: (identifier: GpgIdentifier) -> Unit, modifier: Modifier = Modifier, onKeySelected: ((identifier: GpgIdentifier) -> Unit)? = null, @@ -141,9 +144,10 @@ private fun KeyListPreview() { KeyList( identifiers = listOfNotNull( - GpgIdentifier.fromString("ultramicroscopicsilicovolcanoconiosis@example.com"), - GpgIdentifier.fromString("0xB950AE2813841585"), - ), + GpgIdentifier.fromString("ultramicroscopicsilicovolcanoconiosis@example.com"), + GpgIdentifier.fromString("0xB950AE2813841585"), + ) + .toPersistentList(), onItemClick = {} ) } @@ -155,7 +159,7 @@ private fun KeyListPreview() { fun EmptyKeyListPreview() { APSThemePreview { Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) { - KeyList(identifiers = emptyList(), onItemClick = {}) + KeyList(identifiers = persistentListOf(), onItemClick = {}) } } } diff --git a/app/src/main/java/app/passwordstore/util/viewmodel/PGPKeyListViewModel.kt b/app/src/main/java/app/passwordstore/util/viewmodel/PGPKeyListViewModel.kt index a21a69629..a08b41fa3 100644 --- a/app/src/main/java/app/passwordstore/util/viewmodel/PGPKeyListViewModel.kt +++ b/app/src/main/java/app/passwordstore/util/viewmodel/PGPKeyListViewModel.kt @@ -13,11 +13,14 @@ import com.github.michaelbull.result.Ok import com.github.michaelbull.result.map import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject +import kotlinx.collections.immutable.ImmutableList +import kotlinx.collections.immutable.persistentListOf +import kotlinx.collections.immutable.toPersistentList import kotlinx.coroutines.launch @HiltViewModel class PGPKeyListViewModel @Inject constructor(private val keyManager: PGPKeyManager) : ViewModel() { - var keys: List by mutableStateOf(emptyList()) + var keys: ImmutableList by mutableStateOf(persistentListOf()) init { updateKeySet() @@ -31,7 +34,7 @@ class PGPKeyListViewModel @Inject constructor(private val keyManager: PGPKeyMana keys.mapNotNull { key -> KeyUtils.tryGetEmail(key) } } ) { - is Ok -> keys = result.value + is Ok -> keys = result.value.toPersistentList() is Err -> TODO() } } diff --git a/autofill-parser/lint-baseline.xml b/autofill-parser/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/autofill-parser/lint-baseline.xml +++ b/autofill-parser/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/coroutine-utils/lint-baseline.xml b/coroutine-utils/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/coroutine-utils/lint-baseline.xml +++ b/coroutine-utils/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/crypto-common/lint-baseline.xml b/crypto-common/lint-baseline.xml index 211050258..4e08108ea 100644 --- a/crypto-common/lint-baseline.xml +++ b/crypto-common/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/crypto-pgpainless/lint-baseline.xml b/crypto-pgpainless/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/crypto-pgpainless/lint-baseline.xml +++ b/crypto-pgpainless/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/format-common/lint-baseline.xml b/format-common/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/format-common/lint-baseline.xml +++ b/format-common/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34114e80a..3ba314b85 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,6 +67,7 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } +kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } diff --git a/passgen/diceware/lint-baseline.xml b/passgen/diceware/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/passgen/diceware/lint-baseline.xml +++ b/passgen/diceware/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/passgen/random/lint-baseline.xml b/passgen/random/lint-baseline.xml index 4a3e95b7b..8e8d016c5 100644 --- a/passgen/random/lint-baseline.xml +++ b/passgen/random/lint-baseline.xml @@ -1,5 +1,5 @@ - + - + diff --git a/ssh/lint-baseline.xml b/ssh/lint-baseline.xml index f1f078582..b74914390 100644 --- a/ssh/lint-baseline.xml +++ b/ssh/lint-baseline.xml @@ -1,4 +1,4 @@ - + diff --git a/ui-compose/lint-baseline.xml b/ui-compose/lint-baseline.xml index f1f078582..4e08108ea 100644 --- a/ui-compose/lint-baseline.xml +++ b/ui-compose/lint-baseline.xml @@ -1,4 +1,4 @@ - +