From 37bcd6905a641a3f454983a9cce5e51cab6dd4b7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 23 Feb 2019 23:35:30 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 4 ++-- app/src/main/java/com/tangem/App.kt | 8 +++----- .../main/java/com/tangem/domain/wallet/CoinEngine.java | 4 ++-- .../main/java/com/tangem/domain/wallet/TangemContext.java | 2 +- .../com/tangem/domain/wallet/nftToken/NftTokenEngine.java | 4 ++-- .../java/com/tangem/domain/wallet/token/TokenEngine.java | 4 ++-- .../presentation/activity/ConfirmTransactionActivity.kt | 2 +- .../presentation/activity/CreateNewWalletActivity.kt | 6 +++--- .../tangem/presentation/activity/EmptyWalletActivity.kt | 8 ++++---- .../java/com/tangem/presentation/activity/MainActivity.kt | 6 +++--- .../tangem/presentation/activity/PinRequestActivity.kt | 2 +- .../com/tangem/presentation/activity/PinSwapActivity.kt | 7 ++++--- .../com/tangem/presentation/activity/PurgeActivity.kt | 6 +++--- .../presentation/activity/SignTransactionActivity.kt | 6 +++--- .../java/com/tangem/presentation/fragment/LoadedWallet.kt | 8 ++++---- .../java/com/tangem/presentation/fragment/VerifyCard.kt | 4 ++-- 16 files changed, 40 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ef52b484fb..c0da9a2b7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,8 +44,8 @@ android { } dependencies { -// implementation project(':tangemcommon') - implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' + implementation project(':tangemcommon') +// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' implementation project(':tangemcard-android') implementation project(':tangemserver-android') diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index d226c4afb7..dc02b999b5 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -10,9 +10,7 @@ import com.tangem.di.NavigatorComponent import com.tangem.di.NetworkComponent import com.tangem.tangemcard.android.data.Firmwares import com.tangem.tangemcard.android.data.PINStorage -import com.tangem.tangemcard.data.Issuer -import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider -import com.tangem.tangemcard.data.external.PINsProvider +import com.tangem.tangemcommon.data.Issuer import com.tangem.tangemserver.android.data.LocalStorage import java.io.InputStreamReader import java.nio.charset.StandardCharsets @@ -32,9 +30,9 @@ class App : Application() { var navigatorComponent: NavigatorComponent? = null private set - lateinit var firmwaresStorage: FirmwaresDigestsProvider + lateinit var firmwaresStorage: Firmwares lateinit var localStorage: LocalStorage - lateinit var pinStorage: PINsProvider + lateinit var pinStorage: PINStorage } override fun onCreate() { diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java index a5b39c5ed9..481f2afb2b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java @@ -3,8 +3,8 @@ package com.tangem.domain.wallet; import android.net.Uri; import android.text.InputFilter; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.tangemcommon.tasks.SignTask; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java index fe832ac55e..9b2177da0b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -6,8 +6,8 @@ import android.os.Bundle; import com.tangem.Constant; import com.tangem.data.Blockchain; -import com.tangem.tangemcard.data.TangemCard; import com.tangem.tangemcard.data.TangemCardExtensionsKt; +import com.tangem.tangemcommon.data.TangemCard; public class TangemContext { // public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"; diff --git a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java index 632dfd12d1..a89d916c95 100644 --- a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java @@ -16,8 +16,8 @@ import com.tangem.domain.wallet.Keccak256; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.eth.EthData; import com.tangem.domain.wallet.token.TokenData; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.wallet.R; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java index 45fd76eba1..96d178234f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java @@ -18,8 +18,8 @@ import com.tangem.domain.wallet.EthTransaction; import com.tangem.domain.wallet.Keccak256; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.eth.EthData; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; +import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.tangemcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt index efd9400f68..92815f8889 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt @@ -21,8 +21,8 @@ import com.tangem.domain.wallet.TangemContext import com.tangem.presentation.event.TransactionFinishWithError import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle +import com.tangem.tangemcommon.data.TangemCard import com.tangem.util.UtilHelper import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_confirm_transaction.* diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt index d20ddac09e..6ed08bc66b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -22,9 +22,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.CreateNewWalletTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.CreateNewWalletTask +import com.tangem.tangemcommon.util.Util import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_create_new_wallet.* import kotlinx.android.synthetic.main.layout_progress_horizontal.* diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt index 2a87fbdf71..591df62fad 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -23,12 +23,12 @@ import com.tangem.presentation.dialog.WaitSecurityDelayDialog import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.asBundle import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.VerifyCardTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.VerifyCardTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.util.UtilHelper import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt index 74012de29c..cb3227e1d2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -34,11 +34,11 @@ import com.tangem.tangemcard.android.nfc.NfcDeviceAntennaLocation import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle import com.tangem.tangemcard.data.saveToBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.ReadCardInfoTask +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.ReadCardInfoTask import com.tangem.util.CommonUtil import com.tangem.util.LOG import com.tangem.util.PhoneUtility diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt index 23ab30cf58..1ae1e72cae 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -26,10 +26,10 @@ import com.tangem.data.fingerprint.FingerprintHelper import com.tangem.domain.wallet.TangemContext import com.tangem.tangemcard.android.data.PINStorage import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID +import com.tangem.tangemcommon.data.TangemCard import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_request.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt index 7700515491..c0de9bdfd6 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -21,9 +21,10 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.* -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.SwapPINTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.SwapPINTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_swap.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt index dc8bbb7665..e44c8a0ece 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -24,9 +24,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.PurgeTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.PurgeTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_purge.* diff --git a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt index bdb47af618..6d19aa4b8c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt @@ -25,9 +25,9 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.SignTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.SignTask +import com.tangem.tangemcommon.util.Util import com.tangem.util.LOG import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_sign_transaction.* diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index 726bc520dc..35a0d6eed3 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -44,11 +44,11 @@ import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol -import com.tangem.tangemcard.tasks.VerifyCardTask -import com.tangem.tangemcard.util.Util +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.tangemcommon.tasks.VerifyCardTask +import com.tangem.tangemcommon.util.Util import com.tangem.tangemserver.android.ServerApiTangem import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo import com.tangem.util.LOG diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index 4afa6e42ab..e9a2f0b4bf 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -25,9 +25,9 @@ import com.tangem.presentation.event.DeletingWalletFinish import com.tangem.tangemcard.android.data.PINStorage import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver import com.tangem.tangemcard.android.reader.NfcManager -import com.tangem.tangemcard.data.TangemCard import com.tangem.tangemcard.data.loadFromBundle -import com.tangem.tangemcard.reader.CardProtocol +import com.tangem.tangemcommon.data.TangemCard +import com.tangem.tangemcommon.reader.CardProtocol import com.tangem.util.LOG import com.tangem.wallet.BuildConfig import com.tangem.wallet.R