From 20e4470511d30d25abe4b7de3e961e209ad608cb Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 2 Nov 2022 14:33:27 +0000
Subject: [PATCH] reverting preference set changes

---
 .../kotlin/app/dapk/st/SharedPreferencesDelegate.kt  | 12 ------------
 core/src/main/kotlin/app/dapk/st/core/Preferences.kt | 11 -----------
 .../dapk/st/domain/preference/CachingPreferences.kt  | 11 -----------
 .../src/test/kotlin/test/impl/InMemoryPreferences.kt | 10 +---------
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/app/src/main/kotlin/app/dapk/st/SharedPreferencesDelegate.kt b/app/src/main/kotlin/app/dapk/st/SharedPreferencesDelegate.kt
index f9fb86e..2fb5fe4 100644
--- a/app/src/main/kotlin/app/dapk/st/SharedPreferencesDelegate.kt
+++ b/app/src/main/kotlin/app/dapk/st/SharedPreferencesDelegate.kt
@@ -19,24 +19,12 @@ internal class SharedPreferencesDelegate(
         }
     }
 
-    override suspend fun store(key: String, value: Set<String>) {
-        coroutineDispatchers.withIoContext {
-            preferences.edit().putStringSet(key, value).apply()
-        }
-    }
-
     override suspend fun readString(key: String): String? {
         return coroutineDispatchers.withIoContext {
             preferences.getString(key, null)
         }
     }
 
-    override suspend fun readStrings(key: String): Set<String>? {
-        return coroutineDispatchers.withIoContext {
-            preferences.getStringSet(key, null)
-        }
-    }
-
     override suspend fun remove(key: String) {
         coroutineDispatchers.withIoContext {
             preferences.edit().remove(key).apply()
diff --git a/core/src/main/kotlin/app/dapk/st/core/Preferences.kt b/core/src/main/kotlin/app/dapk/st/core/Preferences.kt
index 3d461e7..510290c 100644
--- a/core/src/main/kotlin/app/dapk/st/core/Preferences.kt
+++ b/core/src/main/kotlin/app/dapk/st/core/Preferences.kt
@@ -3,9 +3,7 @@ package app.dapk.st.core
 interface Preferences {
 
     suspend fun store(key: String, value: String)
-    suspend fun store(key: String, value: Set<String>)
     suspend fun readString(key: String): String?
-    suspend fun readStrings(key: String): Set<String>?
     suspend fun clear()
     suspend fun remove(key: String)
 }
@@ -20,13 +18,4 @@ suspend fun CachedPreferences.readBoolean(key: String, defaultValue: Boolean) =
 
 suspend fun Preferences.readBoolean(key: String) = this.readString(key)?.toBooleanStrict()
 suspend fun Preferences.store(key: String, value: Boolean) = this.store(key, value.toString())
-suspend fun Preferences.append(key: String, value: String): Set<String> {
-    val current = this.readStrings(key) ?: emptySet()
-    return (current + value).also { this.store(key, it) }
-}
-
-suspend fun Preferences.removeFromSet(key: String, value: String): Set<String> {
-    val current = this.readStrings(key) ?: emptySet()
-    return (current - value).also { this.store(key, it) }
-}
 
diff --git a/domains/store/src/main/kotlin/app/dapk/st/domain/preference/CachingPreferences.kt b/domains/store/src/main/kotlin/app/dapk/st/domain/preference/CachingPreferences.kt
index f873df1..7b9ef84 100644
--- a/domains/store/src/main/kotlin/app/dapk/st/domain/preference/CachingPreferences.kt
+++ b/domains/store/src/main/kotlin/app/dapk/st/domain/preference/CachingPreferences.kt
@@ -10,17 +10,6 @@ class CachingPreferences(private val cache: PropertyCache, private val preferenc
         preferences.store(key, value)
     }
 
-    override suspend fun store(key: String, value: Set<String>) {
-        cache.setValue(key, value)
-        preferences.store(key, value)
-    }
-
-    override suspend fun readStrings(key: String): Set<String>? {
-        return cache.getValue(key) ?: preferences.readStrings(key)?.also {
-            cache.setValue(key, it)
-        }
-    }
-
     override suspend fun readString(key: String): String? {
         return cache.getValue(key) ?: preferences.readString(key)?.also {
             cache.setValue(key, it)
diff --git a/test-harness/src/test/kotlin/test/impl/InMemoryPreferences.kt b/test-harness/src/test/kotlin/test/impl/InMemoryPreferences.kt
index b6ec8ca..3390155 100644
--- a/test-harness/src/test/kotlin/test/impl/InMemoryPreferences.kt
+++ b/test-harness/src/test/kotlin/test/impl/InMemoryPreferences.kt
@@ -5,27 +5,19 @@ import app.dapk.st.core.Preferences
 class InMemoryPreferences : Preferences {
 
     private val prefs = mutableMapOf<String, String>()
-    private val setPrefs = mutableMapOf<String, Set<String>>()
 
     override suspend fun store(key: String, value: String) {
         prefs[key] = value
     }
 
-    override suspend fun store(key: String, value: Set<String>) {
-        setPrefs[key] = value
-    }
-
     override suspend fun readString(key: String): String? = prefs[key]
-    override suspend fun readStrings(key: String): Set<String>? = setPrefs[key]
-    
+
     override suspend fun remove(key: String) {
         prefs.remove(key)
-        setPrefs.remove(key)
     }
 
     override suspend fun clear() {
         prefs.clear()
-        setPrefs.clear()
     }
 
 }
\ No newline at end of file