diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt index de48edc8d..595c9b77b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt @@ -432,6 +432,7 @@ fun SyncResponseJson.Cipher.Login.Uri.toSdkLoginUri(): LoginUri = LoginUri( uri = uri, match = uriMatchType?.toSdkMatchType(), + uriChecksum = null, ) /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt index d98b52480..1751f1b0d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt @@ -180,6 +180,7 @@ class SearchViewModel @Inject constructor( uris = uris + LoginUriView( uri = state.autofillSelectionData?.uri, match = null, + uriChecksum = null, ), ), ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt index 486c5ff39..83f109e89 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt @@ -208,5 +208,5 @@ private fun VaultAddEditState.Custom.toFieldView(): FieldView = private fun List?.toLoginUriView(): List? = this ?.filter { it.uri?.isNotBlank() == true } - ?.map { LoginUriView(uri = it.uri.orEmpty(), match = it.match) } + ?.map { LoginUriView(uri = it.uri.orEmpty(), match = it.match, uriChecksum = null) } .takeUnless { it.isNullOrEmpty() } diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt index 213ed8cb5..15c6994bf 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt @@ -130,6 +130,7 @@ fun createMockUriView(number: Int): LoginUriView = LoginUriView( uri = "www.mockuri$number.com", match = UriMatchType.HOST, + uriChecksum = null, ) /** diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt index 8d657a816..0185b593a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/VaultSdkCipherUtil.kt @@ -159,4 +159,5 @@ fun createMockSdkUri(number: Int): LoginUri = LoginUri( uri = "mockUri-$number", match = UriMatchType.HOST, + uriChecksum = null, ) 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 f9e597886..6005f2f44 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 @@ -215,6 +215,7 @@ class SearchViewModelTest : BaseViewModelTest() { LoginUriView( uri = AUTOFILL_URI, match = null, + uriChecksum = null, ), ), ) @@ -266,6 +267,7 @@ class SearchViewModelTest : BaseViewModelTest() { LoginUriView( uri = AUTOFILL_URI, match = null, + uriChecksum = null, ), ), ) @@ -425,6 +427,7 @@ class SearchViewModelTest : BaseViewModelTest() { LoginUriView( uri = AUTOFILL_URI, match = null, + uriChecksum = null, ), ), ) diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt index cbca77a64..2e7688403 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt @@ -543,6 +543,7 @@ private val DEFAULT_LOGIN_CIPHER_VIEW: CipherView = DEFAULT_BASE_CIPHER_VIEW.cop LoginUriView( uri = "www.example.com", match = null, + uriChecksum = null, ), ), totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt index ab3a5cd9d..c4a012813 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt @@ -39,6 +39,7 @@ fun createLoginView(isEmpty: Boolean): LoginView = LoginUriView( uri = "www.example.com", match = null, + uriChecksum = null, ), ) .takeUnless { isEmpty }, diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt index 3c1fbccb6..4474c7a0f 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensionsTest.kt @@ -81,6 +81,7 @@ class VaultAddItemStateExtensionsTest { LoginUriView( uri = "mockUri-1", match = UriMatchType.DOMAIN, + uriChecksum = null, ), ), totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", @@ -160,6 +161,7 @@ class VaultAddItemStateExtensionsTest { LoginUriView( uri = "mockUri-1", match = null, + uriChecksum = null, ), ), totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", @@ -740,6 +742,7 @@ private val DEFAULT_LOGIN_CIPHER_VIEW: CipherView = DEFAULT_BASE_CIPHER_VIEW.cop LoginUriView( uri = "www.example.com", match = null, + uriChecksum = null, ), ), totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt index 2aa2f8c8d..bbae4cfb2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt @@ -337,6 +337,7 @@ class VaultDataExtensionsTest { LoginUriView( uri = "", match = UriMatchType.HOST, + uriChecksum = null, ), ) .toLoginIconData( @@ -356,6 +357,7 @@ class VaultDataExtensionsTest { LoginUriView( uri = "androidapp://test.com", match = UriMatchType.HOST, + uriChecksum = null, ), ) .toLoginIconData( @@ -375,6 +377,7 @@ class VaultDataExtensionsTest { LoginUriView( uri = "iosapp://test.com", match = UriMatchType.HOST, + uriChecksum = null, ), ) .toLoginIconData( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 77ced17aa..931bef141 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ androidxSplash = "1.1.0-alpha02" androidXAppCompat = "1.6.1" androdixAutofill = "1.1.0" androidxWork = "2.9.0" -bitwardenSdk = "0.4.0-20240314.115913-173" +bitwardenSdk = "0.4.0-20240401.145917-193" crashlytics = "2.9.9" detekt = "1.23.5" firebaseBom = "32.8.0"