fix: allow multiple datastores

ch4rl3x · Apr 15, 2024 · f40e1aa · f40e1aa
1 parent 785f0dd
commit f40e1aa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,11 +6,6 @@ plugins {
     alias(libs.plugins.nexusPublish)
 }
 
-subprojects {
-    group = "de.charlex.settings"
-    version = "2.0.0-alpha01"
-}
-
 nexusPublishing {
     repositories {
         sonatype {

diff --git a/sample-shared/src/Screen.kt b/sample-shared/src/Screen.kt
@@ -42,6 +42,14 @@ fun Screen() {
             }) {
                 Text("Set Name to UnknownName")
             }
+
+            Button({
+                coroutineScope.launch {
+                    dataStore.clear()
+                }
+            }) {
+                Text("Clear DataStore")
+            }
         }
     }
 }
diff --git a/settings-datastore/build.gradle.kts b/settings-datastore/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 group = "de.charlex.settings"
-version = "2.0.0-alpha01"
+version = "2.0.0-alpha02"
 description = "Kotlin Multiplatform Settings Datastore"
diff --git a/settings-datastore/src/SettingsDataStore.kt b/settings-datastore/src/SettingsDataStore.kt
@@ -22,7 +22,7 @@ interface SettingsDataStore {
 
     companion object {
 
-        internal var settingsDataStore: SettingsDataStore? = null
+        internal val settingsDataStoreMap: MutableMap<String, SettingsDataStore> = mutableMapOf()
 
         /**
          * When using with robolectric, please use

diff --git a/settings-datastore/src@android/SettingsDataStore+Ext.kt b/settings-datastore/src@android/SettingsDataStore+Ext.kt
@@ -2,7 +2,6 @@ package de.charlex.settings.datastore
 
 import android.content.Context
 import androidx.datastore.core.DataMigration
-import androidx.datastore.core.MultiProcessDataStoreFactory
 import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.CoroutineScope
@@ -17,8 +16,8 @@ fun SettingsDataStore.Companion.create(
         scope: CoroutineScope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
 //        security: Security = AESSecurity
 ): SettingsDataStore {
-    if (settingsDataStore == null) {
-        settingsDataStore = SettingsDataStoreImpl(
+    return settingsDataStoreMap.getOrPut(name) {
+        SettingsDataStoreImpl(
             dataStore = createDataStore(
                 migrations = migrations,
                 corruptionHandler = corruptionHandler,
@@ -29,6 +28,5 @@ fun SettingsDataStore.Companion.create(
 //            security = security
         )
     }
-    return settingsDataStore!!
 }
 
diff --git a/settings-datastore/src@ios/SettingsDataStore+Ext.kt b/settings-datastore/src@ios/SettingsDataStore+Ext.kt
@@ -21,8 +21,8 @@ fun SettingsDataStore.Companion.create(
         scope: CoroutineScope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
 //        security: Security = AESSecurity
 ): SettingsDataStore {
-    if (settingsDataStore == null) {
-        settingsDataStore = SettingsDataStoreImpl(
+    return settingsDataStoreMap.getOrPut(name) {
+        SettingsDataStoreImpl(
             dataStore = createDataStore(
                 migrations = migrations,
                 corruptionHandler = corruptionHandler,
@@ -34,12 +34,11 @@ fun SettingsDataStore.Companion.create(
                     appropriateForURL = null,
                     create = false,
                     error = null,
-                    )
+                )
                 requireNotNull(documentDirectory).path + "/$name"
             }
 //            security = security
         )
     }
-    return settingsDataStore!!
 }