From f5320a1952b1a1b87c786a674bed1def221609aa Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 27 Feb 2019 22:22:06 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/App.kt | 2 +- app/src/main/java/com/tangem/data/Logger.java | 2 +- .../data/network/CryptonitOtherApi.java | 2 +- .../java/com/tangem/data/network/Kraken.java | 2 +- .../com/tangem/domain/wallet/BCHUtils.java | 2 +- .../com/tangem/domain/wallet/BTCUtils.java | 2 +- .../domain/wallet/BalanceValidator.java | 2 +- .../com/tangem/domain/wallet/CoinEngine.java | 4 +-- .../tangem/domain/wallet/TangemContext.java | 2 +- .../domain/wallet/bch/BtcCashEngine.java | 8 +++--- .../tangem/domain/wallet/btc/BtcEngine.java | 8 +++--- .../domain/wallet/cardano/CardanoEngine.java | 8 +++--- .../domain/wallet/ducatus/DucatusEngine.java | 8 +++--- .../tangem/domain/wallet/eth/EthEngine.java | 4 +-- .../tangem/domain/wallet/ltc/LtcEngine.java | 8 +++--- .../wallet/nftToken/NftTokenEngine.java | 4 +-- .../domain/wallet/token/TokenEngine.java | 4 +-- .../activity/ConfirmTransactionActivity.kt | 2 +- .../activity/CreateNewWalletActivity.kt | 6 ++--- .../activity/EmptyWalletActivity.kt | 8 +++--- .../presentation/activity/MainActivity.kt | 6 ++--- .../activity/PinRequestActivity.kt | 2 +- .../presentation/activity/PinSwapActivity.kt | 8 +++--- .../presentation/activity/PurgeActivity.kt | 6 ++--- .../activity/SignTransactionActivity.kt | 6 ++--- .../presentation/fragment/LoadedWallet.kt | 8 +++--- .../presentation/fragment/VerifyCard.kt | 4 +-- .../main/java/com/tangem/util/CryptoUtil.java | 2 +- .../tangemcard/ExampleInstrumentedTest.java | 2 +- .../tangemcard/android/data/Firmwares.java | 4 +-- .../tangemcard/android/data/PINStorage.java | 4 +-- .../tangemcard/android/reader/NfcManager.kt | 2 +- .../tangemcard/android/reader/NfcReader.kt | 2 +- .../tangemcard/data/TangemCardExtensions.kt | 6 ++--- .../tangem/tangemcard/ExampleUnitTest.java | 2 +- .../data/Issuer.java | 6 ++--- .../data/Manufacturer.java | 2 +- .../data/TangemCard.java | 8 +++--- .../CardDataSubstitutionProvider.java | 4 +-- .../external/FirmwaresDigestsProvider.java | 2 +- .../data/external/PINsProvider.java | 2 +- .../reader/CardCrypto.java | 8 +++--- .../reader/CardProtocol.java | 10 +++---- .../reader/CommandApdu.java | 4 +-- .../reader/INS.java | 2 +- .../reader/NfcReader.java | 2 +- .../reader/ResponseApdu.java | 4 +-- .../reader/SW.java | 2 +- .../reader/SettingsMask.java | 2 +- .../reader/TLV.java | 4 +-- .../reader/TLVException.java | 2 +- .../reader/TLVList.java | 4 +-- .../tasks/CreateNewWalletTask.java | 14 +++++----- .../tasks/CustomReadCardTask.java | 26 +++++++++---------- .../tasks/PurgeTask.java | 12 ++++----- .../tasks/ReadCardInfoTask.java | 12 ++++----- .../tasks/SignTask.java | 18 ++++++------- .../tasks/SwapPINTask.java | 12 ++++----- .../tasks/VerifyCardTask.java | 16 ++++++------ .../util/Log.java | 2 +- .../util/PBKDF2.java | 2 +- .../util/Util.java | 2 +- .../tangem/tangemserver/ServerApiTangem.java | 4 +-- .../tangem/tangemserver/data/LocalStorage.kt | 8 +++--- 64 files changed, 174 insertions(+), 174 deletions(-) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/Issuer.java (96%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/Manufacturer.java (95%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/TangemCard.java (99%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/external/CardDataSubstitutionProvider.java (73%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/external/FirmwaresDigestsProvider.java (90%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/data/external/PINsProvider.java (94%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/CardCrypto.java (98%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/CardProtocol.java (99%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/CommandApdu.java (98%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/INS.java (94%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/NfcReader.java (88%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/ResponseApdu.java (97%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/SW.java (97%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/SettingsMask.java (98%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/TLV.java (98%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/TLVException.java (89%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/reader/TLVList.java (95%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/CreateNewWalletTask.java (72%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/CustomReadCardTask.java (96%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/PurgeTask.java (71%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/ReadCardInfoTask.java (85%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/SignTask.java (89%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/SwapPINTask.java (75%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/tasks/VerifyCardTask.java (80%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/util/Log.java (85%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/util/PBKDF2.java (98%) rename card-common/src/main/java/com/tangem/{tangemcommon => cardcommon}/util/Util.java (99%) diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index d49764e15b..b229f5eb05 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -10,7 +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.tangemcommon.data.Issuer +import com.tangem.cardcommon.data.Issuer import com.tangem.tangemserver.data.LocalStorage import java.io.InputStreamReader import java.nio.charset.StandardCharsets diff --git a/app/src/main/java/com/tangem/data/Logger.java b/app/src/main/java/com/tangem/data/Logger.java index 01c7bd46ae..0bb4042256 100644 --- a/app/src/main/java/com/tangem/data/Logger.java +++ b/app/src/main/java/com/tangem/data/Logger.java @@ -3,7 +3,7 @@ package com.tangem.data; import android.content.Context; import android.util.Log; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java index 7097530d85..efa6e3cf13 100644 --- a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java +++ b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java @@ -11,7 +11,7 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.internal.LinkedTreeMap; import com.jakewharton.retrofit2.adapter.rxjava2.HttpException; import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import com.tangem.wallet.R; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/data/network/Kraken.java b/app/src/main/java/com/tangem/data/network/Kraken.java index f0ca344987..7350f72ca8 100644 --- a/app/src/main/java/com/tangem/data/network/Kraken.java +++ b/app/src/main/java/com/tangem/data/network/Kraken.java @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import com.tangem.wallet.R; import org.spongycastle.util.encoders.Base64; diff --git a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java b/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java index 3a059da2f2..a43bfe607d 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java +++ b/app/src/main/java/com/tangem/domain/wallet/BCHUtils.java @@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java b/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java index f196a0ac9f..603450a6d3 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java +++ b/app/src/main/java/com/tangem/domain/wallet/BTCUtils.java @@ -11,7 +11,7 @@ import com.tangem.domain.wallet.btc.BitcoinOutputStream; import com.tangem.domain.wallet.btc.BtcData; import com.tangem.util.CryptoUtil; import com.tangem.util.FormatUtil; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java index 5fa7fd1f60..fb2306eb70 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java @@ -1,6 +1,6 @@ package com.tangem.domain.wallet; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.TangemCard; import com.tangem.wallet.R; public class BalanceValidator { 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 e4cfb67533..a3dc11f5a3 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.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.tasks.SignTask; import java.io.IOException; import java.math.BigDecimal; 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 9b2177da0b..4022a29dea 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -7,7 +7,7 @@ import android.os.Bundle; import com.tangem.Constant; import com.tangem.data.Blockchain; import com.tangem.tangemcard.data.TangemCardExtensionsKt; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.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/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java index 5ccbb927ac..b5e8bc4866 100644 --- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java @@ -8,20 +8,20 @@ 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.tangemcommon.reader.CardProtocol; +import com.tangem.cardcommon.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.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.TangemCard; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import com.tangem.wallet.R; import org.json.JSONArray; diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java index 8c63bb608d..867ddd24f0 100644 --- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java @@ -5,22 +5,22 @@ import android.text.InputFilter; import android.util.Log; import com.tangem.data.network.ServerApiCommon; -import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.cardcommon.reader.CardProtocol; import com.tangem.domain.wallet.BalanceValidator; import com.tangem.domain.wallet.Base58; import com.tangem.data.Blockchain; import com.tangem.domain.wallet.CoinData; import com.tangem.domain.wallet.CoinEngine; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.TangemCard; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.Transaction; import com.tangem.domain.wallet.UnspentOutputInfo; import com.tangem.domain.wallet.BTCUtils; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import com.tangem.wallet.R; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java index 8561f4c0ff..642c9e39aa 100644 --- a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java @@ -15,10 +15,10 @@ 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.tasks.SignTask; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.tasks.SignTask; +import com.tangem.cardcommon.util.Util; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java index 438643f7db..7230f3f5c7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/ducatus/DucatusEngine.java @@ -15,10 +15,10 @@ 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.tasks.SignTask; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.tasks.SignTask; +import com.tangem.cardcommon.util.Util; 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/eth/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java index 7ddebba10a..1370fbe741 100644 --- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java @@ -15,8 +15,8 @@ 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.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/domain/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java index 0bf1b2839a..b5494bf926 100644 --- a/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/ltc/LtcEngine.java @@ -16,10 +16,10 @@ 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.tasks.SignTask; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.tasks.SignTask; +import com.tangem.cardcommon.util.Util; 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/nftToken/NftTokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/nftToken/NftTokenEngine.java index a89d916c95..1b36b4948f 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.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 ee10a59073..a9305264be 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.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.tasks.SignTask; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.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 adede77949..3040c238df 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt @@ -22,7 +22,7 @@ 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.loadFromBundle -import com.tangem.tangemcommon.data.TangemCard +import com.tangem.cardcommon.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 6ed08bc66b..278cb84a15 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.tangemcommon.reader.CardProtocol -import com.tangem.tangemcommon.tasks.CreateNewWalletTask -import com.tangem.tangemcommon.util.Util +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.CreateNewWalletTask +import com.tangem.cardcommon.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 591df62fad..81f5497a83 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -25,10 +25,10 @@ import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.asBundle import com.tangem.tangemcard.data.loadFromBundle -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.cardcommon.data.TangemCard +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.VerifyCardTask +import com.tangem.cardcommon.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 cb3227e1d2..861c554829 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -36,9 +36,9 @@ import com.tangem.tangemcard.android.reader.NfcManager import com.tangem.tangemcard.android.reader.NfcReader import com.tangem.tangemcard.data.loadFromBundle import com.tangem.tangemcard.data.saveToBundle -import com.tangem.tangemcommon.data.TangemCard -import com.tangem.tangemcommon.reader.CardProtocol -import com.tangem.tangemcommon.tasks.ReadCardInfoTask +import com.tangem.cardcommon.data.TangemCard +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.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 1ae1e72cae..54a2fb1e75 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -29,7 +29,7 @@ import com.tangem.tangemcard.android.nfc.NfcLifecycleObserver 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.cardcommon.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 c0de9bdfd6..4f68fc4d4a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -21,10 +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.tangemcommon.data.TangemCard -import com.tangem.tangemcommon.reader.CardProtocol -import com.tangem.tangemcommon.tasks.SwapPINTask -import com.tangem.tangemcommon.util.Util +import com.tangem.cardcommon.data.TangemCard +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.SwapPINTask +import com.tangem.cardcommon.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 e44c8a0ece..1357fcf845 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.tangemcommon.reader.CardProtocol -import com.tangem.tangemcommon.tasks.PurgeTask -import com.tangem.tangemcommon.util.Util +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.PurgeTask +import com.tangem.cardcommon.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 6d19aa4b8c..fdef24c5b4 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.tangemcommon.reader.CardProtocol -import com.tangem.tangemcommon.tasks.SignTask -import com.tangem.tangemcommon.util.Util +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.SignTask +import com.tangem.cardcommon.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 9ad730d18d..c9a6c88221 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -45,10 +45,10 @@ 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.loadFromBundle -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.cardcommon.data.TangemCard +import com.tangem.cardcommon.reader.CardProtocol +import com.tangem.cardcommon.tasks.VerifyCardTask +import com.tangem.cardcommon.util.Util import com.tangem.tangemserver.ServerApiTangem import com.tangem.tangemserver.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 e9a2f0b4bf..e2bf93f3e2 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -26,8 +26,8 @@ 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.loadFromBundle -import com.tangem.tangemcommon.data.TangemCard -import com.tangem.tangemcommon.reader.CardProtocol +import com.tangem.cardcommon.data.TangemCard +import com.tangem.cardcommon.reader.CardProtocol import com.tangem.util.LOG import com.tangem.wallet.BuildConfig import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/util/CryptoUtil.java b/app/src/main/java/com/tangem/util/CryptoUtil.java index d3e90a7ff7..65402c3d40 100644 --- a/app/src/main/java/com/tangem/util/CryptoUtil.java +++ b/app/src/main/java/com/tangem/util/CryptoUtil.java @@ -3,7 +3,7 @@ package com.tangem.util; import android.util.Log; import com.tangem.domain.wallet.ECDSASignatureETH; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import org.spongycastle.asn1.ASN1EncodableVector; import org.spongycastle.asn1.ASN1Integer; diff --git a/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java b/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java index ef4e450009..369ceda261 100644 --- a/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java +++ b/card-android/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android; +package com.tangem.tangemcard; import android.content.Context; import androidx.test.InstrumentationRegistry; diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java b/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java index 058f9081e0..dcce291126 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java +++ b/card-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java @@ -5,8 +5,8 @@ import android.content.Context; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.tangem.tangemcommon.data.external.FirmwaresDigestsProvider; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.external.FirmwaresDigestsProvider; +import com.tangem.cardcommon.util.Util; import java.io.IOException; import java.io.InputStream; diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java b/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java index c347e612d4..491e008d0e 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java +++ b/card-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java @@ -5,8 +5,8 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Base64; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.CardProtocol; import java.util.ArrayList; import java.util.List; diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt b/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt index d235221eda..daa4f45e8f 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt +++ b/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt @@ -16,7 +16,7 @@ import android.os.Bundle import androidx.core.app.ActivityCompat import androidx.fragment.app.FragmentActivity import com.tangem.tangemcard.android.presentation.dialog.NfcEnableDialog -import com.tangem.tangemcommon.util.Log +import com.tangem.cardcommon.util.Log import java.io.IOException class NfcManager(private val activity: FragmentActivity, private val readerCallback: NfcAdapter.ReaderCallback) { diff --git a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt b/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt index a1edbf0507..4185a365da 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt +++ b/card-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt @@ -5,7 +5,7 @@ import android.nfc.tech.IsoDep data class NfcReader( val nfcManager: NfcManager, val isoDep: IsoDep -) : com.tangem.tangemcommon.reader.NfcReader { +) : com.tangem.cardcommon.reader.NfcReader { override fun getId(): ByteArray { return isoDep.tag.id } diff --git a/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt b/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt index e715c4c7d1..facb34176b 100644 --- a/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt +++ b/card-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt @@ -1,9 +1,9 @@ package com.tangem.tangemcard.data import android.os.Bundle -import com.tangem.tangemcommon.data.Manufacturer -import com.tangem.tangemcommon.data.TangemCard -import com.tangem.tangemcommon.util.Log +import com.tangem.cardcommon.data.Manufacturer +import com.tangem.cardcommon.data.TangemCard +import com.tangem.cardcommon.util.Log import java.util.* const val EXTRA_TANGEM_CARD = "Card" diff --git a/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java b/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java index 2727035d33..053a2eef4f 100644 --- a/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java +++ b/card-android/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.android; +package com.tangem.tangemcard; import org.junit.Test; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/Issuer.java b/card-common/src/main/java/com/tangem/cardcommon/data/Issuer.java similarity index 96% rename from card-common/src/main/java/com/tangem/tangemcommon/data/Issuer.java rename to card-common/src/main/java/com/tangem/cardcommon/data/Issuer.java index 432727d377..39a52a7bbd 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/Issuer.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/Issuer.java @@ -1,7 +1,7 @@ -package com.tangem.tangemcommon.data; +package com.tangem.cardcommon.data; -import com.tangem.tangemcommon.reader.CardCrypto; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.reader.CardCrypto; +import com.tangem.cardcommon.util.Util; import java.util.ArrayList; import java.util.Arrays; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java b/card-common/src/main/java/com/tangem/cardcommon/data/Manufacturer.java similarity index 95% rename from card-common/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java rename to card-common/src/main/java/com/tangem/cardcommon/data/Manufacturer.java index d5d3144558..38f0a9aaab 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/Manufacturer.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.data; +package com.tangem.cardcommon.data; /** * Created by dvol on 09.08.2017. diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/TangemCard.java b/card-common/src/main/java/com/tangem/cardcommon/data/TangemCard.java similarity index 99% rename from card-common/src/main/java/com/tangem/tangemcommon/data/TangemCard.java rename to card-common/src/main/java/com/tangem/cardcommon/data/TangemCard.java index 02af866cc5..f11c2ff413 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/TangemCard.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/TangemCard.java @@ -1,8 +1,8 @@ -package com.tangem.tangemcommon.data; +package com.tangem.cardcommon.data; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.reader.SettingsMask; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.reader.SettingsMask; +import com.tangem.cardcommon.util.Util; import java.util.Date; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java b/card-common/src/main/java/com/tangem/cardcommon/data/external/CardDataSubstitutionProvider.java similarity index 73% rename from card-common/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java rename to card-common/src/main/java/com/tangem/cardcommon/data/external/CardDataSubstitutionProvider.java index a518df35a5..55745f7a27 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/external/CardDataSubstitutionProvider.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcommon.data.external; +package com.tangem.cardcommon.data.external; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.TangemCard; /** * This interface provide method to make substitution of read card data (token symbol, contract address) diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java b/card-common/src/main/java/com/tangem/cardcommon/data/external/FirmwaresDigestsProvider.java similarity index 90% rename from card-common/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java rename to card-common/src/main/java/com/tangem/cardcommon/data/external/FirmwaresDigestsProvider.java index eef3a413d3..702f38d10d 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/external/FirmwaresDigestsProvider.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.data.external; +package com.tangem.cardcommon.data.external; /** * This interfaces provide function to randomly select parameters to run one VerifyCode command, check answer and diff --git a/card-common/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java b/card-common/src/main/java/com/tangem/cardcommon/data/external/PINsProvider.java similarity index 94% rename from card-common/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java rename to card-common/src/main/java/com/tangem/cardcommon/data/external/PINsProvider.java index 2ca69e7f84..a343d79686 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java +++ b/card-common/src/main/java/com/tangem/cardcommon/data/external/PINsProvider.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.data.external; +package com.tangem.cardcommon.data.external; import java.util.List; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java b/card-common/src/main/java/com/tangem/cardcommon/reader/CardCrypto.java similarity index 98% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/CardCrypto.java index 422bde60ad..bab5e328c3 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/CardCrypto.java @@ -1,8 +1,8 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; -import com.tangem.tangemcommon.util.Log; -import com.tangem.tangemcommon.util.PBKDF2; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Log; +import com.tangem.cardcommon.util.PBKDF2; +import com.tangem.cardcommon.util.Util; import net.i2p.crypto.eddsa.EdDSAEngine; import net.i2p.crypto.eddsa.EdDSAPrivateKey; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java b/card-common/src/main/java/com/tangem/cardcommon/reader/CardProtocol.java similarity index 99% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/CardProtocol.java index 98ea472413..e0cf11fe7c 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/CardProtocol.java @@ -1,9 +1,9 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.data.Manufacturer; -import com.tangem.tangemcommon.util.Log; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.data.Manufacturer; +import com.tangem.cardcommon.util.Log; +import com.tangem.cardcommon.util.Util; import org.spongycastle.jce.ECNamedCurveTable; import org.spongycastle.jce.interfaces.ECPublicKey; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java b/card-common/src/main/java/com/tangem/cardcommon/reader/CommandApdu.java similarity index 98% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/CommandApdu.java index 9f5e4f9ad9..95321a07da 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/CommandApdu.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/INS.java b/card-common/src/main/java/com/tangem/cardcommon/reader/INS.java similarity index 94% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/INS.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/INS.java index 0730bbed87..152b4368ef 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/INS.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/INS.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java b/card-common/src/main/java/com/tangem/cardcommon/reader/NfcReader.java similarity index 88% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/NfcReader.java index 94739662ac..7626757e64 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/NfcReader.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; import java.io.IOException; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java b/card-common/src/main/java/com/tangem/cardcommon/reader/ResponseApdu.java similarity index 97% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/ResponseApdu.java index 0216e1e883..92dcf58192 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/ResponseApdu.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayInputStream; import java.util.Arrays; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/SW.java b/card-common/src/main/java/com/tangem/cardcommon/reader/SW.java similarity index 97% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/SW.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/SW.java index 1b448d06d8..e7676d0ac2 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/SW.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/SW.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java b/card-common/src/main/java/com/tangem/cardcommon/reader/SettingsMask.java similarity index 98% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/SettingsMask.java index ed3a724250..283192df73 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/SettingsMask.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLV.java b/card-common/src/main/java/com/tangem/cardcommon/reader/TLV.java similarity index 98% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/TLV.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/TLV.java index 60566f71be..000f12eb38 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLV.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/TLV.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLVException.java b/card-common/src/main/java/com/tangem/cardcommon/reader/TLVException.java similarity index 89% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/TLVException.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/TLVException.java index e85e921334..57b208b3b5 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLVException.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/TLVException.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; public class TLVException extends Exception { diff --git a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLVList.java b/card-common/src/main/java/com/tangem/cardcommon/reader/TLVList.java similarity index 95% rename from card-common/src/main/java/com/tangem/tangemcommon/reader/TLVList.java rename to card-common/src/main/java/com/tangem/cardcommon/reader/TLVList.java index a8e0c7da82..734ac7763e 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/reader/TLVList.java +++ b/card-common/src/main/java/com/tangem/cardcommon/reader/TLVList.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcommon.reader; +package com.tangem.cardcommon.reader; /** * Created by dvol on 23.06.2017. */ -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/CreateNewWalletTask.java similarity index 72% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/CreateNewWalletTask.java index bc5bc63ae9..59174a66be 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/CreateNewWalletTask.java @@ -1,11 +1,11 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.util.Log; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.util.Log; public class CreateNewWalletTask extends CustomReadCardTask { public static final String TAG = CreateNewWalletTask.class.getSimpleName(); diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/CustomReadCardTask.java similarity index 96% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/CustomReadCardTask.java index 9af9c47615..eb5f3f7747 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/CustomReadCardTask.java @@ -1,17 +1,17 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.Manufacturer; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.CardCrypto; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.reader.TLV; -import com.tangem.tangemcommon.reader.TLVException; -import com.tangem.tangemcommon.reader.TLVList; -import com.tangem.tangemcommon.util.Log; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.Manufacturer; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.CardCrypto; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.reader.TLV; +import com.tangem.cardcommon.reader.TLVException; +import com.tangem.cardcommon.reader.TLVList; +import com.tangem.cardcommon.util.Log; +import com.tangem.cardcommon.util.Util; import org.spongycastle.jce.ECNamedCurveTable; import org.spongycastle.jce.spec.ECNamedCurveParameterSpec; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/PurgeTask.java similarity index 71% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/PurgeTask.java index 1965b21d0d..cf05ca08f0 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/PurgeTask.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; public class PurgeTask extends CustomReadCardTask { public static final String TAG = PurgeTask.class.getSimpleName(); diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/ReadCardInfoTask.java similarity index 85% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/ReadCardInfoTask.java index 4151b0a28f..b22553f672 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/ReadCardInfoTask.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.data.TangemCard; public class ReadCardInfoTask extends CustomReadCardTask { public static final String TAG = ReadCardInfoTask.class.getSimpleName(); diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/SignTask.java similarity index 89% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/SignTask.java index c1918d2a67..921a311a09 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/SignTask.java @@ -1,13 +1,13 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.reader.TLV; -import com.tangem.tangemcommon.reader.TLVList; -import com.tangem.tangemcommon.util.Log; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.reader.TLV; +import com.tangem.cardcommon.reader.TLVList; +import com.tangem.cardcommon.util.Log; import java.io.ByteArrayOutputStream; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/SwapPINTask.java similarity index 75% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/SwapPINTask.java index e6fe521029..2fb372a405 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/SwapPINTask.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.reader.NfcReader; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.reader.NfcReader; public class SwapPINTask extends CustomReadCardTask { public static final String TAG = SwapPINTask.class.getSimpleName(); diff --git a/card-common/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java b/card-common/src/main/java/com/tangem/cardcommon/tasks/VerifyCardTask.java similarity index 80% rename from card-common/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java rename to card-common/src/main/java/com/tangem/cardcommon/tasks/VerifyCardTask.java index 10bdd02f98..4c1f405feb 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java +++ b/card-common/src/main/java/com/tangem/cardcommon/tasks/VerifyCardTask.java @@ -1,12 +1,12 @@ -package com.tangem.tangemcommon.tasks; +package com.tangem.cardcommon.tasks; -import com.tangem.tangemcommon.data.TangemCard; -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcommon.data.external.FirmwaresDigestsProvider; -import com.tangem.tangemcommon.data.external.PINsProvider; -import com.tangem.tangemcommon.reader.CardProtocol; -import com.tangem.tangemcommon.reader.NfcReader; -import com.tangem.tangemcommon.util.Log; +import com.tangem.cardcommon.data.TangemCard; +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider; +import com.tangem.cardcommon.data.external.FirmwaresDigestsProvider; +import com.tangem.cardcommon.data.external.PINsProvider; +import com.tangem.cardcommon.reader.CardProtocol; +import com.tangem.cardcommon.reader.NfcReader; +import com.tangem.cardcommon.util.Log; import java.util.Arrays; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/util/Log.java b/card-common/src/main/java/com/tangem/cardcommon/util/Log.java similarity index 85% rename from card-common/src/main/java/com/tangem/tangemcommon/util/Log.java rename to card-common/src/main/java/com/tangem/cardcommon/util/Log.java index 0bf4c1a69d..738f176df5 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/util/Log.java +++ b/card-common/src/main/java/com/tangem/cardcommon/util/Log.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.util; +package com.tangem.cardcommon.util; public class Log { public static void i(String logTag, String message) { diff --git a/card-common/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java b/card-common/src/main/java/com/tangem/cardcommon/util/PBKDF2.java similarity index 98% rename from card-common/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java rename to card-common/src/main/java/com/tangem/cardcommon/util/PBKDF2.java index 5af75ff501..db054db1b2 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java +++ b/card-common/src/main/java/com/tangem/cardcommon/util/PBKDF2.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.util; +package com.tangem.cardcommon.util; import org.spongycastle.crypto.CipherParameters; import org.spongycastle.crypto.digests.SHA256Digest; diff --git a/card-common/src/main/java/com/tangem/tangemcommon/util/Util.java b/card-common/src/main/java/com/tangem/cardcommon/util/Util.java similarity index 99% rename from card-common/src/main/java/com/tangem/tangemcommon/util/Util.java rename to card-common/src/main/java/com/tangem/cardcommon/util/Util.java index 3f407f2cb1..341049edc3 100644 --- a/card-common/src/main/java/com/tangem/tangemcommon/util/Util.java +++ b/card-common/src/main/java/com/tangem/cardcommon/util/Util.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcommon.util; +package com.tangem.cardcommon.util; import org.spongycastle.crypto.digests.RIPEMD160Digest; diff --git a/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java b/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java index c430203a5b..23a6317fdd 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java +++ b/server-android/src/main/java/com/tangem/tangemserver/ServerApiTangem.java @@ -3,9 +3,9 @@ package com.tangem.tangemserver; import androidx.annotation.NonNull; import android.util.Log; -import com.tangem.tangemcommon.data.TangemCard; +import com.tangem.cardcommon.data.TangemCard; import com.tangem.tangemserver.model.CardVerifyAndGetInfo; -import com.tangem.tangemcommon.util.Util; +import com.tangem.cardcommon.util.Util; import java.io.InputStream; import java.util.ArrayList; diff --git a/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt b/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt index 132c3e2763..efabf80480 100644 --- a/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt +++ b/server-android/src/main/java/com/tangem/tangemserver/data/LocalStorage.kt @@ -1,7 +1,7 @@ package com.tangem.tangemserver.data import android.content.Context -import com.tangem.tangemcommon.data.TangemCard +import com.tangem.cardcommon.data.TangemCard import android.annotation.SuppressLint import android.graphics.Bitmap @@ -14,9 +14,9 @@ import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import com.tangem.tangemserver.model.CardVerifyAndGetInfo import com.tangem.tangemserver.R -import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider -import com.tangem.tangemcommon.reader.CardCrypto -import com.tangem.tangemcommon.util.Util +import com.tangem.cardcommon.data.external.CardDataSubstitutionProvider +import com.tangem.cardcommon.reader.CardCrypto +import com.tangem.cardcommon.util.Util import java.io.InputStream import java.lang.Exception import java.nio.charset.StandardCharsets