From 548c9ee092c9a3b22de0ca143d411b686adba409 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:55:50 -0400 Subject: [PATCH] [PM-20194] Migrate FolderService and related models to network module (#5054) --- .../data/vault/datasource/network/di/VaultNetworkModule.kt | 4 ++-- .../bitwarden/data/vault/repository/VaultRepositoryImpl.kt | 4 ++-- .../data/vault/repository/di/VaultRepositoryModule.kt | 2 +- .../bitwarden/data/vault/repository/VaultRepositoryTest.kt | 4 ++-- .../com/bitwarden}/network/model/UpdateFolderResponseJson.kt | 3 +-- .../kotlin/com/bitwarden}/network/service/FolderService.kt | 4 ++-- .../com/bitwarden}/network/service/FolderServiceImpl.kt | 4 ++-- .../com/bitwarden}/network/service/FoldersServiceTest.kt | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) rename {app/src/main/java/com/x8bit/bitwarden/data/vault/datasource => network/src/main/kotlin/com/bitwarden}/network/model/UpdateFolderResponseJson.kt (89%) rename {app/src/main/java/com/x8bit/bitwarden/data/vault/datasource => network/src/main/kotlin/com/bitwarden}/network/service/FolderService.kt (83%) rename {app/src/main/java/com/x8bit/bitwarden/data/vault/datasource => network/src/main/kotlin/com/bitwarden}/network/service/FolderServiceImpl.kt (91%) rename {app/src/test/java/com/x8bit/bitwarden/data/vault/datasource => network/src/test/kotlin/com/bitwarden}/network/service/FoldersServiceTest.kt (95%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt index ac2dfd5763..f2fc59ac64 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.network.di +import com.bitwarden.network.service.FolderService +import com.bitwarden.network.service.FolderServiceImpl import com.x8bit.bitwarden.data.platform.datasource.network.retrofit.Retrofits import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersServiceImpl import com.x8bit.bitwarden.data.vault.datasource.network.service.DownloadService import com.x8bit.bitwarden.data.vault.datasource.network.service.DownloadServiceImpl -import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService -import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderServiceImpl import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsService import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsServiceImpl import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService 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 ff4c79f4f0..a492a7f40a 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 @@ -17,6 +17,8 @@ import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateFolderResponseJson +import com.bitwarden.network.service.FolderService import com.bitwarden.network.util.isNoConnectionError import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.Send @@ -49,10 +51,8 @@ import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAn import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService -import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsService import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource 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 9e8b244054..cda6840489 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 @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.di import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.network.service.FolderService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource @@ -9,7 +10,6 @@ import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService -import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsService import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource 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 5efb790390..e767b6b82f 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 @@ -18,6 +18,7 @@ import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SendTypeJson import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateFolderResponseJson import com.bitwarden.network.model.createMockCipher import com.bitwarden.network.model.createMockCollection import com.bitwarden.network.model.createMockDomains @@ -30,6 +31,7 @@ import com.bitwarden.network.model.createMockProfile import com.bitwarden.network.model.createMockSend import com.bitwarden.network.model.createMockSendJsonRequest import com.bitwarden.network.model.createMockSyncResponse +import com.bitwarden.network.service.FolderService import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.SendType import com.bitwarden.send.SendView @@ -60,10 +62,8 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService -import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService import com.x8bit.bitwarden.data.vault.datasource.network.service.SendsService import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/UpdateFolderResponseJson.kt similarity index 89% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/UpdateFolderResponseJson.kt index a6f6d9a9c7..74d7841dd7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/UpdateFolderResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/UpdateFolderResponseJson.kt @@ -1,6 +1,5 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model -import com.bitwarden.network.model.SyncResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt b/network/src/main/kotlin/com/bitwarden/network/service/FolderService.kt similarity index 83% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt rename to network/src/main/kotlin/com/bitwarden/network/service/FolderService.kt index 7b47367734..668e94ea9e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/FolderService.kt @@ -1,8 +1,8 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson +import com.bitwarden.network.model.UpdateFolderResponseJson /** * Provides an API for querying folder endpoints. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt b/network/src/main/kotlin/com/bitwarden/network/service/FolderServiceImpl.kt similarity index 91% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt rename to network/src/main/kotlin/com/bitwarden/network/service/FolderServiceImpl.kt index 2d34a2af29..65e859018b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/FolderServiceImpl.kt @@ -1,13 +1,13 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.FoldersApi import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.UpdateFolderResponseJson import com.bitwarden.network.model.toBitwardenError import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.toResult -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import kotlinx.serialization.json.Json class FolderServiceImpl( diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt b/network/src/test/kotlin/com/bitwarden/network/service/FoldersServiceTest.kt similarity index 95% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt rename to network/src/test/kotlin/com/bitwarden/network/service/FoldersServiceTest.kt index 008b54c64a..b5b065f2f2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt +++ b/network/src/test/kotlin/com/bitwarden/network/service/FoldersServiceTest.kt @@ -1,10 +1,10 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.FoldersApi import com.bitwarden.network.base.BaseServiceTest import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson +import com.bitwarden.network.model.UpdateFolderResponseJson import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals