bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-13 04:42:51 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

[PM-20071] Migrate FoldersApi to network module (#5023)

Browse Source
This commit is contained in:
Patrick Honkonen 2025-04-10 18:30:25 -04:00 committed by GitHub
parent 392695cb54
commit 2fd5ab6f8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderService.kt
View File

@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.vault.datasource.network.service package com.x8bit.bitwarden.data.vault.datasource.network.service
import com.bitwarden.network.model.FolderJsonRequest
import com.bitwarden.network.model.SyncResponseJson 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 import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson
/** /**

4
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FolderServiceImpl.kt
View File

@ -1,12 +1,12 @@
package com.x8bit.bitwarden.data.vault.datasource.network.service 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.SyncResponseJson
import com.bitwarden.network.model.toBitwardenError import com.bitwarden.network.model.toBitwardenError
import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.NetworkErrorCode
import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.parseErrorBodyOrNull
import com.bitwarden.network.util.toResult 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 com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json

2
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt
View File

@ -1,10 +1,10 @@
package com.x8bit.bitwarden.data.vault.repository.util package com.x8bit.bitwarden.data.vault.repository.util
import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator
import com.bitwarden.network.model.FolderJsonRequest
import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.SyncResponseJson
import com.bitwarden.vault.Folder import com.bitwarden.vault.Folder
import com.bitwarden.vault.FolderView 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 * Converts a list of [SyncResponseJson.Folder] objects to a list of corresponding

4
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt
View File

@ -1,9 +1,9 @@
package com.x8bit.bitwarden.data.vault.datasource.network.service 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.base.BaseServiceTest
import com.bitwarden.network.model.FolderJsonRequest
import com.bitwarden.network.model.SyncResponseJson 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 com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse

2
app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
View File

@ -15,6 +15,7 @@ import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager
import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.data.manager.DispatcherManager
import com.bitwarden.exporters.ExportFormat import com.bitwarden.exporters.ExportFormat
import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.fido.Fido2CredentialAutofillView
import com.bitwarden.network.model.FolderJsonRequest
import com.bitwarden.network.model.SendTypeJson import com.bitwarden.network.model.SendTypeJson
import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.SyncResponseJson
import com.bitwarden.network.model.createMockCipher 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.disk.VaultDiskSource
import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateFileSendResponse 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.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.UpdateFolderResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson 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.CiphersService

2
app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensionsTest.kt
View File

@ -1,7 +1,7 @@
package com.x8bit.bitwarden.data.vault.repository.util package com.x8bit.bitwarden.data.vault.repository.util
import com.bitwarden.network.model.FolderJsonRequest
import com.bitwarden.network.model.createMockFolder 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.createMockFolderView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFolder import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSdkFolder
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals

4
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/api/FoldersApi.kt → network/src/main/kotlin/com/bitwarden/network/api/FoldersApi.kt
View File

@ -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.NetworkResult
import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.SyncResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.FolderJsonRequest
import retrofit2.http.Body import retrofit2.http.Body
import retrofit2.http.DELETE import retrofit2.http.DELETE
import retrofit2.http.GET import retrofit2.http.GET

2
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/FolderJsonRequest.kt → network/src/main/kotlin/com/bitwarden/network/model/FolderJsonRequest.kt
View File

@ -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.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable