From 221e8272d7c0ce6f2b9796398386403a1eda83fd Mon Sep 17 00:00:00 2001
From: Evgenii Kozlov <ubuphobos@gmail.com>
Date: Wed, 18 Sep 2024 16:06:18 +0200
Subject: [PATCH] DROID-2731 Vault | Tech | Fix gateway provider (#1571)

---
 .../main/java/com/anytypeio/anytype/di/main/ConfigModule.kt | 5 ++---
 .../anytype/data/auth/repo/config/GatewayProvider.kt        | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/anytypeio/anytype/di/main/ConfigModule.kt b/app/src/main/java/com/anytypeio/anytype/di/main/ConfigModule.kt
index 804c2dc1da..1c7b40c6b3 100644
--- a/app/src/main/java/com/anytypeio/anytype/di/main/ConfigModule.kt
+++ b/app/src/main/java/com/anytypeio/anytype/di/main/ConfigModule.kt
@@ -6,7 +6,6 @@ import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.config.ConfigStorage
 import com.anytypeio.anytype.domain.config.Gateway
 import com.anytypeio.anytype.domain.debugging.Logger
-import com.anytypeio.anytype.domain.workspace.SpaceManager
 import dagger.Module
 import dagger.Provides
 import javax.inject.Named
@@ -22,10 +21,10 @@ object ConfigModule {
     @Provides
     @Singleton
     fun provideGateway(
-        spaceManager: SpaceManager,
+        configStorage: ConfigStorage,
         logger: Logger
     ): Gateway = GatewayProvider(
-        spaceManager = spaceManager,
+        configStorage = configStorage,
         logger = logger
     )
 
diff --git a/data/src/main/java/com/anytypeio/anytype/data/auth/repo/config/GatewayProvider.kt b/data/src/main/java/com/anytypeio/anytype/data/auth/repo/config/GatewayProvider.kt
index bc3ddf5a1b..9e9b30771f 100644
--- a/data/src/main/java/com/anytypeio/anytype/data/auth/repo/config/GatewayProvider.kt
+++ b/data/src/main/java/com/anytypeio/anytype/data/auth/repo/config/GatewayProvider.kt
@@ -1,15 +1,15 @@
 package com.anytypeio.anytype.data.auth.repo.config
 
+import com.anytypeio.anytype.domain.config.ConfigStorage
 import com.anytypeio.anytype.domain.config.Gateway
 import com.anytypeio.anytype.domain.debugging.Logger
-import com.anytypeio.anytype.domain.workspace.SpaceManager
 
 class GatewayProvider(
-    private val spaceManager: SpaceManager,
+    private val configStorage: ConfigStorage,
     private val logger: Logger
 ) : Gateway {
     override fun provide(): String {
-        val gateway = spaceManager.getConfig()?.gateway
+        val gateway = configStorage.getOrNull()?.gateway
         if (gateway == null) {
             logger.logException(IllegalStateException("Gateway not found"))
         }