Merge pull request #1068 from WalletConnect/revert/checks_for_chat_and_push_initialization

Author: Elyniss

protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatProtocol.kt

@@ -26,25 +26,21 @@ internal class ChatProtocol(private val koinApp: KoinApplication = wcKoinApp) :
 
     @Throws(IllegalStateException::class)
     override fun initialize(init: Chat.Params.Init, onError: (Chat.Model.Error) -> Unit) {
-        if (!::chatEngine.isInitialized) {
-            try {
-                koinApp.run {
-                    modules(
-                        jsonRpcModule(),
-                        storageModule(koinApp.koin.get<DatabaseConfig>().CHAT_SDK_DB_NAME),
-                        syncInChatModule(),
-                        engineModule(),
-                        commonModule()
-                    )
-                }
-
-                chatEngine = koinApp.koin.get()
-                chatEngine.setup()
-            } catch (e: Exception) {
-                onError(Chat.Model.Error(e))
+        try {
+            koinApp.run {
+                modules(
+                    jsonRpcModule(),
+                    storageModule(koinApp.koin.get<DatabaseConfig>().CHAT_SDK_DB_NAME),
+                    syncInChatModule(),
+                    engineModule(),
+                    commonModule()
+                )
             }
-        } else {
-            onError(Chat.Model.Error(IllegalStateException("ChatClient already initialized")))
+
+            chatEngine = koinApp.koin.get()
+            chatEngine.setup()
+        } catch (e: Exception) {
+            onError(Chat.Model.Error(e))
         }
     }
 

protocol/push/src/main/kotlin/com/walletconnect/push/client/PushWalletProtocol.kt

@@ -32,25 +32,21 @@ class PushWalletProtocol(private val koinApp: KoinApplication = wcKoinApp) : Pus
     }
 
     override fun initialize(init: Push.Params.Init, onError: (Push.Model.Error) -> Unit) {
-        if (::pushWalletEngine.isInitialized) {
-            try {
-                koinApp.modules(
-                    pushJsonRpcModule(),
-                    pushStorageModule(koinApp.koin.get<DatabaseConfig>().PUSH_WALLET_SDK_DB_NAME),
-                    syncInPushModule(),
-                    walletEngineModule(),
-                    messageModule(),
-                    commonModule(),
-                    pushEngineUseCaseModules()
-                )
-
-                pushWalletEngine = koinApp.koin.get()
-                runBlocking(scope.coroutineContext) { pushWalletEngine.setup() }
-            } catch (e: Exception) {
-                onError(Push.Model.Error(e))
-            }
-        } else {
-            onError(Push.Model.Error(IllegalStateException("PushWalletClient already initialized")))
+        try {
+            koinApp.modules(
+                pushJsonRpcModule(),
+                pushStorageModule(koinApp.koin.get<DatabaseConfig>().PUSH_WALLET_SDK_DB_NAME),
+                syncInPushModule(),
+                walletEngineModule(),
+                messageModule(),
+                commonModule(),
+                pushEngineUseCaseModules()
+            )
+
+            pushWalletEngine = koinApp.koin.get()
+            runBlocking(scope.coroutineContext) { pushWalletEngine.setup() }
+        } catch (e: Exception) {
+            onError(Push.Model.Error(e))
         }
     }