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 2022-11-24 16:21:05 +03:00
parent f529d886b4
commit 90bfea9e4c
14 changed files with 41 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/tangem/tap/MainActivity.kt
View file

@ -19,8 +19,6 @@ import com.tangem.tap.common.IntentHandler
import com.tangem.tap.common.OnActivityResultCallback
import com.tangem.tap.common.SnackbarHandler
import com.tangem.tap.common.redux.NotificationsHandler
import com.tangem.tap.common.redux.global.AndroidResources
import com.tangem.tap.common.redux.global.GlobalAction
import com.tangem.tap.common.redux.navigation.AppScreen
import com.tangem.tap.common.redux.navigation.NavigationAction
import com.tangem.tap.common.shop.GooglePayService
@ -70,7 +68,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
tangemSdkManager = TangemSdkManager(tangemSdk, this)
backupService = BackupService.init(tangemSdk, this)
store.dispatch(GlobalAction.SetResources(getAndroidResources()))
store.dispatch(
ShopAction.CheckIfGooglePayAvailable(
GooglePayService(createPaymentsClient(this), this),
@ -78,15 +75,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
)
}
private fun getAndroidResources(): AndroidResources {
return AndroidResources(
AndroidResources.RString(
R.string.copy_toast_msg,
R.string.details_notification_erase_wallet_not_possible,
),
)
}
private fun systemActions() {
WindowCompat.setDecorFitsSystemWindows(window, false)

3
app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
View file

@ -29,9 +29,6 @@ sealed class GlobalAction : Action {
data class ShowErrorNotification(override val error: TapError) : GlobalAction(), ErrorAction
data class DebugShowErrorNotification(override val error: TapError) : GlobalAction(), DebugErrorAction
// android resources
data class SetResources(val resources: AndroidResources) : GlobalAction()
// dialogs
data class ShowDialog(val stateDialog: StateDialog) : GlobalAction()
object HideDialog : GlobalAction()

20
app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
View file

@ -14,9 +14,6 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
val globalState = state.globalState
return when (action) {
is GlobalAction.SetResources -> {
globalState.copy(resources = action.resources)
}
is GlobalAction.Onboarding.Start -> {
val usedCardsPrefStorage = preferencesStorage.usedCardsPrefStorage
val onboardingManager = OnboardingManager(action.scanResponse, usedCardsPrefStorage)
@ -34,7 +31,7 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
is GlobalAction.ScanFailsCounter.Reset -> {
globalState.copy(scanCardFailsCounter = 0)
}
is GlobalAction.SaveScanNoteResponse ->{
is GlobalAction.SaveScanNoteResponse -> {
domainStore.dispatch(DomainGlobalAction.SaveScanNoteResponse(action.scanResponse))
globalState.copy(scanResponse = action.scanResponse)
}
@ -51,11 +48,12 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
is GlobalAction.UpdateWalletSignedHashes -> {
val card = globalState.scanResponse?.card ?: return globalState
val wallet = card.wallet(action.walletPublicKey) ?: return globalState
val newCardInstance = card.updateWallet(wallet.copy(
totalSignedHashes = action.walletSignedHashes,
remainingSignatures = action.remainingSignatures
))
val newCardInstance = card.updateWallet(
wallet.copy(
totalSignedHashes = action.walletSignedHashes,
remainingSignatures = action.remainingSignatures,
),
)
globalState.copy(scanResponse = globalState.scanResponse.copy(card = newCardInstance))
}
is GlobalAction.SetFeedbackManager -> {
@ -72,9 +70,7 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
}
is GlobalAction.SetIfCardVerifiedOnline ->
globalState.copy(cardVerifiedOnline = action.verified)
is GlobalAction.FetchUserCountry.Success -> globalState.copy(
userCountryCode = action.countryCode
)
is GlobalAction.FetchUserCountry.Success -> globalState.copy(userCountryCode = action.countryCode)
else -> globalState
}
}

9
app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
View file

@ -25,18 +25,9 @@ data class GlobalState(
val scanCardFailsCounter: Int = 0,
val dialog: StateDialog? = null,
val exchangeManager: CurrencyExchangeManager = CurrencyExchangeManager.dummy(),
val resources: AndroidResources = AndroidResources(),
val userCountryCode: String? = null,
) : StateType
data class AndroidResources(
val strings: RString = RString(),
) {
data class RString(
val addressWasCopied: Int = -1,
val walletIsNotEmpty: Int = -1,
)
}
typealias CryptoCurrencyName = String
data class OnboardingState(

19
app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
View file

@ -7,7 +7,6 @@ import com.tangem.tap.common.analytics.Analytics
import com.tangem.tap.common.analytics.events.AnalyticsParam
import com.tangem.tap.common.analytics.events.Settings
import com.tangem.tap.common.extensions.dispatchDialogShow
import com.tangem.tap.common.extensions.dispatchNotification
import com.tangem.tap.common.extensions.dispatchOnMain
import com.tangem.tap.common.redux.AppDialog
import com.tangem.tap.common.redux.AppState
@ -18,7 +17,6 @@ import com.tangem.tap.domain.extensions.getUserWalletId
import com.tangem.tap.features.demo.DemoHelper
import com.tangem.tap.features.onboarding.products.twins.redux.CreateTwinWalletMode
import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
import com.tangem.tap.features.wallet.models.hasSendableAmountsOrPendingTransactions
import com.tangem.tap.scope
import com.tangem.tap.store
import com.tangem.tap.tangemSdkManager
@ -56,21 +54,8 @@ class DetailsMiddleware {
}
}
is DetailsAction.ReCreateTwinsWallet -> {
val wallet =
store.state.walletState.walletManagers.map { it.wallet }.firstOrNull()
if (wallet == null) {
store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
} else {
if (wallet.hasSendableAmountsOrPendingTransactions()) {
val walletIsNotEmpty =
store.state.globalState.resources.strings.walletIsNotEmpty
store.dispatchNotification(walletIsNotEmpty)
} else {
store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
}
}
store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
}
is DetailsAction.CreateBackup -> {
store.state.detailsState.scanResponse?.let {

2
app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
View file

@ -8,7 +8,7 @@ sealed class WalletWarning(
val edStringValueWithSymbol: String,
) : WalletWarning(1)
object TransactionInProgress : WalletWarning(10)
data class TransactionInProgress(val currencyName: String) : WalletWarning(10)
data class BalanceNotEnoughForFee(val blockchainFullName: String) : WalletWarning(30)
data class Rent(val walletRent: WalletRent) : WalletWarning(40)
}

2
app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
View file

@ -350,7 +350,7 @@ data class WalletData(
private fun assembleNonTypedWarnings(walletWarnings: MutableList<WalletWarning>) {
if (currencyData.status == BalanceStatus.SameCurrencyTransactionInProgress) {
walletWarnings.add(WalletWarning.TransactionInProgress)
walletWarnings.add(WalletWarning.TransactionInProgress(currency.currencyName))
}
}

7
app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
View file

@ -27,8 +27,11 @@ class WalletWarningConverter(
message.blockchainFullName, message.blockchainFullName,
)
}
WalletWarning.TransactionInProgress -> {
context.getString(R.string.wallet_pending_transaction_warning)
is WalletWarning.TransactionInProgress -> {
context.getString(
R.string.token_details_send_blocked_tx_format,
message.currencyName
)
}
is WalletWarning.Rent -> {
context.getString(

1
app/src/main/res/values-de/strings.xml
View file

@ -174,7 +174,6 @@ RECHTLICHER HAFTUNGSAUSSCHLUSS
<string name="initial_message_scan_header">Legen Sie die Karte zum Scannen an</string>
<string name="initial_message_tap_header">Legen Sie die Karte an</string>
<string name="details_notification_erase_wallet_not_possible">Ihr Kontostand in dieser Brieftasche ist nicht Null, oder Sie haben unbestätigte Transaktionen. Es ist unmöglich die Funktion der Brieftasche zu löschen.</string>
<string name="details_notification_security_option_already_active">Dies ist die derzeit aktive Wahl</string>
</resources>

1
app/src/main/res/values-fr/strings.xml
View file

@ -166,7 +166,6 @@ Avertissement
<string name="wallet_create_payid_empty">Saisissez d\'abord le PayString requis</string>
<string name="initial_message_scan_header">Posez pour scanner</string>
<string name="initial_message_tap_header">Posez la carte</string>
<string name="details_notification_erase_wallet_not_possible">Votre solde sur ce portefeuille n\'est pas nul, ou vous avez des transactions non confirmées. Impossible de supprimer la fonction du portefeuille</string>
<string name="details_notification_security_option_already_active">Cette option est déjà active</string>

11
app/src/main/res/values-it/strings.xml
View file

@ -28,7 +28,7 @@
<string name="wallet_balance_loading">Il saldo sta per essere caricato…</string>
<string name="wallet_balance_blockchain_unreachable">Blockchain non raggiungibile</string>
<string name="wallet_error_no_account">Conto non creato</string>
<string name="wallet_error_no_account_subtitle_format">Carica %1$s+ %2$s per creare un conto</string>
<string name="wallet_error_no_account_subtitle_format">Carica %s+ %s per creare un conto</string>
<string name="wallet_error_empty_card">Carta vuota</string>
<string name="wallet_error_empty_card_subtitle">Crea un portafoglio per iniziare ad utilizzare la tua carta Tangem </string>
<string name="wallet_error_unsupported_blockchain">Questa carta non è supportata</string>
@ -63,10 +63,10 @@
<string name="send_fee_picker_normal">Normale</string>
<string name="send_fee_picker_priority">Prioritario</string>
<string name="send_fee_include_description">Includi commissione</string>
<string name="send_total_subtitle_format">Sarà inviato %1$s %2$s</string>
<string name="send_total_subtitle_fiat_format">≈ %1$s (inc. commissione: %2$s)</string>
<string name="send_total_subtitle_asset_format">Sarà inviato %1$s %2$s e %1$s %2$s</string>
<string name="send_balance_subtitle_format">Saldo: %1$s %2$s</string>
<string name="send_total_subtitle_format">Sarà inviato %s %s</string>
<string name="send_total_subtitle_fiat_format">≈ %s (inc. commissione: %s)</string>
<string name="send_total_subtitle_asset_format">Sarà inviato %s %s e %s %s</string>
<string name="send_balance_subtitle_format">Saldo: %s %s</string>
<string name="send_transaction_success">La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo </string>
<string name="details_title">Requisiti</string>
<string name="details_row_title_cid">ID carta</string>
@ -174,7 +174,6 @@ Questa nota legale è stata modificata l\'ultima volta 01.10.2020.
<string name="initial_message_scan_header">Avvicina per scansionare</string>
<string name="initial_message_tap_header">Avvicina la carta</string>
<string name="details_notification_erase_wallet_not_possible">Il tuo saldo su questo portafoglio non è pari a zero o hai transazioni non confermate. Non è possibile eliminare la funzione portafoglio.</string>
<string name="details_notification_security_option_already_active">E\' l\'opzione attualmente attiva</string>
</resources>

19
app/src/main/res/values-ru/strings.xml
View file

@ -30,7 +30,7 @@
<string name="wallet_balance_loading">Загрузка баланса…</string>
<string name="wallet_balance_blockchain_unreachable">Блокчейн недоступен</string>
<string name="wallet_error_no_account">Аккаунт не создан</string>
<string name="wallet_error_no_account_subtitle_format">Загрузите %1$s+ %2$s для создания учетной записи</string>
<string name="wallet_error_no_account_subtitle_format">Загрузите %s+ %s для создания учетной записи</string>
<string name="wallet_error_empty_card">Карта пуста</string>
<string name="wallet_error_empty_card_subtitle">Создайте кошелек, чтобы начать пользоваться картой Tangem</string>
<string name="wallet_error_unsupported_blockchain">Эта карта не поддерживается</string>
@ -64,10 +64,10 @@
<string name="send_fee_picker_normal">Нормальный</string>
<string name="send_fee_picker_priority">Приоритетный</string>
<string name="send_fee_include_description">Включить коммисию</string>
<string name="send_total_subtitle_format">%1$s %2$s будет отправлено</string>
<string name="send_total_subtitle_fiat_format">≈ %1$s (включая комиссию: %2$s)</string>
<string name="send_total_subtitle_asset_format">%1$s %2$s и %3$s %4$s будут отправлены</string>
<string name="send_balance_subtitle_format">Баланс: %1$s %2$s</string>
<string name="send_total_subtitle_format">%s %s будет отправлено</string>
<string name="send_total_subtitle_fiat_format">≈ %s (включая комиссию: %s)</string>
<string name="send_total_subtitle_asset_format">%s %s и %s %s будут отправлены</string>
<string name="send_balance_subtitle_format">Баланс: %s %s</string>
<string name="send_transaction_success">Транзакция успешно подписана и отправлена в блокчейн. Баланс кошелька будет обновлен через некоторое время.</string>
<string name="details_title">Подробности</string>
<string name="details_row_title_cid">ID карты</string>
@ -114,7 +114,6 @@
<string name="wallet_create_payid_empty">Сначала введите желаемую PayString</string>
<string name="initial_message_scan_header">Приложите, чтобы отсканировать</string>
<string name="initial_message_tap_header">Приложите карту</string>
<string name="details_notification_erase_wallet_not_possible">Ваш баланс на этом кошельке не равен нулю, или у Вас есть неподтвержденные транзакции</string>
<string name="details_notification_security_option_already_active">Это текущая активная опция</string>
<string name="scan_card_error">Ошибка сканирования карты. Попробуй снова.</string>
<string name="wallet_button_buy">Купить</string>
@ -206,7 +205,7 @@
<string name="wallet_address_button_copy">Копировать</string>
<string name="wallet_address_button_share">Поделиться</string>
<string name="wallet_button_add_tokens">+ Добавить токены</string>
<string name="wallet_pending_transaction_warning">Пожалуйста, дождитесь завершения транзакции, чтобы иметь возможность отправить средства</string>
<string name="token_details_send_blocked_tx_format">Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства</string>
<string name="warning_failed_to_verify_card_title">Проверка подлинности не удалась</string>
<string name="warning_failed_to_verify_card_message">Эта карта может быть производственным образцом или подделкой</string>
<string name="warning_important_security_info">Важная информация о безопасности \u26A0</string>
@ -319,11 +318,11 @@
<string name="details_row_title_reset_factory_settings">Сброс до заводских настроек</string>
<string name="details_manage_security_access_code_disclaimer">Код доступа доступен только для карт с резервной копией</string>
<string name="solana_rent_warning">Сеть Solana взымает арендную плату в размере %s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %s, чтобы использовать его бесплатно.</string>
<string name="token_symbol_address_format">%1s (%2s)</string>
<string name="token_symbol_address_format">%s (%s)</string>
<string name="alert_signed_hashes_message">Эта карта не является векселем на предъявителя. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец скрывает автономную подпись, что является проблемой безопасности.\n\nНе принимайте эту карту в качестве физического платежа от кого-то, кому Вы не доверяете.\n\nВо всех остальных отношениях - это совершенно безопасно.\n\nTangem — единственный аппаратный кошелек, предлагающий защиту от подсчета подписей.</string>
<string name="wallet_connect">WalletConnect</string>
<string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %1s\n%2s\n\nСумма: %3s\nКомиссия: %4s\nВсего: %5s\nБаланс: %6s</string>
<string name="wallet_connect_request_session_start">Запрос на запуск сеанса для %1s\n\nURL: %2s</string>
<string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %s\n%s\n\nСумма: %s\nКомиссия: %s\nВсего: %s\nБаланс: %s</string>
<string name="wallet_connect_request_session_start">Запрос на запуск сеанса для %s\n\nURL: %s</string>
<string name="wallet_connect_sessions_title">Сессии WalletConnect</string>
<string name="wallet_connect_session_opened">Сеанс WalletConnect открыт с %s</string>
<string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>

13
app/src/main/res/values/strings.xml
View file

@ -36,7 +36,7 @@
<string name="wallet_balance_blockchain_unreachable">Blockchain is unreachable</string>
<string name="wallet_error_no_account">Account is not created</string>
<string name="wallet_error_no_account_subtitle_format">Load %1$s+ %2$s to create account</string>
<string name="wallet_error_no_account_subtitle_format">Load %s+ %s to create account</string>
<string name="wallet_error_empty_card">Empty card</string>
<string name="wallet_error_empty_card_subtitle">Create wallet to start using Tangem card</string>
<string name="wallet_error_unsupported_blockchain">This card is not supported</string>
@ -74,10 +74,10 @@
<string name="send_fee_picker_normal">Normal</string>
<string name="send_fee_picker_priority">Priority</string>
<string name="send_fee_include_description">Include fee</string>
<string name="send_total_subtitle_format">%1$s %2$s will be sent</string>
<string name="send_total_subtitle_fiat_format">≈ %1$s (inc. fee: %2$s)</string>
<string name="send_total_subtitle_asset_format">%1$s %2$s and %3$s %4$s will be sent</string>
<string name="send_balance_subtitle_format">Balance: %1$s %2$s</string>
<string name="send_total_subtitle_format">%s %s will be sent</string>
<string name="send_total_subtitle_fiat_format">≈ %s (inc. fee: %s)</string>
<string name="send_total_subtitle_asset_format">%s %s and %s %s will be sent</string>
<string name="send_balance_subtitle_format">Balance: %s %s</string>
<string name="send_transaction_success">Transaction has been successfully signed and sent to blockchain node. Wallet balance will be updated in a while</string>
<string name="details_title">Details</string>
@ -168,7 +168,7 @@
\nThis disclaimer was amended for the last time on October 1st, 2020.</string>
<string name="disclaimer_title">Terms of service</string>
<string name="wallet_notification_no_internet">No internet connection</string>
<string name="wallet_notification_no_internet">No internet connection</string>
<string name="send_error_payid_verification_failed">PayString verification failed</string>
<string name="send_error_payid_unsupported_by_blockchain">PayString unsupported by blockchain</string>
@ -185,6 +185,5 @@
<string name="initial_message_scan_header">Tap to scan</string>
<string name="initial_message_tap_header">Tap the card</string>
<string name="details_notification_erase_wallet_not_possible">Your balance on this wallet is not zero, or you have unconfirmed transactions</string>
<string name="details_notification_security_option_already_active">This is the currently active option</string>
</resources>

18
app/src/main/res/values/strings_untranslated.xml
View file

@ -105,7 +105,7 @@
<string name="wallet_address_button_copy" translatable="false">Copy</string>
<string name="wallet_address_button_share" translatable="false">Share</string>
<string name="wallet_button_add_tokens" translatable="false">+ Add tokens</string>
<string name="wallet_pending_transaction_warning" translatable="false">Please wait for the transaction to complete to be able to send funds</string>
<string name="token_details_send_blocked_tx_format" translatable="false">Please wait for %s transaction to complete to be able to send funds</string>
<string name="warning_failed_to_verify_card_title" translatable="false">Authenticity check failed</string>
<string name="warning_failed_to_verify_card_message" translatable="false">This card might be a production sample or counterfeit</string>
@ -132,21 +132,11 @@
<string name="wallet_connect_card_number" translatable="false">Card: %s</string>
<string name="wallet_connect_scan_card_message" translatable="false">Tap card to bind to wallet connect</string>
<string name="wallet_connect_create_tx_message" translatable="false">
Request to create transaction for %1s
\n%2s
\n\nAmount: %3s
\nFee: %4s
\nTotal: %5s
\nBalance: %6s</string>
<string name="wallet_connect_create_tx_message" translatable="false">Request to create transaction for %s\n%s\n\nAmount: %s\nFee: %s\nTotal: %s\nBalance: %s</string>
<string name="wallet_connect_create_tx_not_enough_funds" translatable="false">Can\'t send transaction. Not enough funds.</string>
<string name="wallet_connect_request_session_start" translatable="false">Request to start a session for %1s\n\n
URL: %2s</string>
<string name="wallet_connect_request_session_start" translatable="false">Request to start a session for %s\n\nURL: %s</string>
<string name="wallet_connect_alert_sign_message" translatable="false">Requesting to sign a message\n</string>
<string name="wallet_connect_personal_sign_message" translatable="false">Message for %s:\n%s</string>
@ -309,7 +299,7 @@ Amount to pay: %s</string>
<string name="solana_rent_warning" translatable="false">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
<string name="token_symbol_address_format" translatable="false">%1s (%2s)</string>
<string name="token_symbol_address_format" translatable="false">%s (%s)</string>
<string name="add_token_search_hint" translatable="false">Type here to search</string>
<string name="feedback_subject_rate_negative" translatable="false">My suggestions</string>