Merge branch 'preferences_store_serialization_fix' into 'master'

Add PreferenceStore serialization fix

See merge request danny.lamarti/objectstore!3

Author: jeffreydelooff

library/src/androidTest/java/nl/elements/objectstore/ExampleInstrumentedTest.kt

@@ -1,24 +1,22 @@
 package nl.elements.objectstore
 
-import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
 import nl.elements.objectstore.stores.MemoryStore
-
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+
     @Test
     fun useAppContext() {
-        val context = InstrumentationRegistry.getTargetContext()
+//        val context = InstrumentationRegistry.getTargetContext()
         val store = MemoryStore()
 
         store["key"] = "value"
@@ -27,4 +25,5 @@ class ExampleInstrumentedTest {
 
         assertEquals("value", value)
     }
+
 }

library/src/main/java/nl/elements/objectstore/stores/PreferencesStore.kt

@@ -2,6 +2,7 @@ package nl.elements.objectstore.stores
 
 
 import android.content.SharedPreferences
+import android.util.Base64
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import nl.elements.objectstore.Converter
@@ -25,27 +26,25 @@ class PreferencesStore(
         get() = preferences.all.keys
 
     override fun set(key: String, value: Any) {
-        preferences
-            .edit()
-            .putString(key, writeToBytes(key, value).toString(Charsets.UTF_8))
-            .apply()
+        writeToBytes(key, value)
+            .let { Base64.encodeToString(it, 0) }
+            .let { preferences.edit().putString(key, it).apply() }
 
         emit(Updated(key))
     }
 
     override fun <T : Any> get(key: String): T =
         preferences
-            .getString(key, null)
-            ?.byteInputStream(Charsets.UTF_8)
-            ?.read(key)!!
+            .getString(key, null)!!
+            .let { Base64.decode(it, 0) }
+            .inputStream()
+            .read(key)
 
     override fun contains(key: String): Boolean = preferences.contains(key)
 
     override fun remove(key: String) {
-        if (key in preferences) {
-            preferences.edit().remove(key).apply()
+        if (preferences.edit().remove(key).commit())
             emit(Removed(key))
-        }
     }
 
     fun toPreferences(): SharedPreferences = StorePreferences(this, preferences)