From d5e0ebee12cc427a16b586dd8deadc008a5e20c8 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 30 Jul 2024 17:44:05 -0500 Subject: [PATCH] Remove unused Json object from VaultRepository (#3653) --- .../bitwarden/data/vault/repository/VaultRepositoryImpl.kt | 2 -- .../data/vault/repository/di/VaultRepositoryModule.kt | 3 --- .../bitwarden/data/vault/repository/VaultRepositoryTest.kt | 4 ---- 3 files changed, 9 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index 3d6a260dbf..6da5287059 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -108,7 +108,6 @@ import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import kotlinx.serialization.json.Json import retrofit2.HttpException import java.time.Clock import java.time.temporal.ChronoUnit @@ -139,7 +138,6 @@ class VaultRepositoryImpl( private val userLogoutManager: UserLogoutManager, pushManager: PushManager, private val clock: Clock, - private val json: Json, dispatcherManager: DispatcherManager, ) : VaultRepository, CipherManager by cipherManager, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt index c470af964a..39486a5a66 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt @@ -21,7 +21,6 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import kotlinx.serialization.json.Json import java.time.Clock import javax.inject.Singleton @@ -51,7 +50,6 @@ object VaultRepositoryModule { pushManager: PushManager, userLogoutManager: UserLogoutManager, clock: Clock, - json: Json, ): VaultRepository = VaultRepositoryImpl( syncService = syncService, sendsService = sendsService, @@ -69,6 +67,5 @@ object VaultRepositoryModule { pushManager = pushManager, userLogoutManager = userLogoutManager, clock = clock, - json = json, ) } diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 3e9308823d..b5ae8efb42 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -25,7 +25,6 @@ import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.di.PlatformNetworkModule import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherDeleteData @@ -117,7 +116,6 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.update import kotlinx.coroutines.test.runTest -import kotlinx.serialization.json.Json import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue @@ -140,7 +138,6 @@ class VaultRepositoryTest { Instant.parse("2023-10-27T12:00:00Z"), ZoneOffset.UTC, ) - private val json: Json = PlatformNetworkModule.providesJson() private val dispatcherManager: DispatcherManager = FakeDispatcherManager() private val userLogoutManager: UserLogoutManager = mockk { every { logout(any(), any()) } just runs @@ -226,7 +223,6 @@ class VaultRepositoryTest { fileManager = fileManager, clock = clock, userLogoutManager = userLogoutManager, - json = json, ) @BeforeEach