From 250ceba99fe0b8fac26785368819b0bc1a218248 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 8 Apr 2019 15:05:55 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 9 ++----- .../data/network/ServerApiElectrum.java | 10 ++++---- app/src/main/java/com/tangem/di/Navigator.kt | 2 +- .../domain/wallet/cardano/CardanoUtils.java | 4 --- .../ui/activity/CreateNewWalletActivity.kt | 2 +- .../tangem/ui/activity/EmptyWalletActivity.kt | 2 +- .../ui/activity/LoadedWalletActivity.kt | 2 +- .../com/tangem/ui/activity/LogoActivity.kt | 2 +- .../com/tangem/ui/activity/MainActivity.kt | 12 ++------- .../tangem/ui/activity/PinRequestActivity.kt | 2 +- ...pareCryptonitOtherApiWithdrawalActivity.kt | 4 +-- .../PrepareCryptonitWithdrawalActivity.kt | 4 +-- .../PrepareKrakenWithdrawalActivity.kt | 4 +-- .../com/tangem/ui/activity/PurgeActivity.kt | 2 +- .../ui/activity/SendTransactionActivity.kt | 6 ++--- .../tangem/ui/activity/VerifyCardActivity.kt | 2 +- .../com/tangem/ui/fragment/LoadedWallet.kt | 8 +++--- .../java/com/tangem/ui/fragment/VerifyCard.kt | 4 +-- .../main/java/com/tangem/util/CryptoUtil.java | 2 +- .../java/com/tangem/util/DerEncodingUtil.java | 2 +- .../tangem/{domain => }/wallet/BCHUtils.java | 8 +++--- .../tangem/{domain => }/wallet/BTCUtils.java | 8 +++--- .../{domain => }/wallet/BalanceValidator.java | 3 +-- .../tangem/{domain => }/wallet/Base58.java | 2 +- .../tangem/{domain => }/wallet/CoinData.java | 4 +-- .../{domain => }/wallet/CoinEngine.java | 2 +- .../{domain => }/wallet/CoinEngineFactory.kt | 25 +++++++++---------- .../tangem/{domain => }/wallet/Digest.java | 2 +- .../{domain => }/wallet/DigestEngine.java | 2 +- .../wallet/ECDSASignatureETH.java | 2 +- .../{domain => }/wallet/EthTransaction.java | 2 +- .../tangem/{domain => }/wallet/Keccak256.java | 2 +- .../{domain => }/wallet/KeccakCore.java | 2 +- .../com/tangem/{domain => }/wallet/RLP.java | 2 +- .../{domain => }/wallet/RLPElement.java | 2 +- .../tangem/{domain => }/wallet/RLPList.java | 2 +- .../{domain => }/wallet/TangemContext.java | 2 +- .../{domain => }/wallet/Transaction.java | 8 +++--- .../wallet/UnspentOutputInfo.java | 2 +- .../bch/BitcoinCashAddressDecodedParts.java | 2 +- .../wallet/bch/BitcoinCashAddressType.java | 2 +- .../wallet/bch/BitcoinCashBase32.java | 2 +- .../bch/BitcoinCashBitArrayConverter.java | 2 +- .../wallet/bch/BitcoinCashNode.kt | 2 +- .../wallet/bch/BtcCashEngine.java | 20 +++++++-------- .../{domain => }/wallet/bch/CashAddr.java | 2 +- .../wallet/btc/BitcoinException.java | 2 +- .../wallet/btc/BitcoinInputStream.java | 2 +- .../{domain => }/wallet/btc/BitcoinNode.kt | 2 +- .../wallet/btc/BitcoinNodeTestNet.kt | 2 +- .../wallet/btc/BitcoinOutputStream.java | 4 +-- .../{domain => }/wallet/btc/BtcData.java | 6 ++--- .../{domain => }/wallet/btc/BtcEngine.java | 18 ++++++------- .../{domain => }/wallet/cardano/Blake2b.java | 18 ++++++------- .../wallet/cardano/CardanoData.java | 6 ++--- .../wallet/cardano/CardanoEngine.java | 19 +++++++------- .../tangem/wallet/cardano/CardanoUtils.java | 4 +++ .../wallet/ducatus/DucatusEngine.java | 20 +++++++-------- .../{domain => }/wallet/eth/EthData.java | 6 ++--- .../{domain => }/wallet/eth/EthEngine.java | 18 ++++++------- .../{domain => }/wallet/ltc/LitecoinNode.kt | 2 +- .../{domain => }/wallet/ltc/LtcEngine.java | 22 ++++++++-------- .../wallet/nftToken/NftTokenEngine.java | 18 ++++++------- .../{domain => }/wallet/rsk/RskEngine.java | 12 ++++----- .../wallet/rsk/RskTokenEngine.java | 12 ++++----- .../{domain => }/wallet/token/TokenData.java | 6 ++--- .../wallet/token/TokenEngine.java | 20 +++++++-------- .../{domain => }/wallet/xrp/XrpBase58.java | 2 +- .../{domain => }/wallet/xrp/XrpData.java | 6 ++--- .../{domain => }/wallet/xrp/XrpEngine.java | 12 ++++----- .../{domain => }/wallet/xrp/XrpPayment.java | 2 +- .../wallet/xrp/XrpSignedTransaction.java | 2 +- .../tangem/ui/ConfirmTransactionActivity.kt | 6 ++--- .../tangem/ui/PrepareTransactionActivity.kt | 4 +-- .../com/tangem/ui/SignTransactionActivity.kt | 8 +++--- .../tangem/ui/ConfirmTransactionActivity.kt | 6 ++--- .../tangem/ui/PrepareTransactionActivity.kt | 4 +-- .../com/tangem/ui/SignTransactionActivity.kt | 6 ++--- 78 files changed, 229 insertions(+), 247 deletions(-) delete mode 100644 app/src/main/java/com/tangem/domain/wallet/cardano/CardanoUtils.java rename app/src/main/java/com/tangem/{domain => }/wallet/BCHUtils.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/BTCUtils.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/BalanceValidator.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/Base58.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/CoinData.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/CoinEngine.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/CoinEngineFactory.kt (82%) rename app/src/main/java/com/tangem/{domain => }/wallet/Digest.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/DigestEngine.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/ECDSASignatureETH.java (96%) rename app/src/main/java/com/tangem/{domain => }/wallet/EthTransaction.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/Keccak256.java (94%) rename app/src/main/java/com/tangem/{domain => }/wallet/KeccakCore.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/RLP.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/RLPElement.java (81%) rename app/src/main/java/com/tangem/{domain => }/wallet/RLPList.java (96%) rename app/src/main/java/com/tangem/{domain => }/wallet/TangemContext.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/Transaction.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/UnspentOutputInfo.java (95%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BitcoinCashAddressDecodedParts.java (93%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BitcoinCashAddressType.java (91%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BitcoinCashBase32.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BitcoinCashBitArrayConverter.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BitcoinCashNode.kt (94%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/BtcCashEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/bch/CashAddr.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BitcoinException.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BitcoinInputStream.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BitcoinNode.kt (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BitcoinNodeTestNet.kt (85%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BitcoinOutputStream.java (93%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BtcData.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/btc/BtcEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/cardano/Blake2b.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/cardano/CardanoData.java (96%) rename app/src/main/java/com/tangem/{domain => }/wallet/cardano/CardanoEngine.java (98%) create mode 100644 app/src/main/java/com/tangem/wallet/cardano/CardanoUtils.java rename app/src/main/java/com/tangem/{domain => }/wallet/ducatus/DucatusEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/eth/EthData.java (95%) rename app/src/main/java/com/tangem/{domain => }/wallet/eth/EthEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/ltc/LitecoinNode.kt (88%) rename app/src/main/java/com/tangem/{domain => }/wallet/ltc/LtcEngine.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/nftToken/NftTokenEngine.java (96%) rename app/src/main/java/com/tangem/{domain => }/wallet/rsk/RskEngine.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/rsk/RskTokenEngine.java (97%) rename app/src/main/java/com/tangem/{domain => }/wallet/token/TokenData.java (89%) rename app/src/main/java/com/tangem/{domain => }/wallet/token/TokenEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/xrp/XrpBase58.java (99%) rename app/src/main/java/com/tangem/{domain => }/wallet/xrp/XrpData.java (96%) rename app/src/main/java/com/tangem/{domain => }/wallet/xrp/XrpEngine.java (98%) rename app/src/main/java/com/tangem/{domain => }/wallet/xrp/XrpPayment.java (89%) rename app/src/main/java/com/tangem/{domain => }/wallet/xrp/XrpSignedTransaction.java (98%) diff --git a/app/build.gradle b/app/build.gradle index e27a08ba3a..b6688d00ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,19 +64,14 @@ dependencies { implementation project(':card-common') implementation project(':card-android') implementation project(':server-android') - -// implementation 'com.github.TangemCash:card-common:0.1.2' -// implementation 'com.github.TangemCash:card-android:0.1.3' -// implementation 'com.github.TangemCash:server-android:0.1.4' - - implementation 'androidx.appcompat:appcompat:1.1.0-alpha03' // implementation 'com.github.TangemCash:card-common:0.1.2' // implementation 'com.github.TangemCash:card-android:0.1.3' // implementation 'com.github.TangemCash:server-android:0.1.4' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha03' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - implementation 'androidx.biometric:biometric:1.0.0-alpha03' + implementation 'androidx.biometric:biometric:1.0.0-alpha04' implementation 'co.nstant.in:cbor:0.8' implementation 'com.google.android.material:material:1.1.0-alpha05' implementation 'com.google.dagger:dagger:2.21' diff --git a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java index 9b920fcace..0ec02300e7 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java @@ -3,12 +3,12 @@ package com.tangem.data.network; import android.util.Log; import com.tangem.App; -import com.tangem.domain.wallet.TangemContext; +import com.tangem.wallet.TangemContext; import com.tangem.data.Blockchain; -import com.tangem.domain.wallet.bch.BitcoinCashNode; -import com.tangem.domain.wallet.btc.BitcoinNode; -import com.tangem.domain.wallet.btc.BitcoinNodeTestNet; -import com.tangem.domain.wallet.ltc.LitecoinNode; +import com.tangem.wallet.bch.BitcoinCashNode; +import com.tangem.wallet.btc.BitcoinNode; +import com.tangem.wallet.btc.BitcoinNodeTestNet; +import com.tangem.wallet.ltc.LitecoinNode; import com.tangem.wallet.R; import java.io.BufferedReader; diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index 233e89fa3e..d8eb188b5b 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -3,7 +3,7 @@ package com.tangem.di import android.app.Activity import android.nfc.Tag import com.tangem.Constant -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.PrepareTransactionActivity import com.tangem.ui.activity.* import com.tangem.wallet.BuildConfig diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoUtils.java b/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoUtils.java deleted file mode 100644 index a32e926e0b..0000000000 --- a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoUtils.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.tangem.domain.wallet.cardano; - -public final class CardanoUtils { -} diff --git a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt index c09d220e7b..1c78b0f103 100644 --- a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt @@ -14,7 +14,7 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.dialog.NoExtendedLengthSupportDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation diff --git a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt index 2b77a85ec3..4c321ca647 100644 --- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt @@ -17,7 +17,7 @@ import android.widget.Toast import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.dialog.NoExtendedLengthSupportDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcLifecycleObserver diff --git a/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt index ed8ecb2152..1e7ab63b9a 100644 --- a/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.fragment.LoadedWallet import com.tangem.wallet.R import javax.inject.Inject diff --git a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt index 88bff775fc..841440d8f8 100644 --- a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt @@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.wallet.BuildConfig import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_logo.* diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt index 318847f23f..6f27424cf7 100644 --- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt @@ -34,18 +34,13 @@ import com.tangem.card_android.data.saveToBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.CustomReadCardTask -import com.tangem.card_common.tasks.OneTouchSignTask import com.tangem.card_common.tasks.ReadCardInfoTask -import com.tangem.card_common.tasks.SignTask -import com.tangem.card_common.util.Log -import com.tangem.data.Blockchain import com.tangem.data.Logger import com.tangem.data.network.ServerApiCommon import com.tangem.di.Navigator import com.tangem.di.ToastHelper -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.dialog.NoExtendedLengthSupportDialog import com.tangem.ui.dialog.RootFoundDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog @@ -59,9 +54,6 @@ import kotlinx.android.synthetic.main.layout_touch_card.* import java.io.File import java.util.* import javax.inject.Inject -import kotlinx.coroutines.runBlocking -import kotlin.coroutines.resume -import kotlin.coroutines.suspendCoroutine class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, PopupMenu.OnMenuItemClickListener { diff --git a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt index f0e8188008..c5570a6285 100644 --- a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt @@ -23,7 +23,7 @@ import com.tangem.Constant import com.tangem.data.fingerprint.StartFingerprintReaderTask import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.fingerprint.FingerprintHelper -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.card_android.android.data.PINStorage import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.data.loadFromBundle diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index fb878b2629..b7a279ea90 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -14,8 +14,8 @@ import com.tangem.Constant import com.tangem.data.Blockchain import com.tangem.data.network.CryptonitOtherApi import com.tangem.di.Navigator -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt index fb7cd29b40..798d1eff9a 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt @@ -15,8 +15,8 @@ import android.widget.Toast import com.tangem.data.network.Cryptonit import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.Blockchain -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.util.DecimalDigitsInputFilter import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt index 370df3dc68..3609aa8f8e 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt @@ -21,8 +21,8 @@ import com.tangem.data.network.Kraken import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.Blockchain import com.tangem.di.Navigator -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_kraken_withdrawal.* diff --git a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt index efd992346a..c4eec4af3b 100644 --- a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt @@ -15,7 +15,7 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.dialog.NoExtendedLengthSupportDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.ui.dialog.WaitSecurityDelayDialogNew diff --git a/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt index fef47ba877..c5614cc845 100644 --- a/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt @@ -9,9 +9,9 @@ import android.view.KeyEvent import android.widget.Toast import com.tangem.App import com.tangem.Constant -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.event.TransactionFinishWithError import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.card_android.android.nfc.NfcLifecycleObserver diff --git a/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt index 1321576d1a..394d7c41e0 100644 --- a/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/VerifyCardActivity.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.TangemContext import com.tangem.ui.fragment.VerifyCard import com.tangem.wallet.R import javax.inject.Inject diff --git a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt index 1a71db7376..66f3fd126b 100644 --- a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt @@ -24,10 +24,10 @@ import com.tangem.App import com.tangem.Constant import com.tangem.data.Blockchain import com.tangem.data.network.ServerApiCommon -import com.tangem.domain.wallet.BalanceValidator -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.BalanceValidator +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.activity.LoadedWalletActivity import com.tangem.ui.activity.PinRequestActivity import com.tangem.ui.activity.PrepareCryptonitWithdrawalActivity diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt index c13af16ed7..f11b61e502 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt @@ -25,8 +25,8 @@ import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.data.Blockchain -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.activity.PinRequestActivity import com.tangem.ui.activity.VerifyCardActivity import com.tangem.ui.dialog.PINSwapWarningDialog diff --git a/app/src/main/java/com/tangem/util/CryptoUtil.java b/app/src/main/java/com/tangem/util/CryptoUtil.java index 5d38bb662d..cde631f591 100644 --- a/app/src/main/java/com/tangem/util/CryptoUtil.java +++ b/app/src/main/java/com/tangem/util/CryptoUtil.java @@ -2,7 +2,7 @@ package com.tangem.util; import android.util.Log; -import com.tangem.domain.wallet.ECDSASignatureETH; +import com.tangem.wallet.ECDSASignatureETH; import com.tangem.card_common.util.Util; import org.spongycastle.asn1.ASN1EncodableVector; diff --git a/app/src/main/java/com/tangem/util/DerEncodingUtil.java b/app/src/main/java/com/tangem/util/DerEncodingUtil.java index a7894d6e44..3ff4a66391 100644 --- a/app/src/main/java/com/tangem/util/DerEncodingUtil.java +++ b/app/src/main/java/com/tangem/util/DerEncodingUtil.java @@ -1,6 +1,6 @@ package com.tangem.util; -import com.tangem.domain.wallet.btc.BitcoinOutputStream; +import com.tangem.wallet.btc.BitcoinOutputStream; import org.spongycastle.asn1.ASN1Integer; import org.spongycastle.asn1.DERSequenceGenerator; diff --git a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java b/app/src/main/java/com/tangem/wallet/BCHUtils.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/BCHUtils.java rename to app/src/main/java/com/tangem/wallet/BCHUtils.java index b1bdc93515..7c36d50153 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java +++ b/app/src/main/java/com/tangem/wallet/BCHUtils.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 29.09.2017. @@ -6,9 +6,9 @@ package com.tangem.domain.wallet; import android.util.Log; -import com.tangem.domain.wallet.btc.BitcoinException; -import com.tangem.domain.wallet.btc.BitcoinOutputStream; -import com.tangem.domain.wallet.btc.BtcData; +import com.tangem.wallet.btc.BitcoinException; +import com.tangem.wallet.btc.BitcoinOutputStream; +import com.tangem.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; import com.tangem.card_common.util.Util; diff --git a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java b/app/src/main/java/com/tangem/wallet/BTCUtils.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/BTCUtils.java rename to app/src/main/java/com/tangem/wallet/BTCUtils.java index e30f52eda7..180495a55e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java +++ b/app/src/main/java/com/tangem/wallet/BTCUtils.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 29.09.2017. @@ -6,9 +6,9 @@ package com.tangem.domain.wallet; import android.util.Log; -import com.tangem.domain.wallet.btc.BitcoinException; -import com.tangem.domain.wallet.btc.BitcoinOutputStream; -import com.tangem.domain.wallet.btc.BtcData; +import com.tangem.wallet.btc.BitcoinException; +import com.tangem.wallet.btc.BitcoinOutputStream; +import com.tangem.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; import com.tangem.card_common.util.Util; diff --git a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/wallet/BalanceValidator.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java rename to app/src/main/java/com/tangem/wallet/BalanceValidator.java index 5211920e44..1919d5f2ff 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/wallet/BalanceValidator.java @@ -1,8 +1,7 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import com.tangem.App; import com.tangem.card_common.data.TangemCard; -import com.tangem.wallet.R; public class BalanceValidator { private String firstLine; diff --git a/app/src/main/java/com/tangem/domain/wallet/Base58.java b/app/src/main/java/com/tangem/wallet/Base58.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/Base58.java rename to app/src/main/java/com/tangem/wallet/Base58.java index 1cfeb7c019..0948e420fc 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Base58.java +++ b/app/src/main/java/com/tangem/wallet/Base58.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinData.java b/app/src/main/java/com/tangem/wallet/CoinData.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/CoinData.java rename to app/src/main/java/com/tangem/wallet/CoinData.java index 9ec1663bdb..35b94be391 100644 --- a/app/src/main/java/com/tangem/domain/wallet/CoinData.java +++ b/app/src/main/java/com/tangem/wallet/CoinData.java @@ -1,12 +1,10 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import android.os.Bundle; import android.util.Log; import com.tangem.data.Blockchain; -import java.util.concurrent.atomic.AtomicInteger; - public abstract class CoinData { public CoinData() { diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/wallet/CoinEngine.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/CoinEngine.java rename to app/src/main/java/com/tangem/wallet/CoinEngine.java index 5936584616..ea0a0dfb6d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java +++ b/app/src/main/java/com/tangem/wallet/CoinEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import android.net.Uri; import android.text.InputFilter; diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt b/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt similarity index 82% rename from app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt rename to app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt index 2619f76b4a..1640e4a0bb 100644 --- a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt +++ b/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt @@ -1,20 +1,19 @@ -package com.tangem.domain.wallet +package com.tangem.wallet import android.util.Log -import com.tangem.domain.wallet.btc.BtcEngine -import com.tangem.domain.wallet.eth.EthEngine -import com.tangem.domain.wallet.token.TokenEngine -import com.tangem.domain.wallet.bch.BtcCashEngine +import com.tangem.wallet.btc.BtcEngine +import com.tangem.wallet.eth.EthEngine +import com.tangem.wallet.token.TokenEngine +import com.tangem.wallet.bch.BtcCashEngine import com.tangem.data.Blockchain -import com.tangem.domain.wallet.cardano.CardanoData -import com.tangem.domain.wallet.cardano.CardanoEngine -import com.tangem.domain.wallet.eth.EthData -import com.tangem.domain.wallet.ltc.LtcEngine -import com.tangem.domain.wallet.nftToken.NftTokenEngine -import com.tangem.domain.wallet.rsk.RskEngine -import com.tangem.domain.wallet.rsk.RskTokenEngine -import com.tangem.domain.wallet.xrp.XrpEngine +import com.tangem.wallet.cardano.CardanoData +import com.tangem.wallet.cardano.CardanoEngine +import com.tangem.wallet.ltc.LtcEngine +import com.tangem.wallet.nftToken.NftTokenEngine +import com.tangem.wallet.rsk.RskEngine +import com.tangem.wallet.rsk.RskTokenEngine +import com.tangem.wallet.xrp.XrpEngine /** * Factory for create specific engine diff --git a/app/src/main/java/com/tangem/domain/wallet/Digest.java b/app/src/main/java/com/tangem/wallet/Digest.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/Digest.java rename to app/src/main/java/com/tangem/wallet/Digest.java index 5e01c1dba6..b3924d61c7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Digest.java +++ b/app/src/main/java/com/tangem/wallet/Digest.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 18.12.2017. diff --git a/app/src/main/java/com/tangem/domain/wallet/DigestEngine.java b/app/src/main/java/com/tangem/wallet/DigestEngine.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/DigestEngine.java rename to app/src/main/java/com/tangem/wallet/DigestEngine.java index 5d7f092f82..8dd130353d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/DigestEngine.java +++ b/app/src/main/java/com/tangem/wallet/DigestEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import java.security.MessageDigest; diff --git a/app/src/main/java/com/tangem/domain/wallet/ECDSASignatureETH.java b/app/src/main/java/com/tangem/wallet/ECDSASignatureETH.java similarity index 96% rename from app/src/main/java/com/tangem/domain/wallet/ECDSASignatureETH.java rename to app/src/main/java/com/tangem/wallet/ECDSASignatureETH.java index 186ab80e43..a4b9741a1d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ECDSASignatureETH.java +++ b/app/src/main/java/com/tangem/wallet/ECDSASignatureETH.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/EthTransaction.java b/app/src/main/java/com/tangem/wallet/EthTransaction.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/EthTransaction.java rename to app/src/main/java/com/tangem/wallet/EthTransaction.java index aa13d6d93e..dd91845fb2 100644 --- a/app/src/main/java/com/tangem/domain/wallet/EthTransaction.java +++ b/app/src/main/java/com/tangem/wallet/EthTransaction.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import android.util.Log; diff --git a/app/src/main/java/com/tangem/domain/wallet/Keccak256.java b/app/src/main/java/com/tangem/wallet/Keccak256.java similarity index 94% rename from app/src/main/java/com/tangem/domain/wallet/Keccak256.java rename to app/src/main/java/com/tangem/wallet/Keccak256.java index ba0d30fe41..bd8c2b5ded 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Keccak256.java +++ b/app/src/main/java/com/tangem/wallet/Keccak256.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 18.12.2017. diff --git a/app/src/main/java/com/tangem/domain/wallet/KeccakCore.java b/app/src/main/java/com/tangem/wallet/KeccakCore.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/KeccakCore.java rename to app/src/main/java/com/tangem/wallet/KeccakCore.java index 7b5fe7a76e..015b33bb49 100644 --- a/app/src/main/java/com/tangem/domain/wallet/KeccakCore.java +++ b/app/src/main/java/com/tangem/wallet/KeccakCore.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** diff --git a/app/src/main/java/com/tangem/domain/wallet/RLP.java b/app/src/main/java/com/tangem/wallet/RLP.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/RLP.java rename to app/src/main/java/com/tangem/wallet/RLP.java index cd581e9145..7ec159ead9 100644 --- a/app/src/main/java/com/tangem/domain/wallet/RLP.java +++ b/app/src/main/java/com/tangem/wallet/RLP.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 07.01.2018. diff --git a/app/src/main/java/com/tangem/domain/wallet/RLPElement.java b/app/src/main/java/com/tangem/wallet/RLPElement.java similarity index 81% rename from app/src/main/java/com/tangem/domain/wallet/RLPElement.java rename to app/src/main/java/com/tangem/wallet/RLPElement.java index a94de8a740..ae82526c2d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/RLPElement.java +++ b/app/src/main/java/com/tangem/wallet/RLPElement.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import java.io.Serializable; diff --git a/app/src/main/java/com/tangem/domain/wallet/RLPList.java b/app/src/main/java/com/tangem/wallet/RLPList.java similarity index 96% rename from app/src/main/java/com/tangem/domain/wallet/RLPList.java rename to app/src/main/java/com/tangem/wallet/RLPList.java index 90915c9f27..14164502b3 100644 --- a/app/src/main/java/com/tangem/domain/wallet/RLPList.java +++ b/app/src/main/java/com/tangem/wallet/RLPList.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import java.util.ArrayList; diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/wallet/TangemContext.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/TangemContext.java rename to app/src/main/java/com/tangem/wallet/TangemContext.java index d48c90c939..3a0ee4e444 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/wallet/TangemContext.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/tangem/domain/wallet/Transaction.java b/app/src/main/java/com/tangem/wallet/Transaction.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/Transaction.java rename to app/src/main/java/com/tangem/wallet/Transaction.java index 792a116802..359572a2f3 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Transaction.java +++ b/app/src/main/java/com/tangem/wallet/Transaction.java @@ -1,12 +1,12 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 29.09.2017. */ -import com.tangem.domain.wallet.btc.BitcoinException; -import com.tangem.domain.wallet.btc.BitcoinInputStream; -import com.tangem.domain.wallet.btc.BitcoinOutputStream; +import com.tangem.wallet.btc.BitcoinException; +import com.tangem.wallet.btc.BitcoinInputStream; +import com.tangem.wallet.btc.BitcoinOutputStream; import com.tangem.util.CryptoUtil; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/tangem/domain/wallet/UnspentOutputInfo.java b/app/src/main/java/com/tangem/wallet/UnspentOutputInfo.java similarity index 95% rename from app/src/main/java/com/tangem/domain/wallet/UnspentOutputInfo.java rename to app/src/main/java/com/tangem/wallet/UnspentOutputInfo.java index 88191c50b6..d2f790b24e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/UnspentOutputInfo.java +++ b/app/src/main/java/com/tangem/wallet/UnspentOutputInfo.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.wallet; /** * Created by Ilia on 29.09.2017. diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressDecodedParts.java b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressDecodedParts.java similarity index 93% rename from app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressDecodedParts.java rename to app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressDecodedParts.java index c3229f4ca6..104c19c31f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressDecodedParts.java +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressDecodedParts.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; // Helper class for CashAddr diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressType.java b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressType.java similarity index 91% rename from app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressType.java rename to app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressType.java index d140031086..1beab277b6 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashAddressType.java +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashAddressType.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; /** diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBase32.java b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashBase32.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBase32.java rename to app/src/main/java/com/tangem/wallet/bch/BitcoinCashBase32.java index 0ddb910295..5e1a6a8c5d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBase32.java +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashBase32.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBitArrayConverter.java b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashBitArrayConverter.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBitArrayConverter.java rename to app/src/main/java/com/tangem/wallet/bch/BitcoinCashBitArrayConverter.java index 770f16fbbe..3f92f9445c 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashBitArrayConverter.java +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashBitArrayConverter.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; /** * Copyright (c) 2018 Tobias Brandt * diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashNode.kt b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt similarity index 94% rename from app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashNode.kt rename to app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt index 66eedee951..4331bf3600 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BitcoinCashNode.kt +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch +package com.tangem.wallet.bch enum class BitcoinCashNode(val host: String, val port: Int, val proto: String) { N_001("electrumx.hillsideinternet.com", 50002, "ssl"), diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java rename to app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java index 72209f4fed..f29bc7e7f4 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; import android.net.Uri; import android.text.InputFilter; @@ -6,17 +6,17 @@ import android.util.Log; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; -import com.tangem.domain.wallet.BCHUtils; -import com.tangem.domain.wallet.BTCUtils; +import com.tangem.wallet.BCHUtils; +import com.tangem.wallet.BTCUtils; import com.tangem.card_common.reader.CardProtocol; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.btc.BtcData; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.btc.BtcData; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import com.tangem.card_common.data.TangemCard; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.Transaction; -import com.tangem.domain.wallet.UnspentOutputInfo; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; import com.tangem.card_common.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/CashAddr.java b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/bch/CashAddr.java rename to app/src/main/java/com/tangem/wallet/bch/CashAddr.java index d73f88f8d7..25c6851c16 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/CashAddr.java +++ b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.bch; +package com.tangem.wallet.bch; import java.math.BigInteger; import java.util.Arrays; diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinException.java b/app/src/main/java/com/tangem/wallet/btc/BitcoinException.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/btc/BitcoinException.java rename to app/src/main/java/com/tangem/wallet/btc/BitcoinException.java index cad6f01464..2089694fc6 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinException.java +++ b/app/src/main/java/com/tangem/wallet/btc/BitcoinException.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.btc; +package com.tangem.wallet.btc; /** * Created by Ilia on 29.09.2017. diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinInputStream.java b/app/src/main/java/com/tangem/wallet/btc/BitcoinInputStream.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/btc/BitcoinInputStream.java rename to app/src/main/java/com/tangem/wallet/btc/BitcoinInputStream.java index 109e0e7323..830a42a1fc 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinInputStream.java +++ b/app/src/main/java/com/tangem/wallet/btc/BitcoinInputStream.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.btc; +package com.tangem.wallet.btc; /** * Created by Ilia on 29.09.2017. diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNode.kt b/app/src/main/java/com/tangem/wallet/btc/BitcoinNode.kt similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNode.kt rename to app/src/main/java/com/tangem/wallet/btc/BitcoinNode.kt index 7259769043..370cb66600 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNode.kt +++ b/app/src/main/java/com/tangem/wallet/btc/BitcoinNode.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.btc +package com.tangem.wallet.btc enum class BitcoinNode(val host: String, val port: Int, val proto: String) { N_001("electrum.be", 50001, "tcp"), diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNodeTestNet.kt b/app/src/main/java/com/tangem/wallet/btc/BitcoinNodeTestNet.kt similarity index 85% rename from app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNodeTestNet.kt rename to app/src/main/java/com/tangem/wallet/btc/BitcoinNodeTestNet.kt index 34b257c278..867d477dc4 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinNodeTestNet.kt +++ b/app/src/main/java/com/tangem/wallet/btc/BitcoinNodeTestNet.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.btc +package com.tangem.wallet.btc enum class BitcoinNodeTestNet(val host: String, val port: Int) { n1("testnetnode.arihanc.com", 51001), diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinOutputStream.java b/app/src/main/java/com/tangem/wallet/btc/BitcoinOutputStream.java similarity index 93% rename from app/src/main/java/com/tangem/domain/wallet/btc/BitcoinOutputStream.java rename to app/src/main/java/com/tangem/wallet/btc/BitcoinOutputStream.java index ced90a20d3..6646fa8641 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BitcoinOutputStream.java +++ b/app/src/main/java/com/tangem/wallet/btc/BitcoinOutputStream.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.btc; +package com.tangem.wallet.btc; /** * Created by Ilia on 29.09.2017. */ -import com.tangem.domain.wallet.Transaction; +import com.tangem.wallet.Transaction; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java b/app/src/main/java/com/tangem/wallet/btc/BtcData.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java rename to app/src/main/java/com/tangem/wallet/btc/BtcData.java index 5a40f1ae6a..d024d9d91d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcData.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcData.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.btc; +package com.tangem.wallet.btc; import android.os.Bundle; import android.util.Log; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java rename to app/src/main/java/com/tangem/wallet/btc/BtcEngine.java index af4e04ece6..7245c9c4ba 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.btc; +package com.tangem.wallet.btc; import android.net.Uri; import android.text.InputFilter; @@ -13,14 +13,14 @@ import com.tangem.data.Blockchain; import com.tangem.data.local.PendingTransactionsStorage; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.Base58; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.Transaction; -import com.tangem.domain.wallet.UnspentOutputInfo; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.Base58; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/Blake2b.java b/app/src/main/java/com/tangem/wallet/cardano/Blake2b.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/cardano/Blake2b.java rename to app/src/main/java/com/tangem/wallet/cardano/Blake2b.java index b50c045435..03042c8852 100644 --- a/app/src/main/java/com/tangem/domain/wallet/cardano/Blake2b.java +++ b/app/src/main/java/com/tangem/wallet/cardano/Blake2b.java @@ -17,7 +17,7 @@ this software. If not, see . */ -package com.tangem.domain.wallet.cardano; +package com.tangem.wallet.cardano; import java.io.PrintStream; import java.io.Serializable; @@ -25,14 +25,14 @@ import java.security.Key; import java.security.spec.AlgorithmParameterSpec; // JCE not supported / anticipated .. import java.util.Arrays; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.Assert.assertFail; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.Assert.exclusiveLowerBound; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.Assert.inclusiveLowerBound; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.Assert.inclusiveUpperBound; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.LittleEndian.readInt; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.LittleEndian.readLong; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.LittleEndian.writeInt; -import static com.tangem.domain.wallet.cardano.Blake2b.Engine.LittleEndian.writeLong; +import static com.tangem.wallet.cardano.Blake2b.Engine.Assert.assertFail; +import static com.tangem.wallet.cardano.Blake2b.Engine.Assert.exclusiveLowerBound; +import static com.tangem.wallet.cardano.Blake2b.Engine.Assert.inclusiveLowerBound; +import static com.tangem.wallet.cardano.Blake2b.Engine.Assert.inclusiveUpperBound; +import static com.tangem.wallet.cardano.Blake2b.Engine.LittleEndian.readInt; +import static com.tangem.wallet.cardano.Blake2b.Engine.LittleEndian.readLong; +import static com.tangem.wallet.cardano.Blake2b.Engine.LittleEndian.writeInt; +import static com.tangem.wallet.cardano.Blake2b.Engine.LittleEndian.writeLong; diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoData.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoData.java similarity index 96% rename from app/src/main/java/com/tangem/domain/wallet/cardano/CardanoData.java rename to app/src/main/java/com/tangem/wallet/cardano/CardanoData.java index afe9f7b101..9e46ad937a 100644 --- a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoData.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoData.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.cardano; +package com.tangem.wallet.cardano; import android.os.Bundle; import android.util.Log; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java rename to app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java index 9b5b085666..e3519b2b28 100644 --- a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.cardano; +package com.tangem.wallet.cardano; import android.net.Uri; import android.text.InputFilter; @@ -13,14 +13,13 @@ import com.tangem.data.network.model.AdaliteResponse; import com.tangem.data.network.model.AdaliteResponseUtxo; import com.tangem.data.network.model.AdaliteTxData; import com.tangem.data.network.model.AdaliteUtxoData; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.Base58; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.TangemContext; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.Base58; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.TangemContext; import com.tangem.card_common.data.TangemCard; -import com.tangem.card_common.reader.CardProtocol; import com.tangem.card_common.tasks.SignTask; import com.tangem.card_common.util.Util; import com.tangem.util.DecimalDigitsInputFilter; @@ -48,8 +47,8 @@ import co.nstant.in.cbor.model.ByteString; import co.nstant.in.cbor.model.DataItem; import co.nstant.in.cbor.model.UnsignedInteger; -import static com.tangem.domain.wallet.Base58.decodeBase58; -import static com.tangem.domain.wallet.Base58.encodeBase58; +import static com.tangem.wallet.Base58.decodeBase58; +import static com.tangem.wallet.Base58.encodeBase58; public class CardanoEngine extends CoinEngine { diff --git a/app/src/main/java/com/tangem/wallet/cardano/CardanoUtils.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoUtils.java new file mode 100644 index 0000000000..a85a13c532 --- /dev/null +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoUtils.java @@ -0,0 +1,4 @@ +package com.tangem.wallet.cardano; + +public final class CardanoUtils { +} diff --git a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java rename to app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java index d7e9a7f1fb..bc7c58c4d9 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.ducatus; +package com.tangem.wallet.ducatus; import android.net.Uri; import android.text.InputFilter; @@ -6,15 +6,15 @@ import android.util.Log; import com.tangem.data.network.ServerApiInsight; import com.tangem.data.network.model.InsightResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.Base58; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.Transaction; -import com.tangem.domain.wallet.UnspentOutputInfo; -import com.tangem.domain.wallet.btc.BtcData; -import com.tangem.domain.wallet.btc.BtcEngine; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.Base58; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; +import com.tangem.wallet.btc.BtcData; +import com.tangem.wallet.btc.BtcEngine; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.reader.CardProtocol; import com.tangem.card_common.tasks.SignTask; diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthData.java b/app/src/main/java/com/tangem/wallet/eth/EthData.java similarity index 95% rename from app/src/main/java/com/tangem/domain/wallet/eth/EthData.java rename to app/src/main/java/com/tangem/wallet/eth/EthData.java index 7921eaf1c6..2135c886a1 100644 --- a/app/src/main/java/com/tangem/domain/wallet/eth/EthData.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthData.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.eth; +package com.tangem.wallet.eth; import android.os.Bundle; import android.util.Log; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java rename to app/src/main/java/com/tangem/wallet/eth/EthEngine.java index 79f97153da..c7aee538c7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.eth; +package com.tangem.wallet.eth; import android.net.Uri; import android.text.InputFilter; @@ -8,14 +8,14 @@ import com.tangem.Constant; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.ECDSASignatureETH; -import com.tangem.domain.wallet.EthTransaction; -import com.tangem.domain.wallet.Keccak256; -import com.tangem.domain.wallet.TangemContext; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.ECDSASignatureETH; +import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.Keccak256; +import com.tangem.wallet.TangemContext; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.tasks.SignTask; import com.tangem.util.CryptoUtil; diff --git a/app/src/main/java/com/tangem/domain/wallet/ltc/LitecoinNode.kt b/app/src/main/java/com/tangem/wallet/ltc/LitecoinNode.kt similarity index 88% rename from app/src/main/java/com/tangem/domain/wallet/ltc/LitecoinNode.kt rename to app/src/main/java/com/tangem/wallet/ltc/LitecoinNode.kt index fce1899f72..5e2f9669e0 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ltc/LitecoinNode.kt +++ b/app/src/main/java/com/tangem/wallet/ltc/LitecoinNode.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.ltc +package com.tangem.wallet.ltc enum class LitecoinNode(val host: String, val port: Int, val proto: String) { N_001("backup.electrum-ltc.org", 443, "ssl"), diff --git a/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java rename to app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java index 17db21d852..55b34f61a6 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.ltc; +package com.tangem.wallet.ltc; import android.net.Uri; import android.text.InputFilter; @@ -6,16 +6,16 @@ import android.util.Log; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.Base58; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.Transaction; -import com.tangem.domain.wallet.UnspentOutputInfo; -import com.tangem.domain.wallet.btc.BtcData; -import com.tangem.domain.wallet.btc.BtcEngine; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.Base58; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; +import com.tangem.wallet.btc.BtcData; +import com.tangem.wallet.btc.BtcEngine; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.reader.CardProtocol; import com.tangem.card_common.tasks.SignTask; diff --git a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java b/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java similarity index 96% rename from app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java rename to app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java index a2669cc027..6b8853af1f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.nftToken; +package com.tangem.wallet.nftToken; import android.net.Uri; import android.os.Bundle; @@ -8,14 +8,14 @@ import android.util.Log; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -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.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.Keccak256; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.eth.EthData; +import com.tangem.wallet.token.TokenData; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.tasks.SignTask; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java rename to app/src/main/java/com/tangem/wallet/rsk/RskEngine.java index a82a04e799..99e1229d9f 100644 --- a/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.rsk; +package com.tangem.wallet.rsk; import android.net.Uri; import android.util.Log; @@ -6,11 +6,11 @@ import android.util.Log; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiRootstock; import com.tangem.data.network.model.InfuraResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.EthTransaction; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.eth.EthEngine; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.eth.EthEngine; import com.tangem.wallet.R; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java similarity index 97% rename from app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java rename to app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java index c71992239d..1d189ecc4c 100644 --- a/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.rsk; +package com.tangem.wallet.rsk; import android.net.Uri; import android.util.Log; @@ -6,11 +6,11 @@ import android.util.Log; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiRootstock; import com.tangem.data.network.model.InfuraResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.EthTransaction; -import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.token.TokenEngine; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.token.TokenEngine; import com.tangem.wallet.R; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenData.java b/app/src/main/java/com/tangem/wallet/token/TokenData.java similarity index 89% rename from app/src/main/java/com/tangem/domain/wallet/token/TokenData.java rename to app/src/main/java/com/tangem/wallet/token/TokenData.java index 832cc379de..ef67680617 100644 --- a/app/src/main/java/com/tangem/domain/wallet/token/TokenData.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenData.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.token; +package com.tangem.wallet.token; import android.os.Bundle; import android.util.Log; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.eth.EthData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.eth.EthData; public class TokenData extends EthData { private CoinEngine.InternalAmount balanceAlter = null; diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java rename to app/src/main/java/com/tangem/wallet/token/TokenEngine.java index ab83e83c5d..77e44cc5e3 100644 --- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.token; +package com.tangem.wallet.token; import android.net.Uri; import android.os.Bundle; @@ -9,15 +9,15 @@ import com.google.common.base.Strings; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.ECDSASignatureETH; -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.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.ECDSASignatureETH; +import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.Keccak256; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.eth.EthData; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.tasks.SignTask; import com.tangem.util.CryptoUtil; diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpBase58.java b/app/src/main/java/com/tangem/wallet/xrp/XrpBase58.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/xrp/XrpBase58.java rename to app/src/main/java/com/tangem/wallet/xrp/XrpBase58.java index 7a34b0d289..c149776f2c 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpBase58.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpBase58.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.xrp; +package com.tangem.wallet.xrp; import java.math.BigInteger; diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpData.java b/app/src/main/java/com/tangem/wallet/xrp/XrpData.java similarity index 96% rename from app/src/main/java/com/tangem/domain/wallet/xrp/XrpData.java rename to app/src/main/java/com/tangem/wallet/xrp/XrpData.java index a44db475f8..1e2edabcb4 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpData.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpData.java @@ -1,10 +1,10 @@ -package com.tangem.domain.wallet.xrp; +package com.tangem.wallet.xrp; import android.os.Bundle; import android.util.Log; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import java.math.BigDecimal; diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpEngine.java b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/xrp/XrpEngine.java rename to app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java index d79b9ca4cd..ebc9b0d847 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.xrp; +package com.tangem.wallet.xrp; import android.net.Uri; import android.text.InputFilter; @@ -15,11 +15,11 @@ import com.tangem.card_common.tasks.SignTask; import com.tangem.card_common.util.Util; import com.tangem.data.network.ServerApiRipple; import com.tangem.data.network.model.RippleResponse; -import com.tangem.domain.wallet.BTCUtils; -import com.tangem.domain.wallet.BalanceValidator; -import com.tangem.domain.wallet.CoinData; -import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.TangemContext; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; +import com.tangem.wallet.TangemContext; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java b/app/src/main/java/com/tangem/wallet/xrp/XrpPayment.java similarity index 89% rename from app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java rename to app/src/main/java/com/tangem/wallet/xrp/XrpPayment.java index 449d755e65..0252f205b7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpPayment.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.xrp; +package com.tangem.wallet.xrp; import com.ripple.core.types.known.tx.txns.Payment; diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpSignedTransaction.java b/app/src/main/java/com/tangem/wallet/xrp/XrpSignedTransaction.java similarity index 98% rename from app/src/main/java/com/tangem/domain/wallet/xrp/XrpSignedTransaction.java rename to app/src/main/java/com/tangem/wallet/xrp/XrpSignedTransaction.java index 29babc095b..bacdc95d34 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpSignedTransaction.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpSignedTransaction.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet.xrp; +package com.tangem.wallet.xrp; import com.ripple.core.coretypes.Amount; import com.ripple.core.coretypes.Blob; diff --git a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionActivity.kt b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionActivity.kt index 30f1693e35..60921bcef7 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionActivity.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionActivity.kt @@ -15,9 +15,9 @@ import android.view.View import android.widget.Toast import com.tangem.Constant import com.tangem.data.Blockchain -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.event.TransactionFinishWithError import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager diff --git a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt index c6edc34fb4..cd0e3491e1 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionActivity.kt @@ -17,8 +17,8 @@ import com.tangem.App import com.tangem.Constant import com.tangem.data.Blockchain import com.tangem.di.Navigator -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.util.UtilHelper diff --git a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt index 089fe31274..5f75ed7671 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt @@ -22,19 +22,19 @@ import com.tangem.card_android.android.reader.NfcReader import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.SignTask import com.tangem.card_common.util.Util -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.dialog.NoExtendedLengthSupportDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.util.LOG import com.tangem.wallet.R -import kotlinx.android.synthetic.main.activity_sign_transaction.* import kotlinx.android.synthetic.main.layout_progress_horizontal.* import kotlinx.android.synthetic.main.layout_touch_card.* import com.tangem.card_android.data.asBundle import com.tangem.card_android.data.EXTRA_TANGEM_CARD import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID +import kotlinx.android.synthetic.tangemAccess.activity_prepare_transaction.* class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { diff --git a/app/src/tangemCardano/java/com/tangem/ui/ConfirmTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/ConfirmTransactionActivity.kt index c325101aa8..5c92b0654c 100644 --- a/app/src/tangemCardano/java/com/tangem/ui/ConfirmTransactionActivity.kt +++ b/app/src/tangemCardano/java/com/tangem/ui/ConfirmTransactionActivity.kt @@ -15,9 +15,9 @@ import android.view.View import android.widget.Toast import com.tangem.Constant import com.tangem.card_android.android.data.PINStorage -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.event.TransactionFinishWithError import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt index 0a13127068..39c5307b4d 100644 --- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt +++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt @@ -22,8 +22,8 @@ import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.dp.PrefsManager import com.tangem.di.Navigator import com.tangem.di.ToastHelper -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.event.TransactionFinishWithError import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.util.UtilHelper diff --git a/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt index 5315335d51..a7961c738e 100644 --- a/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt +++ b/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt @@ -29,9 +29,9 @@ import com.tangem.card_common.tasks.CustomReadCardTask import com.tangem.card_common.tasks.OneTouchSignTask import com.tangem.card_common.tasks.SignTask import com.tangem.card_common.util.Log -import com.tangem.domain.wallet.CoinEngine -import com.tangem.domain.wallet.CoinEngineFactory -import com.tangem.domain.wallet.TangemContext +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory +import com.tangem.wallet.TangemContext import com.tangem.ui.activity.MainActivity import com.tangem.ui.activity.SendTransactionActivity import com.tangem.ui.dialog.NoExtendedLengthSupportDialog