diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt index 52ec4c92fb..7b47367734 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service +import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt index efa404b40e..2d34a2af29 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.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.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.api.FoldersApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import kotlinx.serialization.json.Json diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt index 14f526fe50..7ee1efee90 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.vault.repository.util import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.vault.Folder import com.bitwarden.vault.FolderView -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest /** * Converts a list of [SyncResponseJson.Folder] objects to a list of corresponding diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt index b7a55352e2..008b54c64a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.datasource.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.api.FoldersApi -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse 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 ea9ff6a982..5efb790390 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 @@ -15,6 +15,7 @@ import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat 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.createMockCipher @@ -59,7 +60,6 @@ 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.FolderJsonRequest 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 diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt index 9fb0e15b46..c5113b771e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.repository.util +import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.createMockFolder -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFolder import org.junit.Assert.assertEquals diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/FoldersApi.kt similarity index 88% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/FoldersApi.kt index 42d736a908..9e02920f49 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/FoldersApi.kt @@ -1,8 +1,8 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.api +package com.bitwarden.network.api +import com.bitwarden.network.model.FolderJsonRequest import com.bitwarden.network.model.NetworkResult import com.bitwarden.network.model.SyncResponseJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FolderJsonRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/FolderJsonRequest.kt similarity index 80% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FolderJsonRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/FolderJsonRequest.kt index 37a02fcb92..05bef13a07 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FolderJsonRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/FolderJsonRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable