finalize storage creation

Author: wenxi-zeng

core/src/main/java/com/segment/analytics/kotlin/core/utilities/StorageImpl.kt

@@ -218,7 +218,7 @@ object ConcreteStorageProvider : StorageProvider {
     }
 }
 
-object InMemoryStorageProvider: StorageProvider {
+class InMemoryStorageProvider: StorageProvider {
     override fun createStorage(vararg params: Any): Storage {
         if (params.isEmpty() || params[0] !is Analytics) {
             throw IllegalArgumentException("Invalid parameters for InMemoryStorageProvider. InMemoryStorageProvider requires at least 1 parameter and the first argument has to be an instance of Analytics")

core/src/test/kotlin/com/segment/analytics/kotlin/core/StorageTest.kt

@@ -68,7 +68,7 @@ class StorageTest {
 
         @Test
         fun inMemoryStorageProviderTest() {
-            val storage = InMemoryStorageProvider.createStorage(analytics) as StorageImpl
+            val storage = InMemoryStorageProvider().createStorage(analytics) as StorageImpl
             assertTrue(storage.eventStream is InMemoryEventStream)
             assertTrue(storage.propertiesFile is InMemoryPrefs)
         }

core/src/test/kotlin/com/segment/analytics/kotlin/core/utilities/InMemoryStorageTest.kt

@@ -49,7 +49,7 @@ internal class InMemoryStorageTest {
         )
         val analytics = testAnalytics(config, testScope, testDispatcher)
         store = analytics.store
-        storage = InMemoryStorageProvider.createStorage(analytics) as StorageImpl
+        storage = InMemoryStorageProvider().createStorage(analytics) as StorageImpl
         storage.initialize()
     }
 

samples/kotlin-android-app/src/main/java/com/segment/analytics/next/EncryptedEventStream.kt

@@ -58,15 +58,14 @@ class EncryptedEventStream(
     }
 }
 
-object EncryptedStorageProvider : StorageProvider {
+class EncryptedStorageProvider(val key: Key) : StorageProvider {
 
     override fun createStorage(vararg params: Any): Storage {
-        if (params.isEmpty() || params[0] !is Analytics || params[1] !is Key) {
+        if (params.isEmpty() || params[0] !is Analytics) {
             throw IllegalArgumentException("Invalid parameters for ConcreteStorageProvider. ConcreteStorageProvider requires at least 1 parameter and the first argument has to be an instance of Analytics")
         }
 
         val analytics = params[0] as Analytics
-        val key = params[1] as Key
         val config = analytics.configuration
 
         val directory = File("/tmp/analytics-kotlin/${config.writeKey}")