GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2026-02-26 21:35:53 +07:00
parent d349739524
commit 1806ddc31d
18 changed files with 55 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/tangem/tap/domain/scanCard/DefaultScanCardProcessor.kt
View file

@ -20,6 +20,7 @@ internal class DefaultScanCardProcessor(
cardId: String?,
allowsRequestAccessCodeFromRepository: Boolean,
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse> {
return if (isNewCardScanningEnabled) {
UseCaseScanProcessor.scan(cardId, allowsRequestAccessCodeFromRepository)
@ -28,6 +29,7 @@ internal class DefaultScanCardProcessor(
analyticsSource = analyticsSource,
cardId = cardId,
allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
)
}
}
@ -35,6 +37,7 @@ internal class DefaultScanCardProcessor(
@Suppress("LongParameterList")
override suspend fun scan(
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
cardId: String?,
onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
onWalletNotCreated: suspend () -> Unit,
@ -56,6 +59,7 @@ internal class DefaultScanCardProcessor(
} else {
legacyScanProcessor.scan(
analyticsSource = analyticsSource,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
cardId = cardId,
onProgressStateChange = onProgressStateChange,
onWalletNotCreated = onWalletNotCreated,

8
app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
View file

@ -55,10 +55,12 @@ internal class LegacyScanProcessor @Inject constructor(
cardId: String? = null,
allowsRequestAccessCodeFromRepository: Boolean = false,
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse> {
return tangemSdkManager.scanProduct(
cardId = cardId,
allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
)
.doOnFailure { error ->
onScanFailure(analyticsSource = analyticsSource, error = error, onFailure = {}, onCancel = {})
@ -68,6 +70,7 @@ internal class LegacyScanProcessor @Inject constructor(
@Suppress("LongParameterList")
suspend fun scan(
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
cardId: String?,
onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
onWalletNotCreated: suspend () -> Unit,
@ -80,7 +83,10 @@ internal class LegacyScanProcessor @Inject constructor(
tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
val result = tangemSdkManager.scanProduct(cardId)
val result = tangemSdkManager.scanProduct(
cardId = cardId,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
)
val analyticsEvent = Basic.CardWasScanned(analyticsSource)
store.dispatchOnMain(GlobalAction.ScanFailsCounter.ChooseBehavior(result, analyticsSource))

7
app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
View file

@ -13,11 +13,16 @@ internal class DefaultScanCardRepository(
private val exceptionConverter = ScanCardExceptionConverter()
override suspend fun scanCard(cardId: String?, allowRequestAccessCodeFromStorage: Boolean): ScanResponse {
override suspend fun scanCard(
cardId: String?,
allowRequestAccessCodeFromStorage: Boolean,
shouldCheckIsAlreadyActivated: Boolean,
): ScanResponse {
return when (
val result = tangemSdkManager.scanProduct(
cardId = cardId,
allowsRequestAccessCodeFromRepository = allowRequestAccessCodeFromStorage,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
)
) {
is CompletionResult.Success -> result.data

3
app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt
View file

@ -166,6 +166,7 @@ internal class DefaultTangemSdkManager(
cardId: String?,
messageRes: Int?,
allowsRequestAccessCodeFromRepository: Boolean,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse> {
val message = Message(resources.getStringSafe(messageRes ?: R.string.initial_message_scan_header))
return coroutineScope {
@ -176,7 +177,7 @@ internal class DefaultTangemSdkManager(
allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
visaCardScanHandler = visaCardScanHandler,
visaCoroutineScope = this,
shouldCheckIsAlreadyActivated = true,
shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
onboardingV2FeatureToggles = onboardingV2FeatureToggles,
),
cardId = cardId,

1
app/src/main/java/com/tangem/tap/domain/sdk/impl/MockTangemSdkManager.kt
View file

@ -59,6 +59,7 @@ class MockTangemSdkManager(
cardId: String?,
messageRes: Int?,
allowsRequestAccessCodeFromRepository: Boolean,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse> {
return MockProvider.getScanResponse()
}

4
app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
View file

@ -296,7 +296,9 @@ internal class DefaultUserWalletsListRepository(
}
val scanResponse = unlockMethod.scanResponse ?: run {
when (val res = tangemSdkManagerProvider().scanProduct()) {
when (val res = tangemSdkManagerProvider().scanProduct(
shouldCheckIsAlreadyActivated = false,
)) {
is CompletionResult.Failure -> raise(UnlockWalletError.UserCancelled)
is CompletionResult.Success -> res.data
}

1
app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
View file

@ -107,6 +107,7 @@ internal class CardSettingsModel @Inject constructor(
private fun scanCard() = modelScope.launch {
scanCardProcessor.scan(
analyticsSource = com.tangem.core.analytics.models.AnalyticsParam.ScreensSources.Settings,
shouldCheckIsAlreadyActivated = false,
allowsRequestAccessCodeFromRepository = true,
)
.doOnSuccess { scanResponse ->

2
domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardProcessor.kt
View file

@ -11,10 +11,12 @@ interface ScanCardProcessor {
cardId: String? = null,
allowsRequestAccessCodeFromRepository: Boolean = false,
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse>
suspend fun scan(
analyticsSource: AnalyticsParam.ScreensSources,
shouldCheckIsAlreadyActivated: Boolean,
cardId: String? = null,
onProgressStateChange: suspend (showProgress: Boolean) -> Unit = {},
onWalletNotCreated: suspend () -> Unit = {},

13
domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardUseCase.kt
View file

@ -49,9 +49,14 @@ class ScanCardUseCase(
cardId: String?,
allowRequestAccessCodeFromStorage: Boolean,
): Either<ScanCardException, ScanResponse> {
return Either.catch { scanCardRepository.scanCard(cardId, allowRequestAccessCodeFromStorage) }
.mapLeft { e ->
e as? ScanCardException ?: ScanCardException.UnknownException(e)
}
return Either.catch {
scanCardRepository.scanCard(
cardId = cardId,
allowRequestAccessCodeFromStorage = allowRequestAccessCodeFromStorage,
shouldCheckIsAlreadyActivated = true, // TODO use correct when enable NEW_CARD_SCANNING_ENABLED
)
}.mapLeft { e ->
e as? ScanCardException ?: ScanCardException.UnknownException(e)
}
}
}

6
domain/card/src/main/kotlin/com/tangem/domain/card/repository/ScanCardRepository.kt
View file

@ -17,5 +17,9 @@ interface ScanCardRepository {
* @return a [ScanResponse] object with the result of the scan.
* @throws [ScanCardException] if the scan process fails.
*/
suspend fun scanCard(cardId: String?, allowRequestAccessCodeFromStorage: Boolean): ScanResponse
suspend fun scanCard(
cardId: String?,
allowRequestAccessCodeFromStorage: Boolean,
shouldCheckIsAlreadyActivated: Boolean,
): ScanResponse
}

1
features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt
View file

@ -186,6 +186,7 @@ internal class CreateWalletStartModel @Inject constructor(
scanCardProcessor.scan(
analyticsSource = analyticsSource,
shouldCheckIsAlreadyActivated = true,
onProgressStateChange = { showProgress ->
if (!showProgress) {
delay(HIDE_PROGRESS_DELAY)

1
features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
View file

@ -120,6 +120,7 @@ internal class UserWalletSaver @Inject constructor(
scope.launch {
scanCardProcessor.scan(
analyticsSource = AnalyticsParam.ScreensSources.Settings,
shouldCheckIsAlreadyActivated = true,
onWalletNotCreated = {
continuation.resume(Either.Right(null))
},

1
features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
View file

@ -171,6 +171,7 @@ internal class HomeModel @Inject constructor(
scanCardProcessor.scan(
analyticsSource = analyticsSource,
shouldCheckIsAlreadyActivated = true,
onProgressStateChange = { showProgress ->
if (!showProgress) {
delay(HIDE_PROGRESS_DELAY)

1
features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createhardwarewallet/CreateHardwareWalletModel.kt
View file

@ -104,6 +104,7 @@ internal class CreateHardwareWalletModel @Inject constructor(
scanCardProcessor.scan(
analyticsSource = analyticsSource,
shouldCheckIsAlreadyActivated = true,
onProgressStateChange = { showProgress ->
if (!showProgress) {
delay(HIDE_PROGRESS_DELAY)

2
features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/upgradewallet/UpgradeWalletModel.kt
View file

@ -115,7 +115,7 @@ internal class UpgradeWalletModel @Inject constructor(
)
tangemSdkManager
.scanProduct()
.scanProduct(shouldCheckIsAlreadyActivated = true)
.doOnSuccess { scanResponse ->
checkIsWalletSuitableToBeUsedAsUpgrade(scanResponse = scanResponse) {
delay(DELAY_SDK_DIALOG_CLOSE)

1
features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
View file

@ -192,6 +192,7 @@ internal class WelcomeModel @Inject constructor(
modelScope.launch {
scanCardProcessor.scan(
analyticsSource = AnalyticsParam.ScreensSources.SignIn,
shouldCheckIsAlreadyActivated = true,
onWalletNotCreated = {},
disclaimerWillShow = { router.pop() },
onSuccess = { scanResponse ->

2
gradle/tangem_dependencies.toml
View file

@ -7,7 +7,7 @@
tangemBlockchainSdk = "releases-5.34-1430"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "releases-5.34-581"
tangemCardSdk = "releases-5.34-584"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
tangemVico = "2.0.0-alpha.25-tangem12"
#tangemVico = "0.0.1" # Keep it! - used for local builds ^

8
libs/tangem-sdk-api/src/main/kotlin/com/tangem/sdk/api/TangemSdkManager.kt
View file

@ -45,10 +45,18 @@ interface TangemSdkManager {
suspend fun checkNeedEnrollBiometrics(awaitInitialization: Boolean = true): Boolean
/**
* Scans the card and returns [ScanResponse] with the card information.
* If [cardId] is provided, it will try to find the card with this ID in the card reader's range.
* If [allowsRequestAccessCodeFromRepository] is true, it will try to request access code from the repository
* if the card is protected by access code and the access code is not saved in the repository.
* If [shouldCheckIsAlreadyActivated] is true, it will check if the card is already activated and return an error if it is.
*/
suspend fun scanProduct(
cardId: String? = null,
messageRes: Int? = null,
allowsRequestAccessCodeFromRepository: Boolean = false,
shouldCheckIsAlreadyActivated: Boolean,
): CompletionResult<ScanResponse>
suspend fun createProductWallet(