From 8c6782dcb134ba58ac5d93bd4e60a70963e4f04d Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 5 Dec 2025 13:08:39 -0600 Subject: [PATCH] Move MissingPropertyException to common location (#6237) --- .../bitwarden/data/auth/repository/AuthRepositoryImpl.kt | 2 +- .../bitwarden/data/platform/manager/CertificateManagerImpl.kt | 2 +- .../platform/repository/AuthenticatorBridgeRepositoryImpl.kt | 2 +- .../bitwarden/data/vault/manager/VaultLockManagerImpl.kt | 2 +- .../bitwarden/data/vault/repository/VaultRepositoryImpl.kt | 2 +- .../bitwarden/data/auth/repository/AuthRepositoryTest.kt | 2 +- .../platform/datasource/network/ssl/CertificateManagerTest.kt | 2 +- .../com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt | 2 +- .../bitwarden/data/vault/manager/VaultSyncManagerTest.kt | 2 +- .../bitwarden/data/vault/repository/VaultRepositoryTest.kt | 4 ++-- .../core/data/repository}/error/MissingPropertyException.kt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename {app/src/main/kotlin/com/x8bit/bitwarden/data/platform => core/src/main/kotlin/com/bitwarden/core/data/repository}/error/MissingPropertyException.kt (80%) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index c1ae889ec9..aa61cbc853 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.auth.repository import com.bitwarden.core.AuthRequestMethod import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.data.manager.dispatcher.DispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess @@ -100,7 +101,6 @@ import com.x8bit.bitwarden.data.auth.util.KdfParamsConstants.DEFAULT_PBKDF2_ITER import com.x8bit.bitwarden.data.auth.util.YubiKeyResult import com.x8bit.bitwarden.data.auth.util.toSdkParams 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.LogsManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt index 5aebd8ac00..c01915da02 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt @@ -7,9 +7,9 @@ import android.security.KeyChainException import androidx.annotation.VisibleForTesting import androidx.annotation.WorkerThread import androidx.core.net.toUri +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsCertificate import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.manager.model.ImportPrivateKeyResult import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import timber.log.Timber diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt index 344fc03bfb..28a300a04b 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/repository/AuthenticatorBridgeRepositoryImpl.kt @@ -4,13 +4,13 @@ import com.bitwarden.authenticatorbridge.model.SharedAccountData import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.InitUserCryptoRequest +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.flatMap import com.bitwarden.data.repository.util.toEnvironmentUrlsOrDefault 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.repository.util.toSdkParams -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.repository.util.sanitizeTotpUri import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.sdk.ScopedVaultSdkSource diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt index 85c416558d..b422ffd592 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt @@ -9,6 +9,7 @@ import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.InitUserCryptoRequest import com.bitwarden.core.data.manager.dispatcher.DispatcherManager import com.bitwarden.core.data.manager.realtime.RealtimeManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.concurrentMapOf @@ -26,7 +27,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams import com.x8bit.bitwarden.data.auth.repository.util.userAccountTokens 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.model.AppCreationState diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index e3e04755d4..9c3a6dabc8 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.vault.repository import com.bitwarden.core.DateTime import com.bitwarden.core.InitUserCryptoMethod import com.bitwarden.core.data.manager.dispatcher.DispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.repository.util.combineDataStates @@ -21,7 +22,6 @@ import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams import com.x8bit.bitwarden.data.autofill.util.login -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index aefb247147..cc49f9add0 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -13,6 +13,7 @@ import com.bitwarden.core.UpdateKdfResponse import com.bitwarden.core.UpdatePasswordResponse import com.bitwarden.core.data.manager.dispatcher.DispatcherManager import com.bitwarden.core.data.manager.dispatcher.FakeDispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess @@ -121,7 +122,6 @@ 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.datasource.disk.util.FakeSettingsDiskSource -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.PolicyManager diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt index 4a2825d12b..582d80ce8c 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt @@ -4,11 +4,11 @@ import android.content.Context import android.net.Uri import android.security.KeyChain import android.security.KeyChainException +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsCertificate import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.manager.CertificateManagerImpl import com.x8bit.bitwarden.data.platform.manager.model.ImportPrivateKeyResult import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt index e487c22052..38ce6a5393 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.net.Uri import com.bitwarden.core.data.manager.dispatcher.FakeDispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess @@ -19,7 +20,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.datasource.disk.util.FakeAuthDiskSource -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt index 7a4291240a..678552e4a3 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt @@ -5,6 +5,7 @@ import app.cash.turbine.turbineScope import com.bitwarden.collections.CollectionView import com.bitwarden.core.InitOrgCryptoRequest import com.bitwarden.core.data.manager.dispatcher.FakeDispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure @@ -32,7 +33,6 @@ import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager import com.x8bit.bitwarden.data.auth.manager.UserStateManager import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason 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 diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 7abb2b63ba..d8ea30e139 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -4,14 +4,15 @@ import app.cash.turbine.test import com.bitwarden.collections.CollectionView import com.bitwarden.core.DateTime import com.bitwarden.core.InitUserCryptoMethod +import com.bitwarden.core.MasterPasswordUnlockData import com.bitwarden.core.data.manager.dispatcher.DispatcherManager import com.bitwarden.core.data.manager.dispatcher.FakeDispatcherManager +import com.bitwarden.core.data.repository.error.MissingPropertyException 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.exporters.ExportFormat import com.bitwarden.fido.Fido2CredentialAutofillView -import com.bitwarden.core.MasterPasswordUnlockData import com.bitwarden.network.model.CipherTypeJson import com.bitwarden.network.model.MasterPasswordUnlockDataJson import com.bitwarden.network.model.SyncResponseJson @@ -32,7 +33,6 @@ 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.auth.datasource.sdk.util.toKdfRequestModel import com.x8bit.bitwarden.data.auth.repository.util.toSdkParams -import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.vault.datasource.disk.VaultDiskSource import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/error/MissingPropertyException.kt b/core/src/main/kotlin/com/bitwarden/core/data/repository/error/MissingPropertyException.kt similarity index 80% rename from app/src/main/kotlin/com/x8bit/bitwarden/data/platform/error/MissingPropertyException.kt rename to core/src/main/kotlin/com/bitwarden/core/data/repository/error/MissingPropertyException.kt index f381f76108..4d474c5eb1 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/error/MissingPropertyException.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/repository/error/MissingPropertyException.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.error +package com.bitwarden.core.data.repository.error /** * An exception indicating that a required property was missing.