From 2176b61cd33631c3f7c1697d097bd3f39e117324 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:16:04 -0400 Subject: [PATCH] [PM-19905] Migrate DispatcherManager to `data` module (#4999) --- .../AuthRequestNotificationManagerImpl.kt | 2 +- .../auth/manager/UserLogoutManagerImpl.kt | 2 +- .../data/auth/manager/di/AuthManagerModule.kt | 2 +- .../auth/repository/AuthRepositoryImpl.kt | 2 +- .../repository/di/AuthRepositoryModule.kt | 2 +- .../accessibility/di/AccessibilityModule.kt | 2 +- .../AccessibilityCompletionManagerImpl.kt | 2 +- .../data/autofill/di/AutofillModule.kt | 2 +- .../autofill/fido2/di/Fido2ProviderModule.kt | 2 +- .../processor/Fido2ProviderProcessorImpl.kt | 2 +- .../manager/AutofillCompletionManagerImpl.kt | 2 +- .../processor/AutofillProcessorImpl.kt | 2 +- .../datasource/disk/EventDiskSourceImpl.kt | 2 +- .../datasource/disk/di/PlatformDiskModule.kt | 2 +- .../data/platform/manager/AssetManagerImpl.kt | 2 +- .../manager/FirstTimeActionManagerImpl.kt | 2 +- .../data/platform/manager/PushManagerImpl.kt | 2 +- .../manager/SpecialCircumstanceManagerImpl.kt | 2 +- .../di/ActivityPlatformManagerModule.kt | 2 +- .../manager/di/PlatformManagerModule.kt | 4 +- .../manager/dispatcher/DispatcherManager.kt | 29 --------------- .../dispatcher/DispatcherManagerImpl.kt | 18 --------- .../event/OrganizationEventManagerImpl.kt | 2 +- .../garbage/GarbageCollectionManagerImpl.kt | 2 +- .../network/NetworkConfigManagerImpl.kt | 2 +- .../restriction/RestrictionManagerImpl.kt | 2 +- .../AuthenticatorBridgeProcessorImpl.kt | 2 +- .../repository/EnvironmentRepositoryImpl.kt | 2 +- .../repository/ServerConfigRepositoryImpl.kt | 2 +- .../repository/SettingsRepositoryImpl.kt | 2 +- .../repository/di/PlatformRepositoryModule.kt | 2 +- .../repository/GeneratorRepositoryImpl.kt | 2 +- .../di/GeneratorRepositoryModule.kt | 2 +- .../datasource/disk/VaultDiskSourceImpl.kt | 2 +- .../datasource/disk/di/VaultDiskModule.kt | 2 +- .../datasource/sdk/VaultSdkSourceImpl.kt | 2 +- .../vault/datasource/sdk/di/VaultSdkModule.kt | 2 +- .../data/vault/manager/FileManagerImpl.kt | 2 +- .../data/vault/manager/TotpCodeManagerImpl.kt | 2 +- .../vault/manager/VaultLockManagerImpl.kt | 2 +- .../vault/manager/di/VaultManagerModule.kt | 2 +- .../vault/repository/VaultRepositoryImpl.kt | 2 +- .../repository/di/VaultRepositoryModule.kt | 2 +- .../com/x8bit/bitwarden/MainViewModelTest.kt | 2 +- .../auth/manager/UserLogoutManagerTest.kt | 2 +- .../auth/repository/AuthRepositoryTest.kt | 4 +- .../AccessibilityCompletionManagerTest.kt | 2 +- .../processor/Fido2ProviderProcessorTest.kt | 4 +- .../manager/AutofillCompletionManagerTest.kt | 2 +- .../processor/AutofillProcessorTest.kt | 2 +- .../datasource/disk/EventDiskSourceTest.kt | 2 +- .../manager/FirstTimeActionManagerTest.kt | 2 +- .../data/platform/manager/PushManagerTest.kt | 4 +- .../manager/SpecialCircumstanceManagerTest.kt | 2 +- .../event/OrganizationEventManagerTest.kt | 2 +- .../garbage/GarbageCollectionManagerTest.kt | 2 +- .../network/NetworkConfigManagerTest.kt | 4 +- .../restriction/RestrictionManagerTest.kt | 2 +- .../AuthenticatorBridgeProcessorTest.kt | 2 +- .../repository/EnvironmentRepositoryTest.kt | 4 +- .../repository/ServerConfigRepositoryTest.kt | 4 +- .../repository/SettingsRepositoryTest.kt | 2 +- .../repository/GeneratorRepositoryTest.kt | 2 +- .../datasource/disk/VaultDiskSourceTest.kt | 2 +- .../datasource/sdk/VaultSdkSourceTest.kt | 2 +- .../data/vault/manager/TotpCodeManagerTest.kt | 4 +- .../vault/manager/VaultLockManagerTest.kt | 2 +- .../vault/repository/VaultRepositoryTest.kt | 4 +- .../CompleteRegistrationViewModelTest.kt | 2 +- .../feature/rootnav/RootNavViewModelTest.kt | 2 +- .../feature/search/SearchViewModelTest.kt | 2 +- .../addedit/VaultAddEditViewModelTest.kt | 2 +- .../VaultItemListingViewModelTest.kt | 2 +- .../authenticator/manager/FileManagerImpl.kt | 2 +- .../manager/di/AuthenticatorManagerModule.kt | 2 +- .../repository/AuthenticatorRepositoryImpl.kt | 2 +- .../di/AuthenticatorRepositoryModule.kt | 2 +- .../manager/di/PlatformManagerModule.kt | 4 +- .../repository/ServerConfigRepositoryImpl.kt | 2 +- .../repository/SettingsRepositoryImpl.kt | 2 +- .../repository/di/PlatformRepositoryModule.kt | 2 +- .../repository/AuthenticatorRepositoryTest.kt | 4 +- .../platform/base/FakeDispatcherManager.kt | 37 ------------------- .../repository/ServerConfigRepositoryTest.kt | 4 +- .../repository/SettingsRepositoryTest.kt | 2 +- .../data}/manager/DispatcherManager.kt | 2 +- .../data}/manager/DispatcherManagerImpl.kt | 2 +- .../data/manager}/DispatcherManagerTest.kt | 2 +- .../disk}/base/FakeDispatcherManager.kt | 4 +- 89 files changed, 99 insertions(+), 183 deletions(-) delete mode 100644 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManager.kt delete mode 100644 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerImpl.kt delete mode 100644 authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/FakeDispatcherManager.kt rename {authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform => data/src/main/kotlin/com/bitwarden/data}/manager/DispatcherManager.kt (91%) rename {authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform => data/src/main/kotlin/com/bitwarden/data}/manager/DispatcherManagerImpl.kt (89%) rename {app/src/test/java/com/x8bit/bitwarden/data/platform/manager/dispatcher => data/src/test/kotlin/com/bitwarden/data/manager}/DispatcherManagerTest.kt (93%) rename {app/src/test/java/com/x8bit/bitwarden/data/platform => data/src/testFixtures/kotlin/com/bitwarden/data/datasource/disk}/base/FakeDispatcherManager.kt (90%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt index 831119b98b..6749dee919 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt @@ -8,12 +8,12 @@ import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.util.createPasswordlessRequestDataIntent import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag import com.x8bit.bitwarden.data.platform.manager.PushManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt index 82c8d9afd1..ba57f1bb8b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerImpl.kt @@ -4,13 +4,13 @@ import android.content.Context import android.widget.Toast import androidx.annotation.StringRes import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.manager.model.LogoutEvent import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.PasswordHistoryDiskSource import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt index 0b84837ee7..c7957a3ba2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.auth.manager.di import android.content.Context +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService import com.x8bit.bitwarden.data.auth.datasource.network.service.AuthRequestsService @@ -22,7 +23,6 @@ import com.x8bit.bitwarden.data.auth.manager.UserLogoutManagerImpl import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.manager.PushManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.PasswordHistoryDiskSource import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index 585fc31fa5..8cb5540021 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -9,6 +9,7 @@ import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.data.datasource.disk.ConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.RegisterRequestJson import com.bitwarden.network.model.ResendEmailRequestJson import com.bitwarden.network.model.ResendNewDeviceOtpRequestJson @@ -109,7 +110,6 @@ import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.PushManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt index 7b211625e6..505af72995 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.auth.repository.di import com.bitwarden.data.datasource.disk.ConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService @@ -19,7 +20,6 @@ import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.PushManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/di/AccessibilityModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/di/AccessibilityModule.kt index 750399e269..cfe11d45f4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/di/AccessibilityModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/di/AccessibilityModule.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.pm.PackageManager import android.os.PowerManager import android.view.accessibility.AccessibilityManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManager import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManagerImpl import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.autofill.accessibility.parser.AccessibilityParse import com.x8bit.bitwarden.data.autofill.accessibility.processor.BitwardenAccessibilityProcessor import com.x8bit.bitwarden.data.autofill.accessibility.processor.BitwardenAccessibilityProcessorImpl import com.x8bit.bitwarden.data.autofill.manager.AutofillTotpManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerImpl.kt index 07f76ffe14..d19e399aa7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerImpl.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.autofill.accessibility.manager import android.app.Activity +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.autofill.accessibility.model.AccessibilityAction import com.x8bit.bitwarden.data.autofill.accessibility.util.toUriOrNull import com.x8bit.bitwarden.data.autofill.manager.AutofillTotpManager import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.autofill.util.getAutofillSelectionDataOrNull -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/di/AutofillModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/di/AutofillModule.kt index 830d845b71..ce839e5377 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/di/AutofillModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/di/AutofillModule.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.autofill.di import android.content.Context import android.view.autofill.AutofillManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilder import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilderImpl @@ -27,7 +28,6 @@ import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/di/Fido2ProviderModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/di/Fido2ProviderModule.kt index aa14691131..d92aa98957 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/di/Fido2ProviderModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/di/Fido2ProviderModule.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.autofill.fido2.di import android.content.Context import android.os.Build import androidx.annotation.RequiresApi +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.sdk.Fido2CredentialStore import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.autofill.fido2.datasource.network.service.DigitalAssetLinkService @@ -15,7 +16,6 @@ import com.x8bit.bitwarden.data.autofill.fido2.processor.Fido2ProviderProcessorI import com.x8bit.bitwarden.data.platform.manager.AssetManager import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt index 9837abd734..ea48b2323d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorImpl.kt @@ -31,6 +31,7 @@ import androidx.credentials.provider.ProviderClearCredentialStateRequest import androidx.credentials.provider.PublicKeyCredentialEntry import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.takeUntilLoaded +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView @@ -41,7 +42,6 @@ import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt index cac0cb37fb..3ffadd9814 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerImpl.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.autofill.manager import android.app.Activity import android.content.Intent +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilderImpl @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.autofill.util.createAutofillSelectionResultInten import com.x8bit.bitwarden.data.autofill.util.getAutofillAssistStructureOrNull import com.x8bit.bitwarden.data.autofill.util.toAutofillAppInfo import com.x8bit.bitwarden.data.autofill.util.toAutofillCipherProvider -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt index 79cdf437ee..cc0aafb67b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorImpl.kt @@ -5,6 +5,7 @@ import android.service.autofill.FillCallback import android.service.autofill.FillRequest import android.service.autofill.SaveCallback import android.service.autofill.SaveRequest +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilder import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.builder.SaveInfoBuilder @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.autofill.parser.AutofillParser import com.x8bit.bitwarden.data.autofill.util.createAutofillSavedItemIntentSender import com.x8bit.bitwarden.data.autofill.util.toAutofillSaveItem import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt index 1debb07581..9196c8b79b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.datasource.disk +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.OrganizationEventJson import com.bitwarden.network.model.OrganizationEventType import com.x8bit.bitwarden.data.platform.datasource.disk.dao.OrganizationEventDao import com.x8bit.bitwarden.data.platform.datasource.disk.entity.OrganizationEventEntity -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt index 3136d29950..274c8592c2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt @@ -8,6 +8,7 @@ import com.bitwarden.data.datasource.di.EncryptedPreferences import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSourceImpl import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource @@ -27,7 +28,6 @@ import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStor import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigratorImpl import com.x8bit.bitwarden.data.platform.manager.DatabaseSchemeManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.datasource.disk.callback.DatabaseSchemeCallback import com.x8bit.bitwarden.data.vault.datasource.disk.convertor.ZonedDateTimeTypeConverter diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt index a4c53315f9..058cc8cd18 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager import android.content.Context import com.bitwarden.core.annotation.OmitFromCoverage -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.withContext /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt index a7ae6b2a0e..9a8bbdb779 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.manager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.CoachMarkTourType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt index 906690d1fb..7a25eae7e6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.platform.manager import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringOrNull +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.PushTokenRequest import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.BitwardenNotification import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData import com.x8bit.bitwarden.data.platform.manager.model.NotificationPayload diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerImpl.kt index f6eab91b9a..bdaa1a002b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/ActivityPlatformManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/ActivityPlatformManagerModule.kt index 14be661f88..9ed9d3d09a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/ActivityPlatformManagerModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/ActivityPlatformManagerModule.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.manager.di +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt index 277cf8d859..fcc37e33be 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt @@ -3,6 +3,8 @@ package com.x8bit.bitwarden.data.platform.manager.di import android.app.Application import android.content.Context import androidx.core.content.getSystemService +import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.manager.DispatcherManagerImpl import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -50,8 +52,6 @@ import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingMa import com.x8bit.bitwarden.data.platform.manager.ciphermatching.CipherMatchingManagerImpl import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManagerImpl -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManagerImpl import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManagerImpl import com.x8bit.bitwarden.data.platform.manager.garbage.GarbageCollectionManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManager.kt deleted file mode 100644 index b5b3d683c1..0000000000 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManager.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.x8bit.bitwarden.data.platform.manager.dispatcher - -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.MainCoroutineDispatcher - -/** - * An interface for accessing the [CoroutineDispatcher]s. - */ -interface DispatcherManager { - /** - * The default [CoroutineDispatcher] for the app. - */ - val default: CoroutineDispatcher - - /** - * The [MainCoroutineDispatcher] for the app. - */ - val main: MainCoroutineDispatcher - - /** - * The IO [CoroutineDispatcher] for the app. - */ - val io: CoroutineDispatcher - - /** - * The unconfined [CoroutineDispatcher] for the app. - */ - val unconfined: CoroutineDispatcher -} diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerImpl.kt deleted file mode 100644 index 1a13862742..0000000000 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerImpl.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.x8bit.bitwarden.data.platform.manager.dispatcher - -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.MainCoroutineDispatcher - -/** - * Primary implementation of [DispatcherManager]. - */ -class DispatcherManagerImpl : DispatcherManager { - override val default: CoroutineDispatcher = Dispatchers.Default - - override val main: MainCoroutineDispatcher = Dispatchers.Main - - override val io: CoroutineDispatcher = Dispatchers.IO - - override val unconfined: CoroutineDispatcher = Dispatchers.Unconfined -} diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt index 475580d5aa..499b4e827d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt @@ -3,12 +3,12 @@ package com.x8bit.bitwarden.data.platform.manager.event import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.OrganizationEventJson import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.vault.repository.VaultRepository import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerImpl.kt index e048107bdd..7929c4f494 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager.garbage -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerImpl.kt index befd8aa90d..64c3d57d03 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.manager.network +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.datasource.network.authenticator.RefreshAuthenticator -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.ServerConfigRepository import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt index cac5655c4d..a4056610ab 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt @@ -6,8 +6,8 @@ import android.content.Intent import android.content.IntentFilter import android.content.RestrictionsManager import android.os.Bundle +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.AppStateManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorImpl.kt index 97e7c11f15..24f38bcf9b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorImpl.kt @@ -15,9 +15,9 @@ import com.bitwarden.authenticatorbridge.util.decrypt import com.bitwarden.authenticatorbridge.util.encrypt import com.bitwarden.authenticatorbridge.util.toFingerprint import com.bitwarden.authenticatorbridge.util.toSymmetricEncryptionKeyData +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.AuthenticatorBridgeRepository import com.x8bit.bitwarden.data.platform.util.createAddTotpItemFromAuthenticatorIntent diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt index ab0eab4027..b753d86b25 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.repository +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrlsOrDefault diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt index d87619af08..c6d8f14d60 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.x8bit.bitwarden.data.platform.repository import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.datasource.disk.model.ServerConfig +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.ConfigService -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt index c4ae0248f1..fa77ea9ef7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.platform.repository import android.view.autofill.AutofillManager import com.bitwarden.authenticatorbridge.util.generateSecretKey +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.model.BiometricsKeyResult import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequency import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt index a5317f27b0..2f3c4cc6be 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.platform.repository.di import android.view.autofill.AutofillManager import com.bitwarden.data.datasource.disk.ConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.ConfigService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.FeatureFlagOverrideDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.manager.PolicyManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.AuthenticatorBridgeRepository import com.x8bit.bitwarden.data.platform.repository.AuthenticatorBridgeRepositoryImpl import com.x8bit.bitwarden.data.platform.repository.DebugMenuRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt index c17981adbd..056e83c484 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt @@ -2,13 +2,13 @@ package com.x8bit.bitwarden.data.tools.generator.repository +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.generators.PassphraseGeneratorRequest import com.bitwarden.generators.PasswordGeneratorRequest import com.bitwarden.generators.UsernameGeneratorRequest import com.bitwarden.vault.PasswordHistoryView import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.platform.repository.util.observeWhenSubscribedAndLoggedIn import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/di/GeneratorRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/di/GeneratorRepositoryModule.kt index 5985531a67..4e4d3135dc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/di/GeneratorRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/di/GeneratorRepositoryModule.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.tools.generator.repository.di +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.PasswordHistoryDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.sdk.GeneratorSdkSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt index 6e66710256..0adeb0a09f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.vault.datasource.disk import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringWithErrorCallback -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.disk.dao.CiphersDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.CollectionsDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.DomainsDao diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt index 05cffb6c60..8987165cfb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt @@ -2,8 +2,8 @@ package com.x8bit.bitwarden.data.vault.datasource.disk.di import android.app.Application import androidx.room.Room +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.DatabaseSchemeManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSourceImpl import com.x8bit.bitwarden.data.vault.datasource.disk.callback.DatabaseSchemeCallback diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt index e105b611c0..bf33592218 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt @@ -8,6 +8,7 @@ import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.fido.PublicKeyCredentialAuthenticatorAssertionResponse @@ -31,7 +32,6 @@ import com.bitwarden.vault.PasswordHistoryView import com.bitwarden.vault.TotpResponse import com.x8bit.bitwarden.data.platform.datasource.sdk.BaseSdkSource import com.x8bit.bitwarden.data.platform.manager.SdkClientManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2CredentialRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialAuthenticationUserInterfaceImpl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialRegistrationUserInterfaceImpl diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/di/VaultSdkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/di/VaultSdkModule.kt index 6230d1a843..80994af1f1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/di/VaultSdkModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/di/VaultSdkModule.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.di +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.sdk.Fido2CredentialStore import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.manager.SdkClientManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSourceImpl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialStoreImpl diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt index 02f1289486..b1696bed13 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.content.Context import android.net.Uri import com.bitwarden.core.annotation.OmitFromCoverage -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.platform.util.sdkAgnosticTransferTo import com.x8bit.bitwarden.data.vault.datasource.network.service.DownloadService import com.x8bit.bitwarden.data.vault.manager.model.DownloadResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt index fdd01dde42..3acb6e4bd6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt @@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.vault.manager import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherView -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt index 3925f2b68d..121f9ea67b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt @@ -12,6 +12,7 @@ import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.manager.TrustedDeviceManager @@ -23,7 +24,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.userSwitchingChangesFlow import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.AppStateManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.AppCreationState import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.repository.SettingsRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt index e894c3439c..60c0d839bf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.vault.manager.di import android.content.Context +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.manager.TrustedDeviceManager import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.platform.manager.AppStateManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService 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 802f189b3b..d6a989b5c3 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 @@ -13,6 +13,7 @@ import com.bitwarden.core.data.repository.util.updateToPendingOrLoading import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.flatMap +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.network.util.isNoConnectionError @@ -36,7 +37,6 @@ import com.x8bit.bitwarden.data.platform.error.NoActiveUserException 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.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData 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 67a3aa2172..9e8b244054 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 @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.repository.di +import com.bitwarden.data.manager.DispatcherManager 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 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.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.network.service.CiphersService import com.x8bit.bitwarden.data.vault.datasource.network.service.FolderService diff --git a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt index b5ff7ac17e..b0bdcd4993 100644 --- a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt @@ -5,6 +5,7 @@ import android.content.pm.SigningInfo import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManagerImpl @@ -34,7 +35,6 @@ import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.autofill.util.getAutofillSaveItemOrNull import com.x8bit.bitwarden.data.autofill.util.getAutofillSelectionDataOrNull -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.AppResumeManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt index fce3357c4d..d578fdca21 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.auth.manager import android.content.Context import android.widget.Toast import androidx.annotation.StringRes +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.KdfTypeJson import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index d901ea07f8..24fec8ecf5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -15,8 +15,10 @@ import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.datasource.disk.model.ServerConfig import com.bitwarden.data.datasource.disk.util.FakeConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.OrganizationAutoEnrollStatusResponseJson @@ -106,7 +108,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams import com.x8bit.bitwarden.data.auth.repository.util.toUserState import com.x8bit.bitwarden.data.auth.util.YubiKeyResult import com.x8bit.bitwarden.data.auth.util.toSdkParams -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager @@ -114,7 +115,6 @@ import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.PushManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerTest.kt index ad6e82dc98..bcb65d4016 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/accessibility/manager/AccessibilityCompletionManagerTest.kt @@ -3,13 +3,13 @@ package com.x8bit.bitwarden.data.autofill.accessibility.manager import android.app.Activity import android.content.Intent import android.net.Uri +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.autofill.accessibility.model.AccessibilityAction import com.x8bit.bitwarden.data.autofill.accessibility.util.toUriOrNull import com.x8bit.bitwarden.data.autofill.manager.AutofillTotpManager import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.autofill.util.getAutofillSelectionDataOrNull -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt index 9fa3c16afc..9e2e568fec 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt @@ -28,6 +28,8 @@ import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.di.CoreModule +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -35,10 +37,8 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.autofill.fido2.manager.Fido2CredentialManager -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.model.Environment diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt index 6b3c1dc534..e09eb1db8a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillCompletionManagerTest.kt @@ -5,6 +5,7 @@ import android.app.assist.AssistStructure import android.content.Context import android.content.Intent import android.service.autofill.Dataset +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.autofill.util.buildDataset import com.x8bit.bitwarden.data.autofill.util.createAutofillSelectionResultIntent import com.x8bit.bitwarden.data.autofill.util.getAutofillAssistStructureOrNull import com.x8bit.bitwarden.data.autofill.util.toAutofillAppInfo -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt index d132a2fda7..399f2b1886 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/processor/AutofillProcessorTest.kt @@ -10,6 +10,7 @@ import android.service.autofill.FillResponse import android.service.autofill.SaveCallback import android.service.autofill.SaveInfo import android.service.autofill.SaveRequest +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.autofill.builder.FillResponseBuilder import com.x8bit.bitwarden.data.autofill.builder.FilledDataBuilder import com.x8bit.bitwarden.data.autofill.builder.SaveInfoBuilder @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.autofill.model.FilledData import com.x8bit.bitwarden.data.autofill.parser.AutofillParser import com.x8bit.bitwarden.data.autofill.util.createAutofillSavedItemIntentSender import com.x8bit.bitwarden.data.autofill.util.toAutofillSaveItem -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt index 9bf2205d39..02030b2cb4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.datasource.disk import com.bitwarden.core.di.CoreModule +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.OrganizationEventJson import com.bitwarden.network.model.OrganizationEventType -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.dao.FakeOrganizationEventDao import com.x8bit.bitwarden.data.platform.datasource.disk.entity.OrganizationEventEntity import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt index 51846678a5..9ab3b4097a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.KdfTypeJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -9,7 +10,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.util.FakeSettingsDiskSource import com.x8bit.bitwarden.data.platform.manager.model.CoachMarkTourType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt index 78047d7ed6..bd47e2d568 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt @@ -4,18 +4,18 @@ import app.cash.turbine.test import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.di.CoreModule +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.datasource.disk.base.FakeSharedPreferences +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.PushTokenRequest import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSourceImpl import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherDeleteData diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerTest.kt index 24fe1fd328..9524161fa9 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/SpecialCircumstanceManagerTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt index 2408f08dca..cb9c6f1b7d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.platform.manager.event import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.OrganizationEventJson import com.bitwarden.network.model.OrganizationEventType import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource import com.x8bit.bitwarden.data.platform.datasource.network.service.EventService import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerTest.kt index d257613651..8c5307c6e8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/garbage/GarbageCollectionManagerTest.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager.garbage -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import kotlinx.coroutines.test.StandardTestDispatcher import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt index 29fc9ba01c..a046564716 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.manager.network +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.network.authenticator.RefreshAuthenticator -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.ServerConfigRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt index b764f1ae0b..ad739eb21b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.content.Context import android.content.RestrictionsManager import android.os.Bundle +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.manager.util.FakeAppStateManager import com.x8bit.bitwarden.data.platform.repository.model.Environment diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt index fc274a289a..b1f015480b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/processor/AuthenticatorBridgeProcessorTest.kt @@ -18,8 +18,8 @@ import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.authenticatorbridge.util.toFingerprint import com.bitwarden.authenticatorbridge.util.toSymmetricEncryptionKeyData import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManagerImpl -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.AuthenticatorBridgeRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt index 281752a696..818d342769 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.FakeEnvironmentDiskSource -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt index 432e83069a..e1218a4e67 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt @@ -2,14 +2,14 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.datasource.disk.model.ServerConfig import com.bitwarden.data.datasource.disk.util.FakeConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson import com.bitwarden.network.model.ConfigResponseJson.ServerJson import com.bitwarden.network.service.ConfigService -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt index 0ae3b95a5a..50b0f7f0f6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt @@ -7,6 +7,7 @@ import com.bitwarden.core.DerivePinKeyResponse import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.network.model.KdfTypeJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserFingerprintResult import com.x8bit.bitwarden.data.autofill.accessibility.manager.FakeAccessibilityEnabledManager import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManagerImpl -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.util.FakeSettingsDiskSource import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.PolicyManager diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt index ff2ea4b870..ac1be47abe 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.tools.generator.repository import app.cash.turbine.test import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.generators.AppendType import com.bitwarden.generators.ForwarderServiceType import com.bitwarden.generators.PassphraseGeneratorRequest @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorUserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt index 4c483a4d91..afd3a7f815 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.vault.datasource.disk import app.cash.turbine.test import com.bitwarden.core.di.CoreModule -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.util.assertJsonEquals import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCiphersDao import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCollectionsDao diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt index fe4e1e2675..c99d923561 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt @@ -10,6 +10,7 @@ import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.ClientData import com.bitwarden.fido.Fido2CredentialAutofillView @@ -45,7 +46,6 @@ import com.bitwarden.vault.FolderView import com.bitwarden.vault.PasswordHistory import com.bitwarden.vault.PasswordHistoryView import com.bitwarden.vault.TotpResponse -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.SdkClientManager import com.x8bit.bitwarden.data.vault.datasource.sdk.model.AuthenticateFido2CredentialRequest import com.x8bit.bitwarden.data.vault.datasource.sdk.model.Fido2CredentialSearchUserInterfaceImpl diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt index ad18d28587..a40245df00 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerTest.kt @@ -4,10 +4,10 @@ import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.TotpResponse -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockLoginView diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt index 543053ebf4..e7f451f27e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt @@ -10,6 +10,7 @@ import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.HashPurpose +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.auth.manager.model.LogoutEvent import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.AppCreationState import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.manager.util.FakeAppStateManager 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 45d8507cc9..45e6563b6f 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 @@ -11,6 +11,8 @@ import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore @@ -28,14 +30,12 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException 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.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherDeleteData import com.x8bit.bitwarden.data.platform.manager.model.SyncCipherUpsertData import com.x8bit.bitwarden.data.platform.manager.model.SyncFolderDeleteData diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt index 898c7a4386..65f82240a6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.completeregistration import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength.LEVEL_0 @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.PasswordStrengthResult import com.x8bit.bitwarden.data.auth.repository.model.RegisterResult import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt index f50125b187..e71c0f9442 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.platform.feature.rootnav import android.content.pm.SigningInfo +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState @@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.autofill.fido2.model.createMockFido2CredentialAs import com.x8bit.bitwarden.data.autofill.fido2.model.createMockFido2GetCredentialsRequest import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl import com.x8bit.bitwarden.data.platform.manager.model.CompleteRegistrationData diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt index 2c8ebfba2f..6e7ddede86 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import app.cash.turbine.turbineScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySele import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManager import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManagerImpl import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt index f1763baba1..48379fb0d2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt @@ -6,6 +6,7 @@ import app.cash.turbine.test import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.send.SendView import com.bitwarden.vault.CipherView import com.bitwarden.vault.CollectionView @@ -27,7 +28,6 @@ import com.x8bit.bitwarden.data.autofill.fido2.model.UserVerificationRequirement import com.x8bit.bitwarden.data.autofill.fido2.model.createMockFido2CreateCredentialRequest import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt index e2f92d1be4..65253f2b1f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt @@ -6,6 +6,7 @@ import androidx.credentials.provider.CallingAppInfo import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView @@ -34,7 +35,6 @@ import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManager import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManagerImpl import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/FileManagerImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/FileManagerImpl.kt index 821c5ebf64..30e721951a 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/FileManagerImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/FileManagerImpl.kt @@ -2,7 +2,7 @@ package com.bitwarden.authenticator.data.authenticator.manager import android.content.Context import android.net.Uri -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.withContext import java.io.ByteArrayOutputStream diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/di/AuthenticatorManagerModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/di/AuthenticatorManagerModule.kt index 2ee61b4b69..be98c47a71 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/di/AuthenticatorManagerModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/manager/di/AuthenticatorManagerModule.kt @@ -6,7 +6,7 @@ import com.bitwarden.authenticator.data.authenticator.manager.FileManager import com.bitwarden.authenticator.data.authenticator.manager.FileManagerImpl import com.bitwarden.authenticator.data.authenticator.manager.TotpCodeManager import com.bitwarden.authenticator.data.authenticator.manager.TotpCodeManagerImpl -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt index f27c05a3e5..0804a0b35d 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryImpl.kt @@ -16,7 +16,6 @@ import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVer import com.bitwarden.authenticator.data.authenticator.repository.model.TotpCodeResult import com.bitwarden.authenticator.data.authenticator.repository.util.sortAlphabetically import com.bitwarden.authenticator.data.authenticator.repository.util.toAuthenticatorItems -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.imports.ImportManager import com.bitwarden.authenticator.data.platform.manager.imports.model.ImportDataResult @@ -30,6 +29,7 @@ import com.bitwarden.authenticatorbridge.manager.model.AccountSyncState import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.repository.util.map +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.Channel diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorRepositoryModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorRepositoryModule.kt index 8ea96f15e3..2b40c7a87e 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorRepositoryModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorRepositoryModule.kt @@ -5,11 +5,11 @@ import com.bitwarden.authenticator.data.authenticator.manager.FileManager import com.bitwarden.authenticator.data.authenticator.manager.TotpCodeManager import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRepository import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRepositoryImpl -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.imports.ImportManager import com.bitwarden.authenticator.data.platform.repository.SettingsRepository import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager +import com.bitwarden.data.manager.DispatcherManager import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt index 4b7f429104..59fd5e216a 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt @@ -10,8 +10,6 @@ import com.bitwarden.authenticator.data.platform.manager.BitwardenEncodingManage import com.bitwarden.authenticator.data.platform.manager.CrashLogsManager import com.bitwarden.authenticator.data.platform.manager.CrashLogsManagerImpl import com.bitwarden.authenticator.data.platform.manager.DebugMenuFeatureFlagManagerImpl -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager -import com.bitwarden.authenticator.data.platform.manager.DispatcherManagerImpl import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManagerImpl import com.bitwarden.authenticator.data.platform.manager.SdkClientManager @@ -23,6 +21,8 @@ import com.bitwarden.authenticator.data.platform.manager.imports.ImportManagerIm import com.bitwarden.authenticator.data.platform.repository.DebugMenuRepository import com.bitwarden.authenticator.data.platform.repository.ServerConfigRepository import com.bitwarden.authenticator.data.platform.repository.SettingsRepository +import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.manager.DispatcherManagerImpl import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryImpl.kt index 575ea9861e..cab86e1bc1 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryImpl.kt @@ -1,8 +1,8 @@ package com.bitwarden.authenticator.data.platform.repository -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.datasource.disk.model.ServerConfig +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.ConfigService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryImpl.kt index fe559d23c9..ff96f7e55f 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryImpl.kt @@ -5,11 +5,11 @@ import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource import com.bitwarden.authenticator.data.authenticator.datasource.sdk.AuthenticatorSdkSource import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSource import com.bitwarden.authenticator.data.platform.manager.BiometricsEncryptionManager -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.authenticator.data.platform.repository.model.BiometricsKeyResult import com.bitwarden.authenticator.ui.platform.feature.settings.appearance.model.AppLanguage import com.bitwarden.authenticator.ui.platform.feature.settings.appearance.model.AppTheme import com.bitwarden.authenticator.ui.platform.feature.settings.data.model.DefaultSaveOption +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/di/PlatformRepositoryModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/di/PlatformRepositoryModule.kt index 55c0f74249..beb6aa08e8 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/di/PlatformRepositoryModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/di/PlatformRepositoryModule.kt @@ -5,7 +5,6 @@ import com.bitwarden.authenticator.data.authenticator.datasource.sdk.Authenticat import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOverrideDiskSource import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSource import com.bitwarden.authenticator.data.platform.manager.BiometricsEncryptionManager -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.authenticator.data.platform.repository.DebugMenuRepository import com.bitwarden.authenticator.data.platform.repository.DebugMenuRepositoryImpl import com.bitwarden.authenticator.data.platform.repository.ServerConfigRepository @@ -13,6 +12,7 @@ import com.bitwarden.authenticator.data.platform.repository.ServerConfigReposito import com.bitwarden.authenticator.data.platform.repository.SettingsRepository import com.bitwarden.authenticator.data.platform.repository.SettingsRepositoryImpl import com.bitwarden.data.datasource.disk.ConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.ConfigService import dagger.Module import dagger.Provides diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt index 930afd14d3..5a8d3dcf4a 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/authenticator/repository/AuthenticatorRepositoryTest.kt @@ -9,15 +9,15 @@ import com.bitwarden.authenticator.data.authenticator.manager.model.Verification import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState import com.bitwarden.authenticator.data.authenticator.repository.util.toAuthenticatorItems -import com.bitwarden.authenticator.data.platform.base.FakeDispatcherManager import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.imports.ImportManager import com.bitwarden.authenticator.data.platform.manager.model.FlagKey import com.bitwarden.authenticator.data.platform.repository.SettingsRepository -import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager import com.bitwarden.authenticatorbridge.manager.model.AccountSyncState import com.bitwarden.authenticatorbridge.model.SharedAccountData +import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/FakeDispatcherManager.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/FakeDispatcherManager.kt deleted file mode 100644 index a991ce914b..0000000000 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/FakeDispatcherManager.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.bitwarden.authenticator.data.platform.base - -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.MainCoroutineDispatcher -import kotlinx.coroutines.test.UnconfinedTestDispatcher -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.setMain - -/** - * A faked implementation of [DispatcherManager] that uses [UnconfinedTestDispatcher]. - */ -@OptIn(ExperimentalCoroutinesApi::class) -class FakeDispatcherManager( - override val default: CoroutineDispatcher = UnconfinedTestDispatcher(), - override val io: CoroutineDispatcher = UnconfinedTestDispatcher(), - override val unconfined: CoroutineDispatcher = UnconfinedTestDispatcher(), -) : DispatcherManager { - override val main: MainCoroutineDispatcher = Dispatchers.Main - - /** - * Updates the main dispatcher to use the provided [dispatcher]. Used in conjunction with - * [resetMain]. - */ - fun setMain(dispatcher: CoroutineDispatcher) { - Dispatchers.setMain(dispatcher) - } - - /** - * Restores the main dispatcher to it's default state. Used in conjunction with [setMain]. - */ - fun resetMain() { - Dispatchers.resetMain() - } -} diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt index 640dd559b4..5da7e7e261 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt @@ -1,11 +1,11 @@ package com.bitwarden.authenticator.data.platform.repository import app.cash.turbine.test -import com.bitwarden.authenticator.data.platform.base.FakeDispatcherManager -import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.datasource.disk.model.ServerConfig import com.bitwarden.data.datasource.disk.util.FakeConfigDiskSource +import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson import com.bitwarden.network.model.ConfigResponseJson.ServerJson diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryTest.kt index 09920bad9d..c08b741c35 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/SettingsRepositoryTest.kt @@ -4,10 +4,10 @@ import app.cash.turbine.test import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource import com.bitwarden.authenticator.data.auth.datasource.disk.util.FakeAuthDiskSource import com.bitwarden.authenticator.data.authenticator.datasource.sdk.AuthenticatorSdkSource -import com.bitwarden.authenticator.data.platform.base.FakeDispatcherManager import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSource import com.bitwarden.authenticator.data.platform.manager.BiometricsEncryptionManager import com.bitwarden.authenticator.ui.platform.feature.settings.data.model.DefaultSaveOption +import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManager.kt b/data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManager.kt similarity index 91% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManager.kt rename to data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManager.kt index 13306d075c..30b7a4a50a 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManager.kt +++ b/data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManager.kt @@ -1,4 +1,4 @@ -package com.bitwarden.authenticator.data.platform.manager +package com.bitwarden.data.manager import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.MainCoroutineDispatcher diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManagerImpl.kt b/data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManagerImpl.kt similarity index 89% rename from authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManagerImpl.kt rename to data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManagerImpl.kt index 4cc80f4fe9..49d2414ba6 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/DispatcherManagerImpl.kt +++ b/data/src/main/kotlin/com/bitwarden/data/manager/DispatcherManagerImpl.kt @@ -1,4 +1,4 @@ -package com.bitwarden.authenticator.data.platform.manager +package com.bitwarden.data.manager import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerTest.kt b/data/src/test/kotlin/com/bitwarden/data/manager/DispatcherManagerTest.kt similarity index 93% rename from app/src/test/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerTest.kt rename to data/src/test/kotlin/com/bitwarden/data/manager/DispatcherManagerTest.kt index 424f97457a..cc0ebad76d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/dispatcher/DispatcherManagerTest.kt +++ b/data/src/test/kotlin/com/bitwarden/data/manager/DispatcherManagerTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.manager.dispatcher +package com.bitwarden.data.manager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/base/FakeDispatcherManager.kt b/data/src/testFixtures/kotlin/com/bitwarden/data/datasource/disk/base/FakeDispatcherManager.kt similarity index 90% rename from app/src/test/java/com/x8bit/bitwarden/data/platform/base/FakeDispatcherManager.kt rename to data/src/testFixtures/kotlin/com/bitwarden/data/datasource/disk/base/FakeDispatcherManager.kt index d17bb9a447..49c00ef8d2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/base/FakeDispatcherManager.kt +++ b/data/src/testFixtures/kotlin/com/bitwarden/data/datasource/disk/base/FakeDispatcherManager.kt @@ -1,6 +1,6 @@ -package com.x8bit.bitwarden.data.platform.base +package com.bitwarden.data.datasource.disk.base -import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager +import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi