From cb932bda640f5ea7d4bae295a95ffab09defccab Mon Sep 17 00:00:00 2001 From: Ramsey Smith <142836716+ramsey-livefront@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:29:27 -0700 Subject: [PATCH] Update package name for CipherJsonRequest (#317) --- .../data/vault/datasource/network/api/CiphersApi.kt | 2 +- .../data/vault/datasource/network/model/CipherJsonRequest.kt | 5 ++--- .../data/vault/datasource/network/service/CiphersService.kt | 2 +- .../vault/datasource/network/service/CiphersServiceImpl.kt | 2 +- .../data/vault/repository/util/VaultSdkCipherExtensions.kt | 2 +- .../vault/datasource/network/model/CipherJsonRequestUtil.kt | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt index bf00fcc6f0..f5a6b27006 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/CiphersApi.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.api -import CipherJsonRequest +import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson import retrofit2.http.Body import retrofit2.http.POST diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt index a7fedf328a..64d5583ac8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequest.kt @@ -1,6 +1,5 @@ -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherRepromptTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherTypeJson -import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson +package com.x8bit.bitwarden.data.vault.datasource.network.model + import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt index acb88aaa5a..74eae02efb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service -import CipherJsonRequest +import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt index d25f939332..1d0bc059b8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service -import CipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi +import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson class CiphersServiceImpl constructor( diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt index be405be9a1..42a40ac8a1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt @@ -2,7 +2,6 @@ package com.x8bit.bitwarden.data.vault.repository.util -import CipherJsonRequest import com.bitwarden.core.Attachment import com.bitwarden.core.Card import com.bitwarden.core.Cipher @@ -17,6 +16,7 @@ import com.bitwarden.core.PasswordHistory import com.bitwarden.core.SecureNote import com.bitwarden.core.SecureNoteType import com.bitwarden.core.UriMatchType +import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherRepromptTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.CipherTypeJson import com.x8bit.bitwarden.data.vault.datasource.network.model.FieldTypeJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt index c2e61b197e..213ddd381f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/CipherJsonRequestUtil.kt @@ -1,6 +1,5 @@ package com.x8bit.bitwarden.data.vault.datasource.network.model -import CipherJsonRequest import java.time.LocalDateTime /**