From f8590dfa83532e3d78d9b52efa949e51de9f6ec4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 9 Nov 2018 13:48:31 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../main/java/com/tangem/data/LogFileProvider.java | 2 +- .../com/tangem/{domain/wallet => data}/Logger.java | 2 +- .../{domain/wallet => data/db}/PINStorage.java | 12 +++++------- .../task/request_pin/StartFingerprintReaderTask.java | 2 +- .../com/tangem/data/nfc/CreateNewWalletTask.java | 2 +- .../wallet => data/nfc}/DeviceNFCAntennaLocation.kt | 3 +-- .../java/com/tangem/data/{ => nfc}/NFCLocation.kt | 2 +- app/src/main/java/com/tangem/data/nfc/PurgeTask.java | 2 +- .../java/com/tangem/data/nfc/ReadCardInfoTask.java | 2 +- .../main/java/com/tangem/data/nfc/SwapPINTask.java | 2 +- .../java/com/tangem/data/nfc/VerifyCardTask.java | 2 +- .../java/com/tangem/domain/wallet/BtcCashEngine.java | 1 + .../java/com/tangem/domain/wallet/BtcEngine.java | 1 + .../java/com/tangem/domain/wallet/EthEngine.java | 1 + .../java/com/tangem/domain/wallet/TangemCard.java | 1 + .../java/com/tangem/domain/wallet/TokenEngine.java | 1 + .../com/tangem/presentation/activity/MainActivity.kt | 3 +++ .../presentation/activity/PinRequestActivity.kt | 2 +- .../tangem/presentation/activity/PinSaveActivity.kt | 2 +- .../com/tangem/presentation/fragment/LoadedWallet.kt | 1 + .../com/tangem/presentation/fragment/VerifyCard.kt | 1 + 21 files changed, 27 insertions(+), 20 deletions(-) rename app/src/main/java/com/tangem/{domain/wallet => data}/Logger.java (99%) rename app/src/main/java/com/tangem/{domain/wallet => data/db}/PINStorage.java (94%) rename app/src/main/java/com/tangem/{domain/wallet => data/nfc}/DeviceNFCAntennaLocation.kt (93%) rename app/src/main/java/com/tangem/data/{ => nfc}/NFCLocation.kt (99%) diff --git a/app/src/main/java/com/tangem/data/LogFileProvider.java b/app/src/main/java/com/tangem/data/LogFileProvider.java index 0a306387a9..be8a46d5a7 100644 --- a/app/src/main/java/com/tangem/data/LogFileProvider.java +++ b/app/src/main/java/com/tangem/data/LogFileProvider.java @@ -46,7 +46,7 @@ public class LogFileProvider extends ContentProvider { public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException { - String LOG_TAG = CLASS_NAME+"-oF"; + String LOG_TAG = CLASS_NAME + "-oF"; Log.v(LOG_TAG, "Called with uri: '" + uri + "'." + uri.getLastPathSegment()); diff --git a/app/src/main/java/com/tangem/domain/wallet/Logger.java b/app/src/main/java/com/tangem/data/Logger.java similarity index 99% rename from app/src/main/java/com/tangem/domain/wallet/Logger.java rename to app/src/main/java/com/tangem/data/Logger.java index 1925c17d52..e556515577 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Logger.java +++ b/app/src/main/java/com/tangem/data/Logger.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.data; import android.content.Context; import android.util.Log; diff --git a/app/src/main/java/com/tangem/domain/wallet/PINStorage.java b/app/src/main/java/com/tangem/data/db/PINStorage.java similarity index 94% rename from app/src/main/java/com/tangem/domain/wallet/PINStorage.java rename to app/src/main/java/com/tangem/data/db/PINStorage.java index 46c34b37cd..96b5866c91 100644 --- a/app/src/main/java/com/tangem/domain/wallet/PINStorage.java +++ b/app/src/main/java/com/tangem/data/db/PINStorage.java @@ -1,4 +1,4 @@ -package com.tangem.domain.wallet; +package com.tangem.data.db; import android.content.Context; import android.content.SharedPreferences; @@ -66,7 +66,7 @@ public class PINStorage { public static void deletePIN() { SharedPreferences.Editor editor = sharedPreferences.edit(); - if (mSavedPIN != null && mLastUsedPIN != null && mSavedPIN.equals(mLastUsedPIN)) { + if (mSavedPIN != null && mSavedPIN.equals(mLastUsedPIN)) { mLastUsedPIN = null; } mSavedPIN = null; @@ -118,7 +118,7 @@ public class PINStorage { } public static void deleteEncryptedPIN() { - if (mEncryptedPIN != null && mLastUsedPIN != null && mEncryptedPIN.equals(mLastUsedPIN)) { + if (mEncryptedPIN != null && mEncryptedPIN.equals(mLastUsedPIN)) { mLastUsedPIN = null; } mEncryptedPIN = null; @@ -149,13 +149,11 @@ public class PINStorage { public static byte[] loadEncryptedIV2() { String sIV = sharedPreferences.getString("EncryptedIV2", ""); // Log.d("PINStorage", String.format("loadEncryptedIV: %s",sIV)); - return Base64.decode(sIV, Base64.NO_WRAP); } public static String loadEncryptedPIN2(Cipher cipher) { String encryptedPIN = sharedPreferences.getString("EncryptedPIN2", null); - try { byte[] bytes = Base64.decode(encryptedPIN, Base64.NO_WRAP); mPIN2 = new String(cipher.doFinal(bytes)); @@ -184,11 +182,11 @@ public class PINStorage { } public static boolean isDefaultPIN(String pin) { - return (pin != null) && (CardProtocol.DefaultPIN.equals(pin)); + return (CardProtocol.DefaultPIN.equals(pin)); } public static boolean isDefaultPIN2(String pin2) { - return (pin2 != null) && (CardProtocol.DefaultPIN2.equals(pin2)); + return (CardProtocol.DefaultPIN2.equals(pin2)); } public static String getDefaultPIN() { diff --git a/app/src/main/java/com/tangem/data/network/task/request_pin/StartFingerprintReaderTask.java b/app/src/main/java/com/tangem/data/network/task/request_pin/StartFingerprintReaderTask.java index 977a50176e..6913ea0f2c 100644 --- a/app/src/main/java/com/tangem/data/network/task/request_pin/StartFingerprintReaderTask.java +++ b/app/src/main/java/com/tangem/data/network/task/request_pin/StartFingerprintReaderTask.java @@ -9,7 +9,7 @@ import android.security.keystore.KeyPermanentlyInvalidatedException; import android.security.keystore.KeyProperties; import com.tangem.domain.wallet.FingerprintHelper; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.presentation.activity.PinRequestActivity; import java.io.IOException; diff --git a/app/src/main/java/com/tangem/data/nfc/CreateNewWalletTask.java b/app/src/main/java/com/tangem/data/nfc/CreateNewWalletTask.java index 1dec984a3f..bdce5f6241 100644 --- a/app/src/main/java/com/tangem/data/nfc/CreateNewWalletTask.java +++ b/app/src/main/java/com/tangem/data/nfc/CreateNewWalletTask.java @@ -6,7 +6,7 @@ import android.util.Log; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.NfcManager; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.domain.wallet.TangemCard; public class CreateNewWalletTask extends Thread { diff --git a/app/src/main/java/com/tangem/domain/wallet/DeviceNFCAntennaLocation.kt b/app/src/main/java/com/tangem/data/nfc/DeviceNFCAntennaLocation.kt similarity index 93% rename from app/src/main/java/com/tangem/domain/wallet/DeviceNFCAntennaLocation.kt rename to app/src/main/java/com/tangem/data/nfc/DeviceNFCAntennaLocation.kt index 733625e683..8f6426d961 100644 --- a/app/src/main/java/com/tangem/domain/wallet/DeviceNFCAntennaLocation.kt +++ b/app/src/main/java/com/tangem/data/nfc/DeviceNFCAntennaLocation.kt @@ -1,7 +1,6 @@ -package com.tangem.domain.wallet +package com.tangem.data.nfc import android.os.Build -import com.tangem.data.NFCLocation class DeviceNFCAntennaLocation { companion object { diff --git a/app/src/main/java/com/tangem/data/NFCLocation.kt b/app/src/main/java/com/tangem/data/nfc/NFCLocation.kt similarity index 99% rename from app/src/main/java/com/tangem/data/NFCLocation.kt rename to app/src/main/java/com/tangem/data/nfc/NFCLocation.kt index 926c228b6f..d89713fe7e 100644 --- a/app/src/main/java/com/tangem/data/NFCLocation.kt +++ b/app/src/main/java/com/tangem/data/nfc/NFCLocation.kt @@ -1,4 +1,4 @@ -package com.tangem.data +package com.tangem.data.nfc enum class NFCLocation(val codename: String, val fullName: String, val orientation: Int, val x: Int, val y: Int, val z: Int) { model1("sailfish", "Google Pixel", 0, 65, 25, 0), diff --git a/app/src/main/java/com/tangem/data/nfc/PurgeTask.java b/app/src/main/java/com/tangem/data/nfc/PurgeTask.java index 01d24bcb1b..a24c71e24e 100644 --- a/app/src/main/java/com/tangem/data/nfc/PurgeTask.java +++ b/app/src/main/java/com/tangem/data/nfc/PurgeTask.java @@ -6,7 +6,7 @@ import android.util.Log; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.NfcManager; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.domain.wallet.TangemCard; public class PurgeTask extends Thread { diff --git a/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java b/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java index f0c500ccee..f0fa541df9 100644 --- a/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java +++ b/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java @@ -6,7 +6,7 @@ import android.util.Log; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.NfcManager; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.domain.wallet.TangemCard; import com.tangem.util.Util; diff --git a/app/src/main/java/com/tangem/data/nfc/SwapPINTask.java b/app/src/main/java/com/tangem/data/nfc/SwapPINTask.java index a8ecaedfb1..64bf5be55d 100644 --- a/app/src/main/java/com/tangem/data/nfc/SwapPINTask.java +++ b/app/src/main/java/com/tangem/data/nfc/SwapPINTask.java @@ -6,7 +6,7 @@ import android.util.Log; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.NfcManager; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.domain.wallet.TangemCard; public class SwapPINTask extends Thread { diff --git a/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java b/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java index 50c96940b1..2079d605f8 100644 --- a/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java +++ b/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java @@ -7,7 +7,7 @@ import android.util.Log; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.FW; import com.tangem.domain.cardReader.NfcManager; -import com.tangem.domain.wallet.PINStorage; +import com.tangem.data.db.PINStorage; import com.tangem.domain.wallet.TangemCard; import java.util.Arrays; diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java index ed37399ac2..644e20541e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java @@ -3,6 +3,7 @@ package com.tangem.domain.wallet; import android.net.Uri; import android.text.InputFilter; +import com.tangem.data.db.PINStorage; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.TLV; import com.tangem.util.BTCUtils; diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java index 80f413312b..2015ce10ab 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java @@ -3,6 +3,7 @@ package com.tangem.domain.wallet; import android.net.Uri; import android.text.InputFilter; +import com.tangem.data.db.PINStorage; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.TLV; import com.tangem.util.BTCUtils; diff --git a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java index 5cd8090e20..9763e33834 100644 --- a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java @@ -4,6 +4,7 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.data.db.PINStorage; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.TLV; import com.tangem.util.BTCUtils; diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java index 7ccdd26107..c78d5d30de 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.util.Log; import com.google.common.base.Strings; +import com.tangem.data.db.PINStorage; import com.tangem.domain.cardReader.SettingsMask; import com.tangem.util.Util; diff --git a/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java index 0812d58ad9..0ec3cc703e 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java @@ -5,6 +5,7 @@ import android.text.InputFilter; import android.util.Log; import com.google.common.base.Strings; +import com.tangem.data.db.PINStorage; import com.tangem.domain.cardReader.CardProtocol; import com.tangem.domain.cardReader.TLV; import com.tangem.util.BTCUtils; 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 8153d00074..4870d00836 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -24,7 +24,10 @@ import android.view.animation.Transformation import android.widget.RelativeLayout import android.widget.Toast import com.scottyab.rootbeer.RootBeer +import com.tangem.data.Logger +import com.tangem.data.db.PINStorage import com.tangem.data.network.ServerApiHelper +import com.tangem.data.nfc.DeviceNFCAntennaLocation import com.tangem.data.nfc.ReadCardInfoTask import com.tangem.domain.cardReader.CardProtocol import com.tangem.domain.cardReader.FW 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 e28f447200..bbb11743d3 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -22,7 +22,7 @@ import android.widget.Button import com.tangem.data.network.task.request_pin.StartFingerprintReaderTask import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.FingerprintHelper -import com.tangem.domain.wallet.PINStorage +import com.tangem.data.db.PINStorage import com.tangem.domain.wallet.TangemCard import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_request.* diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt index 6f4192cdd4..7d4056111e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -21,7 +21,7 @@ import android.widget.Button import android.widget.Toast import com.tangem.data.network.task.save_pin.ConfirmWithFingerprintTask import com.tangem.domain.wallet.FingerprintHelper -import com.tangem.domain.wallet.PINStorage +import com.tangem.data.db.PINStorage import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_save.* import kotlinx.android.synthetic.main.layout_pin_buttons.* 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 cbbc97f849..a47f7d3f7c 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -19,6 +19,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import com.tangem.data.db.PINStorage import com.tangem.data.network.ElectrumRequest import com.tangem.data.network.ServerApiHelper import com.tangem.data.network.ServerApiHelperElectrum 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 7e69ae0d5b..c0afe5a677 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup import android.widget.PopupMenu import android.widget.Toast +import com.tangem.data.db.PINStorage import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.* import com.tangem.presentation.activity.CreateNewWalletActivity