github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-16 17:14:25 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle.kts
View File

@@ -55,6 +55,11 @@ android {
buildTypes {
debug {
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")
isDebuggable = true
isMinifyEnabled = false
@@ -62,6 +67,11 @@ android {
release {
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
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),

4
app/src/main/kotlin/com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorBridgeModule.kt
View File

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