Merge pull request #11 from motorro/no_object_stream

No object stream in DiskLru service data
motorro · Nov 25, 2019 · 31aff36 · 31aff36
2 parents 57ce030 + 0c9db99
commit 31aff36
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/disklrucache/src/main/kotlin/com/motorro/rxlcemodel/disklrucache/DiskLruCacheSyncDelegate.kt b/disklrucache/src/main/kotlin/com/motorro/rxlcemodel/disklrucache/DiskLruCacheSyncDelegate.kt
@@ -82,22 +82,26 @@ class DiskLruCacheSyncDelegate<D: Any> @JvmOverloads constructor (
                 }
 
         /**
-         * Object wrappers
+         * Long wrappers
          */
-        private inline fun <reified T: Serializable?> DiskLruCache.Snapshot.getObject(index: Int): T = withInputStream(index) {
-            ObjectInputStream(it).use { oi -> oi.readObject() as T }
+        private fun DiskLruCache.Snapshot.readLong(index: Int): Long = withInputStream(index) {
+            DataInputStream(it).use { ds -> ds.readLong() }
         }
-        private fun DiskLruCache.Editor.setObject(index: Int, obj: Serializable?) = withOutputStream(index) {
-            ObjectOutputStream(it).use { oo -> oo.writeObject(obj) }
+        private fun DiskLruCache.Editor.writeLong(index: Int, value: Long) = withOutputStream(index) {
+            DataOutputStream(it).use { ds -> ds.writeLong(value) }
         }
 
         /**
          * Data
          */
         private inline fun <T: Any?> DiskLruCache.Snapshot.withDataInputStream(crossinline action: (InputStream) -> T): T = withInputStream(
-            DATA_INDEX, action)
+            DATA_INDEX,
+            action
+        )
         private inline fun DiskLruCache.Editor.withDataOutputStream(crossinline action: (OutputStream) -> Unit) = withOutputStream(
-            DATA_INDEX, action)
+            DATA_INDEX,
+            action
+        )
 
         /**
          * Data length
@@ -107,14 +111,14 @@ class DiskLruCacheSyncDelegate<D: Any> @JvmOverloads constructor (
         /**
          * Created
          */
-        private fun DiskLruCache.Snapshot.getCreatedAt(): Long = getObject(CREATED_INDEX)
-        private fun DiskLruCache.Editor.setCreatedAt(value: Long) = setObject(CREATED_INDEX, value)
+        private fun DiskLruCache.Snapshot.getCreatedAt(): Long = readLong(CREATED_INDEX)
+        private fun DiskLruCache.Editor.setCreatedAt(value: Long) = writeLong(CREATED_INDEX, value)
 
         /**
          * Invalidated
          */
-        private fun DiskLruCache.Snapshot.getInvalidatedAt(): Long = getObject(INVALIDATED_INDEX)
-        private fun DiskLruCache.Editor.setInvalidatedAt(value: Long) = setObject(INVALIDATED_INDEX, value)
+        private fun DiskLruCache.Snapshot.getInvalidatedAt(): Long = readLong(INVALIDATED_INDEX)
+        private fun DiskLruCache.Editor.setInvalidatedAt(value: Long) = writeLong(INVALIDATED_INDEX, value)
     }
 
     /**
@@ -130,7 +134,9 @@ class DiskLruCacheSyncDelegate<D: Any> @JvmOverloads constructor (
         set(value) {
             cacheProvider.cache.edit(invalidationKey)?.run {
                 runCatching {
-                    setObject(DATA_INDEX, null)
+                    withOutputStream(DATA_INDEX) {
+                        it.write(0)
+                    }
                     setCreatedAt(0)
                     setInvalidatedAt(value)
                     commit()