Fixed a issue with strings not getting cleared in the LocalizedResour…

…cesPersistentMap
B3nedikt · Jun 29, 2024 · 774fc07 · 774fc07
1 parent 4f99cd9
commit 774fc07
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/...a/dev/b3nedikt/restring/internal/repository/persistent/LocalizedResourcesPersistentMap.kt b/...a/dev/b3nedikt/restring/internal/repository/persistent/LocalizedResourcesPersistentMap.kt
@@ -1,6 +1,6 @@
 package dev.b3nedikt.restring.internal.repository.persistent
 
-import java.util.*
+import java.util.Locale
 
 /**
  * A [PersistentMap] which used [Locale]s as key and maps of resource name, resource value pairs
@@ -43,6 +43,7 @@ internal class LocalizedResourcesPersistentMap<V>(
 
     override fun delete(key: Locale) {
         locales.remove(key)
+        delegateMaps[key]?.clear()
         delegateMaps.remove(key)
     }
 

diff --git a/restring/src/main/java/dev/b3nedikt/restring/repository/CachedStringRepository.kt b/restring/src/main/java/dev/b3nedikt/restring/repository/CachedStringRepository.kt
@@ -2,7 +2,7 @@ package dev.b3nedikt.restring.repository
 
 import dev.b3nedikt.restring.MutableStringRepository
 import dev.b3nedikt.restring.internal.repository.observable.observableMap
-import java.util.*
+import java.util.Locale
 import kotlin.properties.ReadWriteProperty
 
 /**

diff --git a/restring/src/test/java/dev/b3nedikt/restring/RestringTest.kt b/restring/src/test/java/dev/b3nedikt/restring/RestringTest.kt
@@ -9,13 +9,14 @@ import dev.b3nedikt.restring.activity.TestActivity
 import dev.b3nedikt.restring.internal.DefaultLocaleProvider
 import dev.b3nedikt.reword.RewordInterceptor
 import dev.b3nedikt.viewpump.ViewPump
+import org.amshove.kluent.shouldContainSame
 import org.amshove.kluent.shouldStartWith
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
-import java.util.*
+import java.util.Locale
 
 @RunWith(RobolectricTestRunner::class)
 class RestringTest {
@@ -82,6 +83,19 @@ class RestringTest {
         activityController.pause().stop().destroy()
     }
 
+    @Test
+    fun removingALocalShouldDeleteAllOfItsStrings() {
+
+        val strings = mapOf("key1" to "value1", "key2" to  "value2")
+        val strings2 = mapOf("key3" to "value3", "key4" to  "value4")
+
+        Restring.stringRepository.toMutableRepository().strings[Locale.ENGLISH]?.putAll(strings)
+        Restring.stringRepository.toMutableRepository().strings.remove(Locale.ENGLISH)
+        Restring.stringRepository.toMutableRepository().strings[Locale.ENGLISH]?.putAll(strings2)
+
+        Restring.stringRepository.toMutableRepository().strings[Locale.ENGLISH]!! shouldContainSame strings2
+    }
+
     private fun getStrings(locale: Locale) = mapOf(
             "header" to locale.language + "_" + "header",
             "header_hint" to locale.language + "_" + "hint",