Skip to content

[DIA-6165] Add mutex to removeKeysStartingWith #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nevazhnovu merged 2 commits into from
Nov 17, 2025
Merged

[DIA-6165] Add mutex to removeKeysStartingWith #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0179181
add `mutex.withLock` in `removeKeysStartingWith`
Nevazhnovu Nov 10, 2025
5c648d5
move `runBlocking` in `removeKeysStartingWith`
Nevazhnovu Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/commonMain/kotlin/com/sourcepoint/mobile_core/storage/Repository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.sourcepoint.mobile_core.storage
import com.russhwolf.settings.Settings
import com.sourcepoint.mobile_core.models.consents.IABData
import com.sourcepoint.mobile_core.models.consents.State
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json

class Repository(private val storage: Settings) {
Expand Down
11 changes: 10 additions & 1 deletion core/src/commonMain/kotlin/com/sourcepoint/mobile_core/storage/SettingsExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.sourcepoint.mobile_core.storage

import com.russhwolf.settings.Settings
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.withLock
import com.russhwolf.settings.set as originalSet
import com.russhwolf.settings.get as originalGet
import kotlinx.serialization.json.JsonNull
Expand All @@ -16,8 +18,15 @@ import kotlinx.serialization.json.intOrNull
import kotlinx.serialization.json.long
import kotlinx.serialization.json.longOrNull

private val settingsMutex = kotlinx.coroutines.sync.Mutex()

internal fun Settings.removeKeysStartingWith(prefix: String) {
keys.filter { it.startsWith(prefix) }.forEach { remove(it) }
runBlocking {
settingsMutex.withLock {
val toRemove = keys.filter { it.startsWith(prefix) }
toRemove.forEach { remove(it) }
}
}
}

internal operator fun Settings.set(key: String, value: JsonPrimitive) = putJsonPrimitive(key, value)
Expand Down