diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt index a16d9db5f5..c5b28631e4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt @@ -8,9 +8,9 @@ import com.bitwarden.network.service.FolderService import com.bitwarden.network.service.FolderServiceImpl import com.bitwarden.network.service.SendsService import com.bitwarden.network.service.SendsServiceImpl +import com.bitwarden.network.service.SyncService +import com.bitwarden.network.service.SyncServiceImpl import com.x8bit.bitwarden.data.platform.datasource.network.retrofit.Retrofits -import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService -import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncServiceImpl import dagger.Module import dagger.Provides import dagger.hilt.InstallIn 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 0c2f023f4f..cd00ac65a2 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 @@ -24,6 +24,7 @@ import com.bitwarden.network.model.UpdateSendResponseJson import com.bitwarden.network.service.CiphersService import com.bitwarden.network.service.FolderService import com.bitwarden.network.service.SendsService +import com.bitwarden.network.service.SyncService import com.bitwarden.network.util.isNoConnectionError import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.Send @@ -54,7 +55,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncSendUpsertData import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAndLoggedIn import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAndUnlocked import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.manager.CipherManager import com.x8bit.bitwarden.data.vault.manager.FileManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt index 5e871d54d1..35fba40162 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt @@ -4,6 +4,7 @@ import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.CiphersService import com.bitwarden.network.service.FolderService import com.bitwarden.network.service.SendsService +import com.bitwarden.network.service.SyncService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.platform.manager.DatabaseSchemeManager import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource -import com.x8bit.bitwarden.data.vault.datasource.network.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.manager.CipherManager import com.x8bit.bitwarden.data.vault.manager.FileManager 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 964b1189d1..d57833b152 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 @@ -37,6 +37,7 @@ import com.bitwarden.network.model.createMockSyncResponse import com.bitwarden.network.service.CiphersService import com.bitwarden.network.service.FolderService import com.bitwarden.network.service.SendsService +import com.bitwarden.network.service.SyncService import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.send.SendType import com.bitwarden.send.SendView @@ -65,7 +66,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncSendDeleteData 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.service.SyncService import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt b/network/src/main/kotlin/com/bitwarden/network/service/SyncService.kt similarity index 87% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt rename to network/src/main/kotlin/com/bitwarden/network/service/SyncService.kt index 558c6ea627..917bb7ead3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncService.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/SyncService.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.model.SyncResponseJson diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt b/network/src/main/kotlin/com/bitwarden/network/service/SyncServiceImpl.kt similarity index 87% rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt rename to network/src/main/kotlin/com/bitwarden/network/service/SyncServiceImpl.kt index af7c461a32..e7a94925b4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceImpl.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/SyncServiceImpl.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.SyncApi import com.bitwarden.network.model.SyncResponseJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt b/network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt similarity index 99% rename from app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt rename to network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt index 11e159a695..b6df398521 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt +++ b/network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.vault.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.SyncApi import com.bitwarden.network.base.BaseServiceTest