BITAU-68 Specify correct authenticatorbridge connection type (#240)

Co-authored-by: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
This commit is contained in:
Andrew Haisting
2024-10-15 15:32:50 -05:00
committed by GitHub
parent 1669fa4044
commit 1820073b65
2 changed files with 12 additions and 2 deletions

View File

@@ -55,6 +55,11 @@ android {
buildTypes { buildTypes {
debug { debug {
manifestPlaceholders["targetBitwardenAppId"] = "com.x8bit.bitwarden.dev" manifestPlaceholders["targetBitwardenAppId"] = "com.x8bit.bitwarden.dev"
buildConfigField(
type = "com.bitwarden.authenticatorbridge.manager.model.AuthenticatorBridgeConnectionType",
name = "AUTHENTICATOR_BRIDGE_CONNECTION_TYPE",
value = "com.bitwarden.authenticatorbridge.manager.model.AuthenticatorBridgeConnectionType.DEV",
)
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
isDebuggable = true isDebuggable = true
isMinifyEnabled = false isMinifyEnabled = false
@@ -62,6 +67,11 @@ android {
release { release {
manifestPlaceholders["targetBitwardenAppId"] = "com.x8bit.bitwarden" manifestPlaceholders["targetBitwardenAppId"] = "com.x8bit.bitwarden"
buildConfigField(
type = "com.bitwarden.authenticatorbridge.manager.model.AuthenticatorBridgeConnectionType",
name = "AUTHENTICATOR_BRIDGE_CONNECTION_TYPE",
value = "com.bitwarden.authenticatorbridge.manager.model.AuthenticatorBridgeConnectionType.RELEASE",
)
isMinifyEnabled = true isMinifyEnabled = true
proguardFiles( proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"), getDefaultProguardFile("proguard-android-optimize.txt"),

View File

@@ -1,6 +1,7 @@
package com.bitwarden.authenticator.data.authenticator.repository.di package com.bitwarden.authenticator.data.authenticator.repository.di
import android.content.Context import android.content.Context
import com.bitwarden.authenticator.BuildConfig
import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource
import com.bitwarden.authenticator.data.authenticator.repository.util.SymmetricKeyStorageProviderImpl import com.bitwarden.authenticator.data.authenticator.repository.util.SymmetricKeyStorageProviderImpl
import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager import com.bitwarden.authenticator.data.platform.manager.FeatureFlagManager
@@ -8,7 +9,6 @@ import com.bitwarden.authenticator.data.platform.manager.model.LocalFeatureFlag
import com.bitwarden.authenticatorbridge.factory.AuthenticatorBridgeFactory import com.bitwarden.authenticatorbridge.factory.AuthenticatorBridgeFactory
import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager
import com.bitwarden.authenticatorbridge.manager.model.AccountSyncState import com.bitwarden.authenticatorbridge.manager.model.AccountSyncState
import com.bitwarden.authenticatorbridge.manager.model.AuthenticatorBridgeConnectionType
import com.bitwarden.authenticatorbridge.provider.SymmetricKeyStorageProvider import com.bitwarden.authenticatorbridge.provider.SymmetricKeyStorageProvider
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
@@ -42,7 +42,7 @@ object AuthenticatorBridgeModule {
): AuthenticatorBridgeManager = ): AuthenticatorBridgeManager =
if (featureFlagManager.getFeatureFlag(LocalFeatureFlag.PasswordManagerSync)) { if (featureFlagManager.getFeatureFlag(LocalFeatureFlag.PasswordManagerSync)) {
factory.getAuthenticatorBridgeManager( factory.getAuthenticatorBridgeManager(
connectionType = AuthenticatorBridgeConnectionType.DEV, connectionType = BuildConfig.AUTHENTICATOR_BRIDGE_CONNECTION_TYPE,
symmetricKeyStorageProvider = symmetricKeyStorageProvider, symmetricKeyStorageProvider = symmetricKeyStorageProvider,
) )
} else { } else {