From bdca79d862730eaf4d34e61479782171278c75ee Mon Sep 17 00:00:00 2001 From: Brian Yencho Date: Fri, 19 Jan 2024 13:58:12 -0600 Subject: [PATCH] Update Bitwarden SDK to 0.4.0-20240119.185557-52 (#683) --- app/proguard-rules.pro | 4 +--- .../generator/datasource/sdk/GeneratorSdkSource.kt | 6 +++--- .../generator/datasource/sdk/GeneratorSdkSourceImpl.kt | 6 +++--- .../tools/generator/repository/GeneratorRepository.kt | 6 +++--- .../generator/repository/GeneratorRepositoryImpl.kt | 6 +++--- .../ui/tools/feature/generator/GeneratorViewModel.kt | 8 ++++---- .../feature/generator/util/ServiceTypeExtensions.kt | 4 ++-- .../generator/datasource/sdk/GeneratorSdkSourceTest.kt | 10 +++++----- .../generator/repository/GeneratorRepositoryTest.kt | 10 +++++----- .../repository/util/FakeGeneratorRepository.kt | 6 +++--- .../generator/util/ServiceTypeExtensionsTest.kt | 2 +- gradle/libs.versions.toml | 2 +- 12 files changed, 34 insertions(+), 36 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 033bd0cc2a..0fabafc7db 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -4,9 +4,7 @@ # We need to access the SDK using JNA and this makes it very easy to obfuscate away the SDK unless # we keep it here. --keep class com.bitwarden.core.** { *; } --keep class com.bitwarden.crypto** { *; } --keep class com.bitwarden.sdk.** { *; } +-keep class com.bitwarden.** { *; } ################################################################################ # Bitwarden Models diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSource.kt index d2b7e530ea..d9ac561aa2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSource.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.sdk -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest /** * Source of password generation functionality from the Bitwarden SDK. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceImpl.kt index b5dd754ef6..597b14b85c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.sdk -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.bitwarden.sdk.ClientGenerators /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt index 8e62d67d60..9ac41750fd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepository.kt @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.tools.generator.repository -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest import com.bitwarden.core.PasswordHistoryView -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedCatchAllUsernameResult import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedForwardedServiceUsernameResult 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 e9f0e4e401..7b3e28f25b 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,10 +2,10 @@ package com.x8bit.bitwarden.data.tools.generator.repository -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest import com.bitwarden.core.PasswordHistoryView -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt index 542364d89d..e98d20e522 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt @@ -5,10 +5,10 @@ package com.x8bit.bitwarden.ui.tools.feature.generator import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope -import com.bitwarden.core.AppendType -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.AppendType +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt index fbf9575433..00b82809f4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.util -import com.bitwarden.core.ForwarderServiceType -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.ForwarderServiceType +import com.bitwarden.generators.UsernameGeneratorRequest import com.x8bit.bitwarden.ui.tools.feature.generator.GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias.ServiceType /** diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt index 9f3a4df7cd..923985be75 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/sdk/GeneratorSdkSourceTest.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.sdk -import com.bitwarden.core.AppendType -import com.bitwarden.core.ForwarderServiceType -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.AppendType +import com.bitwarden.generators.ForwarderServiceType +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.bitwarden.sdk.ClientGenerators import io.mockk.coEvery import io.mockk.coVerify 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 639653edb5..024c442ed1 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 @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.tools.generator.repository import app.cash.turbine.test -import com.bitwarden.core.AppendType -import com.bitwarden.core.ForwarderServiceType -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest import com.bitwarden.core.PasswordHistory import com.bitwarden.core.PasswordHistoryView -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.AppendType +import com.bitwarden.generators.ForwarderServiceType +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest 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.EnvironmentUrlDataJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt index 4832c389f8..ab950e2be7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/util/FakeGeneratorRepository.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.tools.generator.repository.util -import com.bitwarden.core.PassphraseGeneratorRequest -import com.bitwarden.core.PasswordGeneratorRequest import com.bitwarden.core.PasswordHistoryView -import com.bitwarden.core.UsernameGeneratorRequest +import com.bitwarden.generators.PassphraseGeneratorRequest +import com.bitwarden.generators.PasswordGeneratorRequest +import com.bitwarden.generators.UsernameGeneratorRequest import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt index ea468e91b2..91d42926d0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.util -import com.bitwarden.core.ForwarderServiceType +import com.bitwarden.generators.ForwarderServiceType import com.x8bit.bitwarden.ui.tools.feature.generator.GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias.ServiceType import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c300c8cd45..cc2493c383 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ androidXAppCompat = "1.6.1" androdixAutofill = "1.1.0" # Once the app and SDK reach a critical point of completeness we should begin fixing the version # here (BIT-311). -bitwardenSdk = "0.4.0-20240115.154650-43" +bitwardenSdk = "0.4.0-20240119.185557-52" crashlytics = "2.9.9" detekt = "1.23.1" firebaseBom = "32.7.0"