From 1db2a25f4b250bbf31097034c3d9e37123dfa559 Mon Sep 17 00:00:00 2001 From: David Perez Date: Wed, 17 Jan 2024 15:28:11 -0600 Subject: [PATCH] Rename createSend to createTextSend (#647) --- .../data/vault/datasource/network/api/SendsApi.kt | 4 ++-- .../data/vault/datasource/network/service/SendsService.kt | 4 ++-- .../vault/datasource/network/service/SendsServiceImpl.kt | 4 ++-- .../data/vault/repository/VaultRepositoryImpl.kt | 2 +- .../vault/datasource/network/service/SendsServiceTest.kt | 4 ++-- .../data/vault/repository/VaultRepositoryTest.kt | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt index 801604e9aa..c97f86c469 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/SendsApi.kt @@ -18,10 +18,10 @@ import retrofit2.http.Path interface SendsApi { /** - * Create a send. + * Create a text send. */ @POST("sends") - suspend fun createSend(@Body body: SendJsonRequest): Result + suspend fun createTextSend(@Body body: SendJsonRequest): Result /** * Create a file send. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt index 8cdc0e4d52..a024fdb8fc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsService.kt @@ -10,9 +10,9 @@ import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendRespons */ interface SendsService { /** - * Attempt to create a send. + * Attempt to create a text send. */ - suspend fun createSend( + suspend fun createTextSend( body: SendJsonRequest, ): Result 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 5cdc238f03..6464da4c23 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 @@ -27,8 +27,8 @@ class SendsServiceImpl( private val clock: Clock, private val json: Json, ) : SendsService { - override suspend fun createSend(body: SendJsonRequest): Result = - sendsApi.createSend(body = body) + override suspend fun createTextSend(body: SendJsonRequest): Result = + sendsApi.createTextSend(body = body) override suspend fun createFileSend(body: SendJsonRequest): Result = sendsApi.createFileSend(body = body) 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 86e1154dbf..ed5966f21b 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 @@ -433,7 +433,7 @@ class VaultRepositoryImpl( .flatMap { send -> when (send.type) { SendType.TEXT -> { - sendsService.createSend(body = send.toEncryptedNetworkSend()) + sendsService.createTextSend(body = send.toEncryptedNetworkSend()) } SendType.FILE -> { 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 6eb656178c..6c51ce8f26 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 @@ -64,9 +64,9 @@ class SendsServiceTest : BaseServiceTest() { } @Test - fun `createSend should return the correct response`() = runTest { + fun `createTextSend should return the correct response`() = runTest { server.enqueue(MockResponse().setBody(CREATE_UPDATE_SEND_SUCCESS_JSON)) - val result = sendsService.createSend( + val result = sendsService.createTextSend( body = createMockSendJsonRequest(number = 1, type = SendTypeJson.TEXT), ) assertEquals( 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 f787a0efca..4a1bab27b6 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 @@ -1589,7 +1589,7 @@ class VaultRepositoryTest { @Test @Suppress("MaxLineLength") - fun `createSend with TEXT and sendsService createSend failure should return CreateSendResult failure`() = + fun `createSend with TEXT and sendsService createTextSend failure should return CreateSendResult failure`() = runTest { fakeAuthDiskSource.userState = MOCK_USER_STATE val userId = "mockId-1" @@ -1598,7 +1598,7 @@ class VaultRepositoryTest { vaultSdkSource.encryptSend(userId = userId, sendView = mockSendView) } returns createMockSdkSend(number = 1, type = SendType.TEXT).asSuccess() coEvery { - sendsService.createSend( + sendsService.createTextSend( body = createMockSendJsonRequest(number = 1, type = SendTypeJson.TEXT) .copy(fileLength = null), ) @@ -1611,7 +1611,7 @@ class VaultRepositoryTest { @Suppress("MaxLineLength") @Test - fun `createSend with TEXT and sendsService createSend success should return CreateSendResult success`() = + fun `createSend with TEXT and sendsService createTextSend success should return CreateSendResult success`() = runTest { fakeAuthDiskSource.userState = MOCK_USER_STATE val userId = "mockId-1" @@ -1623,7 +1623,7 @@ class VaultRepositoryTest { vaultSdkSource.encryptSend(userId = userId, sendView = mockSendView) } returns mockSdkSend.asSuccess() coEvery { - sendsService.createSend( + sendsService.createTextSend( body = createMockSendJsonRequest(number = 1, type = SendTypeJson.TEXT) .copy(fileLength = null), )