diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt index facbad19b7..4e64b8b52d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt @@ -26,7 +26,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.platform.TextToolbar @@ -123,7 +123,7 @@ fun BitwardenPasswordField( value = textFieldValue, onValueChange = onValueChange, defaultTextToolbar = LocalTextToolbar.current, - clipboardManager = LocalClipboardManager.current.nativeClipboard, + clipboardManager = LocalClipboard.current.nativeClipboard, focusManager = LocalFocusManager.current, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt index a4abc43394..ab179ffecd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt @@ -36,7 +36,7 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.focus.onFocusEvent import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.platform.TextToolbar @@ -254,7 +254,7 @@ fun BitwardenTextField( value = textFieldValue, onValueChange = onValueChange, defaultTextToolbar = LocalTextToolbar.current, - clipboardManager = LocalClipboardManager.current.nativeClipboard, + clipboardManager = LocalClipboard.current.nativeClipboard, focusManager = LocalFocusManager.current, ) diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt index 9189232881..99e530764d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt @@ -378,9 +378,9 @@ class FakeSettingsDiskSource : SettingsDiskSource { override fun getVaultRegisteredForExport(userId: String): Boolean = vaultRegisteredForExport[userId] ?: false - override fun storeVaultRegisteredForExport(userId: String, registered: Boolean?) { - vaultRegisteredForExport[userId] = registered - getMutableVaultRegisteredForExportFlow(userId = userId).tryEmit(registered) + override fun storeVaultRegisteredForExport(userId: String, isRegistered: Boolean?) { + vaultRegisteredForExport[userId] = isRegistered + getMutableVaultRegisteredForExportFlow(userId = userId).tryEmit(isRegistered) } override fun getVaultRegisteredForExportFlow(userId: String): Flow = 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 7bbc24e88c..f6743042df 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 @@ -1213,7 +1213,7 @@ class SettingsRepositoryTest { @Test fun `isVaultRegisteredForExport should return true if it exists`() { val userId = "userId" - fakeSettingsDiskSource.storeVaultRegisteredForExport(userId = userId, registered = true) + fakeSettingsDiskSource.storeVaultRegisteredForExport(userId = userId, isRegistered = true) assertTrue(settingsRepository.isVaultRegisteredForExport(userId = userId)) } @@ -1234,12 +1234,12 @@ class SettingsRepositoryTest { assertFalse(awaitItem()) fakeSettingsDiskSource.storeVaultRegisteredForExport( userId = USER_ID, - registered = true, + isRegistered = true, ) assertTrue(awaitItem()) fakeSettingsDiskSource.storeVaultRegisteredForExport( userId = USER_ID, - registered = false, + isRegistered = false, ) assertFalse(awaitItem()) } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt index e420949a3e..d6c318539c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt @@ -320,6 +320,7 @@ class InlinePresentationSpecExtensionsTest { every { ContextCompat.getString(testContext, R.string.type_login) } returns LOGIN + @Suppress("DEPRECATION") val slice: Slice = mockk() every { UiVersions.getVersions(testStyle) @@ -377,6 +378,7 @@ class InlinePresentationSpecExtensionsTest { icon: Icon, pendingIntent: PendingIntent, ) { + @Suppress("DEPRECATION") val slice: Slice = mockk() every { UiVersions.getVersions(testStyle)