diff --git a/app/src/main/java/com/tangem/data/nfc/SignPaymentTask.java b/app/src/main/java/com/tangem/data/nfc/SignPaymentTask.java index 450848dc73..b6e0e78c65 100644 --- a/app/src/main/java/com/tangem/data/nfc/SignPaymentTask.java +++ b/app/src/main/java/com/tangem/data/nfc/SignPaymentTask.java @@ -105,8 +105,8 @@ public class SignPaymentTask extends Thread { } Intent intent = new Intent(mContext, SendTransactionActivity.class); - intent.putExtra(SendTransactionActivity.EXTRA_UID, mCard.getUID()); - intent.putExtra(SendTransactionActivity.EXTRA_CARD, mCard.getAsBundle()); + intent.putExtra(TangemCard.EXTRA_UID, mCard.getUID()); + intent.putExtra(TangemCard.EXTRA_CARD, mCard.getAsBundle()); intent.putExtra(SendTransactionActivity.EXTRA_TX, txStr); mContext.startActivityForResult(intent, SignPaymentActivity.REQUEST_CODE_SEND_PAYMENT); } 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 cfbb6c0f0d..38bb69401e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -46,8 +46,8 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) tvCardId.text = card!!.cidDescription 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 30a60e3efb..bca8c032db 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -45,8 +45,8 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) tvIssuer.text = card!!.issuerDescription tvBlockchain.text = card!!.blockchainName 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 cb3a5378b3..e28f447200 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -82,11 +82,11 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge else if (mode == Mode.ConfirmNewPIN2) tvPinPrompt.setText(R.string.confirm_new_pin_2) else if (mode == Mode.RequestPIN2) { - val uid = intent.getStringExtra("UID") - val mCard = TangemCard(uid) - mCard.loadFromBundle(intent.getBundleExtra("Card")) + val uid = intent.getStringExtra(TangemCard.EXTRA_UID) + val card = TangemCard(uid) + card.loadFromBundle(intent.getBundleExtra(TangemCard.EXTRA_CARD)) - if (mCard.PIN2 == TangemCard.PIN2_Mode.DefaultPIN2 || mCard.PIN2 == TangemCard.PIN2_Mode.Unchecked) { + if (card.PIN2 == TangemCard.PIN2_Mode.DefaultPIN2 || card.PIN2 == TangemCard.PIN2_Mode.Unchecked) { // if we know PIN2 or not try default previously - use it PINStorage.setPIN2(PINStorage.getDefaultPIN2()) setResult(Activity.RESULT_OK) 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 3a55b7ab23..75fe313ffa 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -48,8 +48,8 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) newPIN = intent.getStringExtra("newPIN") newPIN2 = intent.getStringExtra("newPIN2") diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt index ab2da7fb02..da2d6b7aaf 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt @@ -44,8 +44,8 @@ class PrepareCryptonitOtherAPIWithdrawalActivity : AppCompatActivity(), NfcAdapt nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) cryptonit = Cryptonit_OtherAPI(this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt index b528572ec7..def2b6ba31 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -43,8 +43,8 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) cryptonit = Cryptonit(this) @@ -70,12 +70,12 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade tvFeeCurrency.text = tvCurrency.text etAmount.setText(engine.convertByteArrayToAmount(card!!, card!!.denomination)) - etAmount.setOnEditorActionListener{lv,actionId,event-> + etAmount.setOnEditorActionListener { lv, actionId, event -> if (actionId == EditorInfo.IME_ACTION_DONE) { val imm = lv.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager imm.hideSoftInputFromWindow(lv.windowToken, 0) true - }else { + } else { false } } @@ -104,7 +104,7 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade val strFee: String = etFee.text.toString().replace(",", ".") var dblAmount: Double = strAmount.toDouble() var dblFee: Double = strFee.toDouble() - cryptonit!!.fee=strFee + cryptonit!!.fee = strFee rlProgressBar.visibility = View.VISIBLE tvProgressDescription.text = getString(R.string.cryptonit_request_withdrawal) @@ -116,8 +116,8 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade } ivRefreshBalance.setOnClickListener { - cryptonit!!.username=etUsername.text.toString() - cryptonit!!.password=etPassword.text.toString() + cryptonit!!.username = etUsername.text.toString() + cryptonit!!.password = etPassword.text.toString() cryptonit!!.saveAccountInfo() doRequestBalance() } @@ -137,11 +137,10 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade } cryptonit!!.setWithdrawalListener { response -> rlProgressBar.visibility = View.INVISIBLE - if (response.success != null && response.success!!){ - Toast.makeText(this,"Withdrawal successful!", Toast.LENGTH_LONG).show(); + if (response.success != null && response.success!!) { + Toast.makeText(this, "Withdrawal successful!", Toast.LENGTH_LONG).show(); finish() - } - else { + } else { tvError.visibility = View.VISIBLE tvError.text = response.errors.toString() } diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt index 60f1d61802..3928c1196a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt @@ -51,8 +51,8 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) kraken = Kraken(this) diff --git a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt index 84ad453cfb..2a2603331e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt @@ -45,8 +45,8 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) tvCardID.text = card!!.cidDescription val engine = CoinEngineFactory.create(card!!.blockchain) 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 06b8931f26..841c1e6959 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -43,8 +43,8 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc MainActivity.commonInit(applicationContext) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) tvCardID.text = card!!.cidDescription progressBar.progressTintList = ColorStateList.valueOf(Color.DKGRAY) diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt index 6c1b672c82..2775a0d814 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -24,8 +24,6 @@ import java.math.BigInteger class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { companion object { - const val EXTRA_UID: String = "UID" - const val EXTRA_CARD: String = "Card" const val EXTRA_TX: String = "TX" } @@ -45,8 +43,8 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { nfcManager = NfcManager(this, this) val intent = intent - card = TangemCard(getIntent().getStringExtra(EXTRA_UID)) - card!!.loadFromBundle(intent.extras!!.getBundle(EXTRA_CARD)) + card = TangemCard(getIntent().getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) tx = intent.getStringExtra(EXTRA_TX) val engine = CoinEngineFactory.create(card!!.blockchain) diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt index ea8a9367c6..b427df1901 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt @@ -54,8 +54,8 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card nfcManager = NfcManager(this, this) - card = TangemCard(intent.getStringExtra("UID")) - card!!.loadFromBundle(intent.extras!!.getBundle("Card")) + card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) + card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) amountStr = intent.getStringExtra(EXTRA_AMOUNT) feeStr = intent.getStringExtra("Fee") 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 cb082cecda..04acbf43da 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -10,20 +10,21 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.preference.PreferenceManager import android.support.v4.app.Fragment import android.support.v4.content.ContextCompat -import android.support.v7.view.ContextThemeWrapper import android.text.Html import android.util.Log -import android.view.* +import android.view.Gravity +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup import android.widget.Toast import com.google.zxing.WriterException +import com.tangem.data.network.ElectrumRequest import com.tangem.data.network.ServerApiHelper import com.tangem.data.network.ServerApiHelperElectrum -import com.tangem.data.network.model.InfuraResponse -import com.tangem.data.network.ElectrumRequest import com.tangem.data.network.model.CardVerifyAndGetInfo +import com.tangem.data.network.model.InfuraResponse import com.tangem.data.nfc.VerifyCardTask import com.tangem.domain.cardReader.CardProtocol import com.tangem.domain.cardReader.NfcManager @@ -35,7 +36,6 @@ import com.tangem.presentation.dialog.ShowQRCodeDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog import com.tangem.util.Util import com.tangem.util.UtilHelper -import com.tangem.wallet.BuildConfig import com.tangem.wallet.R import kotlinx.android.synthetic.main.fr_loaded_wallet.* import org.json.JSONException @@ -72,7 +72,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific private var newPIN = "" private var newPIN2 = "" private var cardProtocol: CardProtocol? = null - private var sp: SharedPreferences? = null private val inactiveColor: ColorStateList by lazy { resources.getColorStateList(R.color.btn_dark) } private val activeColor: ColorStateList by lazy { resources.getColorStateList(R.color.colorAccent) } private var requestCounter = 0 @@ -81,11 +80,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - nfcManager = NfcManager(activity, this) - sp = PreferenceManager.getDefaultSharedPreferences(activity) - card = TangemCard(activity!!.intent.getStringExtra(TangemCard.EXTRA_UID)) card!!.loadFromBundle(activity!!.intent.extras.getBundle(TangemCard.EXTRA_CARD))