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 988eeac806..8b59dcfc20 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 @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import androidx.core.net.toUri import com.bitwarden.core.data.util.asFailure +import com.bitwarden.network.api.AzureApi 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.bitwarden.vault.Attachment -import com.x8bit.bitwarden.data.vault.datasource.network.api.AzureApi import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.AttachmentJsonResponse diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt index 289b68f13f..9d4e71574b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceImpl.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import androidx.core.net.toUri +import com.bitwarden.network.api.AzureApi 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.AzureApi import com.x8bit.bitwarden.data.vault.datasource.network.api.SendsApi import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponseJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt index 217e5e2da1..002194a7e5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import android.net.Uri +import com.bitwarden.network.api.AzureApi import com.bitwarden.network.base.BaseServiceTest -import com.x8bit.bitwarden.data.vault.datasource.network.api.AzureApi import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest import com.x8bit.bitwarden.data.vault.datasource.network.model.FileUploadType diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt index 43cc366332..51b65faffe 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.vault.datasource.network.service import android.net.Uri +import com.bitwarden.network.api.AzureApi import com.bitwarden.network.base.BaseServiceTest -import com.x8bit.bitwarden.data.vault.datasource.network.api.AzureApi import com.x8bit.bitwarden.data.vault.datasource.network.api.SendsApi import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateSendJsonResponse diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/AzureApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/AzureApi.kt similarity index 91% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/AzureApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/AzureApi.kt index 0f0efb4739..60c1266770 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/AzureApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/AzureApi.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.api +package com.bitwarden.network.api import com.bitwarden.network.model.NetworkResult import okhttp3.RequestBody