Merge pull request #3 from rommansabbir/dev

Fixed issue #2

StoreX/src/main/java/com/rommansabbir/storex/BaseStoreXInstance.kt

@@ -79,6 +79,10 @@ abstract class BaseStoreXInstance(
         }
     }
 
+    internal fun clearCacheFromCacheDir(key: String) {
+        application.cacheDir?.listFiles()?.find { it.name == key }?.delete()
+    }
+
     override fun registerListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         this.mSharedPreferences.registerOnSharedPreferenceChangeListener(listener)
     }

StoreX/src/main/java/com/rommansabbir/storex/StoreX.kt

@@ -5,20 +5,10 @@ import com.rommansabbir.storex.callbacks.SaveCallback
 import kotlinx.coroutines.CoroutineScope
 
 interface StoreX {
-    @Deprecated(
-        "Use new method with Coroutine Support",
-        replaceWith = ReplaceWith("StoreX.put(scope : CoroutineScope, key: String, value: StoreAbleObject)")
-    )
-    @Throws(RuntimeException::class)
     fun put(key: String, value: StoreAbleObject): Boolean
 
-    @Throws(RuntimeException::class)
     fun put(scope: CoroutineScope, key: String, value: StoreAbleObject)
 
-    @Deprecated(
-        "Use new method with Coroutine Support",
-        replaceWith = ReplaceWith("StoreX.put(scope: CoroutineScope, key: String, value: StoreAbleObject, callback: SaveCallback<T>)")
-    )
     fun <T : StoreAbleObject> put(key: String, value: StoreAbleObject, callback: SaveCallback<T>)
 
     fun <T : StoreAbleObject> put(
@@ -28,13 +18,8 @@ interface StoreX {
         callback: SaveCallback<T>
     )
 
-    @Throws(RuntimeException::class)
     fun <T : StoreAbleObject> get(key: String, objectType: Class<T>): T
 
-    @Deprecated(
-        "Use new method with Coroutine Support",
-        replaceWith = ReplaceWith("StoreX.get(scope: CoroutineScope, key: String, objectType: Class<T>, callback: GetCallback<T>)")
-    )
     fun <T : StoreAbleObject> get(key: String, objectType: Class<T>, callback: GetCallback<T>)
 
     fun <T : StoreAbleObject> get(
@@ -44,17 +29,17 @@ interface StoreX {
         callback: GetCallback<T>
     )
 
-    @Throws(RuntimeException::class)
     fun addSubscriber(subscriber: Subscriber)
 
-    @Throws(RuntimeException::class)
-    fun addSubscriber(subscribers: ArrayList<Subscriber>)
+    fun addSubscriber(subscribers: List<Subscriber>)
 
     fun removeSubscriber(subscriber: Subscriber)
 
-    fun removeSubscriber(subscribers: ArrayList<Subscriber>)
+    fun removeSubscriber(subscribers: List<Subscriber>)
 
     fun remove(key: String)
 
+    fun removeFromCacheDir(key: List<String>): Boolean
+
     fun removeAll()
 }

StoreX/src/main/java/com/rommansabbir/storex/StoreXInstance.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.util.*
 
 
 internal class StoreXInstance(
@@ -254,7 +253,7 @@ internal class StoreXInstance(
         StoreXCore.addSubscriber(subscriber)
     }
 
-    override fun addSubscriber(subscribers: ArrayList<Subscriber>) {
+    override fun addSubscriber(subscribers: List<Subscriber>) {
         subscribers.forEach {
             addSubscriber(it)
         }
@@ -264,14 +263,23 @@ internal class StoreXInstance(
         StoreXCore.removeSubscriber(subscriber)
     }
 
-    override fun removeSubscriber(subscribers: ArrayList<Subscriber>) {
+    override fun removeSubscriber(subscribers: List<Subscriber>) {
         subscribers.forEach {
             removeSubscriber(it)
         }
     }
 
     override fun remove(key: String) {
-        clearCacheByKey(key)
+        if (writeOrGetAsFileUsingCacheDirectory) {
+            clearCacheFromCacheDir(key)
+        } else {
+            clearCacheByKey(key)
+        }
+    }
+
+    override fun removeFromCacheDir(key: List<String>): Boolean {
+        key.forEach { clearCacheFromCacheDir(it) }
+        return true
     }
 
     override fun removeAll() {

StoreX/src/main/java/com/rommansabbir/storex/execptions/DuplicateKeyFoundException.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class DuplicateKeyFoundException(@JvmField override val message: String = "This subscriber is already present in the StoreX subscribers list. Make sure your SUBSCRIBER_ID is unique or else remove the current subscriber and add new one") :
-    RuntimeException(message)
+    Exception(message)

StoreX/src/main/java/com/rommansabbir/storex/execptions/DuplicateStoreXConfigException.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class DuplicateStoreXConfigException(@JvmField override val message: String = "Duplicate StoreXConfig found.") :
-    RuntimeException(message)
+    Exception(message)

StoreX/src/main/java/com/rommansabbir/storex/execptions/InvalidEncryptionKeyException.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class InvalidEncryptionKeyException(@JvmField override val message: String = "Invalid encryption key") :
-    RuntimeException(message)
+    Exception(message)

StoreX/src/main/java/com/rommansabbir/storex/execptions/NoConfigFoundException.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class NoConfigFoundException(@JvmField override val message: String = "No valid instance found for this StoreXConfig") :
-    RuntimeException(message)
+    Exception(message)

StoreX/src/main/java/com/rommansabbir/storex/execptions/NoStoreAbleObjectFound.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class NoStoreAbleObjectFound(@JvmField override val message: String = "No StoreAbleObject found associated with this key") :
-    RuntimeException(message)
+    Exception(message)

StoreX/src/main/java/com/rommansabbir/storex/execptions/NotInitializedException.kt

@@ -1,4 +1,4 @@
 package com.rommansabbir.storex.execptions
 
 class NotInitializedException(@JvmField override val message: String = "StoreX is not initialized properly") :
-    RuntimeException(message)
+    Exception(message)