diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ada7acbd0c..e8ad7e999f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,7 +10,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 67a87b0986..ef52b484fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,8 +44,8 @@ android { } dependencies { - implementation project(':tangemcard-common') -// implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' +// implementation project(':tangemcommon') + implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0' implementation project(':tangemcard-android') implementation project(':tangemserver-android') diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java index 1537c56082..fe832ac55e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java @@ -9,7 +9,6 @@ import com.tangem.data.Blockchain; import com.tangem.tangemcard.data.TangemCard; import com.tangem.tangemcard.data.TangemCardExtensionsKt; - public class TangemContext { // public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"; private Context context; 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 2e9e73e016..632dfd12d1 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 @@ -22,7 +22,6 @@ import com.tangem.wallet.R; import java.math.BigInteger; - public class NftTokenEngine extends CoinEngine { private static final String TAG = NftTokenEngine.class.getSimpleName(); diff --git a/settings.gradle b/settings.gradle index 38ca2a86f1..ad0149e0f6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':tangemcard-android', ':tangemserver-android', ':tangemcard-common' +include ':app', ':tangemcard-android', ':tangemserver-android', ':tangemcommon' diff --git a/tangemcard-common/.gitignore b/tangemcommon/.gitignore similarity index 100% rename from tangemcard-common/.gitignore rename to tangemcommon/.gitignore diff --git a/tangemcard-common/build.gradle b/tangemcommon/build.gradle similarity index 100% rename from tangemcard-common/build.gradle rename to tangemcommon/build.gradle diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/Issuer.java similarity index 96% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/Issuer.java index 1a68d4799c..432727d377 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/Issuer.java @@ -1,7 +1,7 @@ -package com.tangem.tangemcard.data; +package com.tangem.tangemcommon.data; -import com.tangem.tangemcard.reader.CardCrypto; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.reader.CardCrypto; +import com.tangem.tangemcommon.util.Util; import java.util.ArrayList; import java.util.Arrays; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Manufacturer.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java similarity index 95% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/Manufacturer.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java index a3d1081032..d5d3144558 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Manufacturer.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/Manufacturer.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.data; +package com.tangem.tangemcommon.data; /** * Created by dvol on 09.08.2017. diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/TangemCard.java similarity index 99% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/TangemCard.java index 67514def23..7aee99206d 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/TangemCard.java @@ -1,8 +1,8 @@ -package com.tangem.tangemcard.data; +package com.tangem.tangemcommon.data; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.reader.SettingsMask; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.reader.CardProtocol; +import com.tangem.tangemcommon.reader.SettingsMask; +import com.tangem.tangemcommon.util.Util; import java.util.Date; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java similarity index 73% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java index ceaf756749..a518df35a5 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/CardDataSubstitutionProvider.java @@ -1,7 +1,6 @@ -package com.tangem.tangemcard.data.external; - -import com.tangem.tangemcard.data.TangemCard; +package com.tangem.tangemcommon.data.external; +import com.tangem.tangemcommon.data.TangemCard; /** * This interface provide method to make substitution of read card data (token symbol, contract address) diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java similarity index 90% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java index 86e8ba4175..eef3a413d3 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/FirmwaresDigestsProvider.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.data.external; +package com.tangem.tangemcommon.data.external; /** * This interfaces provide function to randomly select parameters to run one VerifyCode command, check answer and diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java similarity index 94% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java index 05cabc54af..2ca69e7f84 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/data/external/PINsProvider.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.data.external; +package com.tangem.tangemcommon.data.external; import java.util.List; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java similarity index 98% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java index 580d3c01d0..422bde60ad 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardCrypto.java @@ -1,8 +1,8 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; -import com.tangem.tangemcard.util.Log; -import com.tangem.tangemcard.util.PBKDF2; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Log; +import com.tangem.tangemcommon.util.PBKDF2; +import com.tangem.tangemcommon.util.Util; import net.i2p.crypto.eddsa.EdDSAEngine; import net.i2p.crypto.eddsa.EdDSAPrivateKey; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java similarity index 99% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java index 7fcc4fd203..98ea472413 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CardProtocol.java @@ -1,9 +1,9 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.data.Manufacturer; -import com.tangem.tangemcard.util.Log; -import com.tangem.tangemcard.util.Util; +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 org.spongycastle.jce.ECNamedCurveTable; import org.spongycastle.jce.interfaces.ECPublicKey; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java similarity index 98% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java index 9706a68a35..9f5e4f9ad9 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/CommandApdu.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/INS.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/INS.java similarity index 94% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/INS.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/INS.java index 1fb6be61c1..0730bbed87 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/INS.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/INS.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java similarity index 88% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java index 8317bdeac7..94739662ac 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/NfcReader.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; import java.io.IOException; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java similarity index 97% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java index fbc3b00be5..0216e1e883 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/ResponseApdu.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayInputStream; import java.util.Arrays; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SW.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SW.java similarity index 97% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SW.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SW.java index cd3ef7ee05..1b448d06d8 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SW.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SW.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java similarity index 98% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java index d6446b03ac..ed3a724250 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/SettingsMask.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; /** * Created by dvol on 07.03.2018. diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLV.java similarity index 98% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLV.java index 58d32f4ddd..60566f71be 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLV.java @@ -1,6 +1,6 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVException.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVException.java similarity index 89% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVException.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVException.java index 9b1a4eb3c8..e85e921334 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVException.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVException.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; public class TLVException extends Exception { diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVList.java similarity index 95% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVList.java index f26e9066dd..a8e0c7da82 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/reader/TLVList.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcard.reader; +package com.tangem.tangemcommon.reader; /** * Created by dvol on 23.06.2017. */ -import com.tangem.tangemcard.util.Util; +import com.tangem.tangemcommon.util.Util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java similarity index 72% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java index d1b0f9fbfb..bc5bc63ae9 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CreateNewWalletTask.java @@ -1,12 +1,11 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; - -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.util.Log; +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; public class CreateNewWalletTask extends CustomReadCardTask { public static final String TAG = CreateNewWalletTask.class.getSimpleName(); diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java similarity index 96% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java index c366e229f6..9af9c47615 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/CustomReadCardTask.java @@ -1,17 +1,17 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.Manufacturer; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.reader.CardCrypto; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.reader.TLV; -import com.tangem.tangemcard.reader.TLVException; -import com.tangem.tangemcard.reader.TLVList; -import com.tangem.tangemcard.util.Log; -import com.tangem.tangemcard.util.Util; +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 org.spongycastle.jce.ECNamedCurveTable; import org.spongycastle.jce.spec.ECNamedCurveParameterSpec; @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; -import static com.tangem.tangemcard.reader.CardCrypto.Curve.secp256k1; - /** * Base class for card communication task */ diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java similarity index 71% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java index b174bc3160..1965b21d0d 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/PurgeTask.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.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.tangemcommon.data.external.CardDataSubstitutionProvider; public class PurgeTask extends CustomReadCardTask { public static final String TAG = PurgeTask.class.getSimpleName(); diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java similarity index 85% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java index 791b7b2a99..4151b0a28f 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/ReadCardInfoTask.java @@ -1,10 +1,10 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.data.TangemCard; +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; public class ReadCardInfoTask extends CustomReadCardTask { public static final String TAG = ReadCardInfoTask.class.getSimpleName(); diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java similarity index 89% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java index cb1e0d6a37..c1918d2a67 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SignTask.java @@ -1,13 +1,13 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.reader.TLV; -import com.tangem.tangemcard.reader.TLVList; -import com.tangem.tangemcard.util.Log; +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 java.io.ByteArrayOutputStream; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java similarity index 75% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java index 342d67fb64..e6fe521029 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/SwapPINTask.java @@ -1,11 +1,10 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; - -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.reader.NfcReader; +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; public class SwapPINTask extends CustomReadCardTask { public static final String TAG = SwapPINTask.class.getSimpleName(); diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java similarity index 80% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java index 11ba76c657..10bdd02f98 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/tasks/VerifyCardTask.java @@ -1,12 +1,12 @@ -package com.tangem.tangemcard.tasks; +package com.tangem.tangemcommon.tasks; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider; -import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider; -import com.tangem.tangemcard.data.external.PINsProvider; -import com.tangem.tangemcard.reader.CardProtocol; -import com.tangem.tangemcard.reader.NfcReader; -import com.tangem.tangemcard.util.Log; +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 java.util.Arrays; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/Log.java similarity index 85% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/util/Log.java index c10ff8e768..0bf4c1a69d 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/Log.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.util; +package com.tangem.tangemcommon.util; public class Log { public static void i(String logTag, String message) { diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/PBKDF2.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java similarity index 98% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/util/PBKDF2.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java index 31d8d47a6e..5af75ff501 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/PBKDF2.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/PBKDF2.java @@ -1,5 +1,4 @@ - -package com.tangem.tangemcard.util; +package com.tangem.tangemcommon.util; import org.spongycastle.crypto.CipherParameters; import org.spongycastle.crypto.digests.SHA256Digest; diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/Util.java similarity index 99% rename from tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java rename to tangemcommon/src/main/java/com/tangem/tangemcommon/util/Util.java index 4ce101d85b..3f407f2cb1 100644 --- a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java +++ b/tangemcommon/src/main/java/com/tangem/tangemcommon/util/Util.java @@ -1,4 +1,4 @@ -package com.tangem.tangemcard.util; +package com.tangem.tangemcommon.util; import org.spongycastle.crypto.digests.RIPEMD160Digest;