Skip to content

Commit bf7f41e

Browse files
committed
tests: Fix localized exception message test
1 parent 514a88a commit bf7f41e

6 files changed

Lines changed: 16 additions & 2 deletions

File tree

androidApp/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ dependencies {
135135
baselineProfile(project(":androidBenchmark"))
136136
coreLibraryDesugaring(libs.android.desugarjdklibs)
137137

138+
// Unit tests
139+
testImplementation(kotlin("test"))
140+
testImplementation(libs.junit)
141+
138142
// Android tests
139143
androidTestImplementation(project(":androidTest"))
140144
androidTestImplementation(libs.androidx.arch.core.testing)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.artemchep.keyguard.provider.bitwarden
2+
3+
internal expect fun Throwable.localizedMessageOrNull(): String?

common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/sync/v2/pipeline/EntitySyncOps.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.artemchep.keyguard.provider.bitwarden.sync.v2.pipeline
33
import com.artemchep.keyguard.common.exception.ApiException
44
import com.artemchep.keyguard.common.exception.HttpException
55
import com.artemchep.keyguard.core.store.bitwarden.BitwardenService
6+
import com.artemchep.keyguard.provider.bitwarden.localizedMessageOrNull
67
import kotlin.time.Clock
78

89
/**
@@ -191,7 +192,7 @@ interface EntitySyncOps<Local : BitwardenService.Has<Local>, Server : Any> {
191192
}
192193
return BitwardenService.Error(
193194
code = code,
194-
message = error.message,
195+
message = error.localizedMessageOrNull(),
195196
revisionDate = Clock.System.now(),
196197
)
197198
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.artemchep.keyguard.provider.bitwarden
2+
3+
internal actual fun Throwable.localizedMessageOrNull(): String? = message
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.artemchep.keyguard.provider.bitwarden
2+
3+
internal actual fun Throwable.localizedMessageOrNull(): String? = localizedMessage ?: message

wearApp/src/main/java/com/artemchep/keyguard/wear/feature/vault/component/VaultViewNoteItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fun WearVaultViewNoteItem(
3737
when (val content = item.content) {
3838
is VaultViewItem.Note.Content.Markdown -> {
3939
MarkdownText(
40-
markdown = content.node,
40+
markdown = content.document,
4141
)
4242
}
4343

0 commit comments

Comments
 (0)