From 10c0b8e680e547bdb638315aa7dfd9cfb983db73 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 15:53:05 +0300 Subject: [PATCH 1/5] Updated on 2026-08-14 --- app/src/main/java/com/tangem/Constant.kt | 20 ++++++- .../com/tangem/data/nfc/VerifyCardTask.java | 6 +- app/src/main/java/com/tangem/di/Navigator.kt | 7 ++- .../activity/LoadedWalletActivity.kt | 3 +- .../presentation/activity/MainActivity.kt | 18 ++---- .../activity/VerifyCardActivity.kt | 4 +- .../presentation/dialog/RootFoundDialog.kt | 2 +- .../presentation/fragment/LoadedWallet.kt | 60 ++++++++----------- .../presentation/fragment/VerifyCard.kt | 3 +- tangemcard/build.gradle | 9 +-- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt index 5fb46a7a5f..c3d29195f6 100644 --- a/app/src/main/java/com/tangem/Constant.kt +++ b/app/src/main/java/com/tangem/Constant.kt @@ -2,7 +2,6 @@ package com.tangem object Constant { - const val EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA" const val MESSAGE = "Message" @@ -10,4 +9,23 @@ object Constant { const val EXTRA_MODIFICATION = "modification" + // LoadedWallet + const val REQUEST_CODE_SEND_PAYMENT = 1 + const val REQUEST_CODE_PURGE = 2 + const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 + const val REQUEST_CODE_VERIFY_CARD = 4 + const val REQUEST_CODE_ENTER_NEW_PIN = 5 + const val REQUEST_CODE_ENTER_NEW_PIN2 = 6 + const val REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7 + const val REQUEST_CODE_SWAP_PIN = 8 + const val REQUEST_CODE_RECEIVE_PAYMENT = 9 + + // MainActivity + const val REQUEST_CODE_SHOW_CARD_ACTIVITY = 1 + const val REQUEST_CODE_ENTER_PIN_ACTIVITY = 2 + const val REQUEST_CODE_SEND_EMAIL = 3 + const val REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS = 3 + + const val EXTRA_LAST_DISCOVERED_TAG = "extra_last_tag" + } \ No newline at end of file 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 9db5b0f682..f90849fd38 100644 --- a/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java +++ b/app/src/main/java/com/tangem/data/nfc/VerifyCardTask.java @@ -73,12 +73,12 @@ public class VerifyCardTask extends Thread { mNotifications.onReadProgress(protocol, 80); } if (isCancelled) return; - Firmwares.VerifyCodeRecord record=Firmwares.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion()); + Firmwares.VerifyCodeRecord record = Firmwares.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion()); if (isCancelled) return; - if( record!=null ) { + if (record != null) { byte[] returnedDigest = protocol.run_VerifyCode(record.hashAlg, record.blockIndex, record.blockCount, record.challenge); mCard.setCodeConfirmed(Arrays.equals(returnedDigest, record.digest)); - }else{ + } else { mCard.setCodeConfirmed(null); } mNotifications.onReadProgress(protocol, 90); diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index 15eb86bb96..a64290d3b6 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -3,6 +3,7 @@ package com.tangem.di import android.app.Activity import android.nfc.Tag import android.os.Bundle +import com.tangem.Constant import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.activity.EmptyWalletActivity @@ -18,15 +19,15 @@ class Navigator { } fun showLoadedWallet(context: Activity, lastTag: Tag, cardInfo: Bundle) { - context.startActivityForResult(LoadedWalletActivity.callingIntent(context, lastTag, cardInfo), MainActivity.REQUEST_CODE_SHOW_CARD_ACTIVITY) + context.startActivityForResult(LoadedWalletActivity.callingIntent(context, lastTag, cardInfo), Constant.REQUEST_CODE_SHOW_CARD_ACTIVITY) } fun showEmptyWallet(context: Activity) { context.startActivity(EmptyWalletActivity.callingIntent(context)) } - fun showVerifyCard(context: Activity, card: TangemCard, coinData: CoinData, message: String, error: String) { - context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData, message, error), LoadedWallet.REQUEST_CODE_VERIFY_CARD) + fun showVerifyCard(context: Activity, card: TangemCard, coinData: CoinData) { + context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData), Constant.REQUEST_CODE_VERIFY_CARD) } fun showPinSwap(context: Activity) { diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt index 04dab07418..1356658cb8 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt @@ -7,6 +7,7 @@ import android.nfc.Tag import android.os.Bundle import android.support.v7.app.AppCompatActivity import com.tangem.App +import com.tangem.Constant import com.tangem.di.Navigator import com.tangem.presentation.fragment.LoadedWallet import com.tangem.wallet.R @@ -20,7 +21,7 @@ class LoadedWalletActivity : AppCompatActivity() { companion object { fun callingIntent(context: Context, lastTag: Tag, cardInfo: Bundle): Intent { val intent = Intent(context, LoadedWalletActivity::class.java) - intent.putExtra(MainActivity.EXTRA_LAST_DISCOVERED_TAG, lastTag) + intent.putExtra(Constant.EXTRA_LAST_DISCOVERED_TAG, lastTag) intent.putExtras(cardInfo) return intent } 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 f247ab61f4..91186d4325 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -25,6 +25,7 @@ import android.widget.RelativeLayout import android.widget.Toast import com.scottyab.rootbeer.RootBeer import com.tangem.App +import com.tangem.Constant import com.tangem.data.Logger import com.tangem.data.db.PINStorage import com.tangem.data.network.ServerApiCommon @@ -52,13 +53,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco companion object { val TAG: String = MainActivity::class.java.simpleName - private const val REQUEST_CODE_SEND_EMAIL = 3 - private const val REQUEST_CODE_ENTER_PIN_ACTIVITY = 2 - const val REQUEST_CODE_SHOW_CARD_ACTIVITY = 1 - private const val REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS = 3 - - const val EXTRA_LAST_DISCOVERED_TAG = "extra_last_tag" - fun callingIntent(context: Context) = Intent(context, MainActivity::class.java) fun commonInit(context: Context) { @@ -155,7 +149,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco // check if root device val rootBeer = RootBeer(this) if (rootBeer.isRootedWithoutBusyBoxCheck && !BuildConfig.DEBUG) - RootFoundDialog().show(fragmentManager, RootFoundDialog.TAG) + RootFoundDialog().show(supportFragmentManager, RootFoundDialog.TAG) // set listeners fab.setOnClickListener { showMenu(it) } @@ -180,19 +174,19 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco NfcManager.verifyPermissions(this) if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { Log.e("QRScanActivity", "User hasn't granted permission to use camera") - ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS) + ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), Constant.REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS) } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { - REQUEST_CODE_SEND_EMAIL -> { + Constant.REQUEST_CODE_SEND_EMAIL -> { if (zipFile != null) { zipFile!!.delete() zipFile = null } } - REQUEST_CODE_ENTER_PIN_ACTIVITY -> { + Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY -> { if (resultCode == Activity.RESULT_OK && lastTag != null) onTagDiscovered(lastTag!!) else @@ -454,7 +448,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco private fun doEnterPIN() { val intent = Intent(this, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_PIN_ACTIVITY) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY) } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt index 402da7169c..6841d4bc83 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -19,13 +19,11 @@ class VerifyCardActivity : AppCompatActivity() { lateinit var navigator: Navigator companion object { - fun callingIntent(context: Context, card: TangemCard, coinData: CoinData, message: String, error: String): Intent { + fun callingIntent(context: Context, card: TangemCard, coinData: CoinData): Intent { val intent = Intent(context, VerifyCardActivity::class.java) intent.putExtra(TangemCard.EXTRA_UID, card.uid) intent.putExtra(TangemCard.EXTRA_CARD, card.asBundle) intent.putExtra(Constant.EXTRA_BLOCKCHAIN_DATA, coinData.asBundle()) - intent.putExtra(Constant.MESSAGE, message) - intent.putExtra(Constant.ERROR, error) return intent } } diff --git a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt index b49551d716..f6aed9beb5 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt +++ b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt @@ -2,8 +2,8 @@ package com.tangem.presentation.dialog import android.app.AlertDialog import android.app.Dialog -import android.app.DialogFragment import android.os.Bundle +import android.support.v4.app.DialogFragment import com.tangem.wallet.R 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 7346f13445..3c315e1c07 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.Constant import com.tangem.data.db.LocalStorage import com.tangem.data.db.PINStorage import com.tangem.data.network.ElectrumRequest @@ -53,15 +54,6 @@ import java.util.* class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { companion object { val TAG: String = LoadedWallet::class.java.simpleName - private const val REQUEST_CODE_SEND_PAYMENT = 1 - const val REQUEST_CODE_VERIFY_CARD = 4 - private const val REQUEST_CODE_PURGE = 2 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 - private const val REQUEST_CODE_ENTER_NEW_PIN = 5 - private const val REQUEST_CODE_ENTER_NEW_PIN2 = 6 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7 - private const val REQUEST_CODE_SWAP_PIN = 8 - private const val REQUEST_CODE_RECEIVE_PAYMENT = 9 } private var nfcManager: NfcManager? = null @@ -93,7 +85,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ctx = TangemContext.loadFromBundle(activity, activity?.intent?.extras) - lastTag = activity?.intent?.getParcelableExtra(MainActivity.EXTRA_LAST_DISCOVERED_TAG) + lastTag = activity?.intent?.getParcelableExtra(Constant.EXTRA_LAST_DISCOVERED_TAG) localStorage = activity?.let { LocalStorage(it) }!! } @@ -163,12 +155,12 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific getString(R.string.via_cryptonit) -> { val intent = Intent(activity, PrepareCryptonitWithdrawalActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_RECEIVE_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_PAYMENT) } getString(R.string.via_kraken) -> { val intent = Intent(activity, PrepareKrakenWithdrawalActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_RECEIVE_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_PAYMENT) } else -> { } @@ -192,7 +184,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific btnDetails.setOnClickListener { if (cardProtocol != null) // openVerifyCard(cardProtocol!!) - (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData, ctx.message, ctx.error) + (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData) else showSingleToast(R.string.need_attach_card_again) @@ -208,7 +200,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific else { val intent = Intent(activity, PreparePaymentActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT) + startActivityForResult(intent, Constant.REQUEST_CODE_SEND_PAYMENT) } } else Toast.makeText(activity, getString(R.string.no_connection), Toast.LENGTH_SHORT).show() @@ -498,46 +490,46 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific var data = data super.onActivityResult(requestCode, resultCode, data) when (requestCode) { - REQUEST_CODE_VERIFY_CARD -> + Constant.REQUEST_CODE_VERIFY_CARD -> // action when erase wallet if (resultCode == Activity.RESULT_OK) { if (activity != null) activity?.finish() } - REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras != null && data.extras!!.containsKey("confirmPIN")) { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN = data.getStringExtra("newPIN") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("newPIN", data.getStringExtra("newPIN")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN) } } } - REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras != null && data.extras!!.containsKey("confirmPIN2")) { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN2 = data.getStringExtra("newPIN2") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("newPIN2", data.getStringExtra("newPIN2")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN2.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN2) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2) } } } - REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (newPIN == "") newPIN = ctx.card!!.pin @@ -555,13 +547,13 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific pinSwapWarningDialog.show(activity?.supportFragmentManager, PINSwapWarningDialog.TAG) } - REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) - data.putExtra("modification", "delete") + data.putExtra(Constant.EXTRA_MODIFICATION, "delete") } else - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") activity?.setResult(Activity.RESULT_OK, data) activity?.finish() @@ -577,7 +569,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -585,18 +577,18 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } } - REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { val intent = Intent(activity, PurgeActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_PURGE) } - REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) - data.putExtra("modification", "delete") + data.putExtra(Constant.EXTRA_MODIFICATION, "delete") } else { - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") } activity?.setResult(Activity.RESULT_OK, data) @@ -613,7 +605,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val intent = Intent(activity, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -622,7 +614,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } updateViews() } - REQUEST_CODE_SEND_PAYMENT, REQUEST_CODE_RECEIVE_PAYMENT -> { + Constant.REQUEST_CODE_SEND_PAYMENT, Constant.REQUEST_CODE_RECEIVE_PAYMENT -> { if (resultCode == Activity.RESULT_OK) { ctx.coinData?.clearInfo() srl?.postDelayed({ this.refresh() }, 5000) @@ -955,7 +947,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ctx.saveToIntent(intent) intent.putExtra("newPIN", newPIN) intent.putExtra("newPIN2", newPIN2) - startActivityForResult(intent, REQUEST_CODE_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_SWAP_PIN) } private var showTime: Date = Date() 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 618aaee44c..e9c1f257b1 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.Constant import com.tangem.data.db.PINStorage import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.* @@ -72,7 +73,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { fabMenu.setOnClickListener { showMenu(fabMenu) } btnOk.setOnClickListener { val data = prepareResultIntent() - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") activity?.finish() } } diff --git a/tangemcard/build.gradle b/tangemcard/build.gradle index e5d36fc391..049f9d32bd 100644 --- a/tangemcard/build.gradle +++ b/tangemcard/build.gradle @@ -4,16 +4,12 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 28 - - defaultConfig { minSdkVersion 16 targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { @@ -22,18 +18,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } + repositories { mavenCentral() -} +} \ No newline at end of file From 452c5511bcda9aa4f36fdfd1b15beef6c0de08df Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 18:31:15 +0300 Subject: [PATCH 2/5] Updated on 2026-08-14 --- app/src/main/java/com/tangem/App.java | 13 +++++++++++ .../com/tangem/data/nfc/ReadCardInfoTask.java | 4 ++-- .../activity/ConfirmPaymentActivity.kt | 2 +- .../activity/CreateNewWalletActivity.kt | 2 +- .../activity/EmptyWalletActivity.kt | 2 +- .../activity/LoadedWalletActivity.kt | 2 +- .../presentation/activity/MainActivity.kt | 22 +++++++++---------- .../activity/PinRequestActivity.kt | 2 +- .../presentation/activity/PinSaveActivity.kt | 2 +- .../presentation/activity/PinSwapActivity.kt | 2 +- ...pareCryptonitOtherApiWithdrawalActivity.kt | 10 ++++----- .../PrepareCryptonitWithdrawalActivity.kt | 2 +- .../PrepareKrakenWithdrawalActivity.kt | 2 +- .../activity/PreparePaymentActivity.kt | 2 +- .../presentation/activity/PurgeActivity.kt | 2 +- .../activity/SendTransactionActivity.kt | 2 +- .../activity/SignPaymentActivity.kt | 2 +- .../activity/VerifyCardActivity.kt | 2 +- .../dialog/WaitSecurityDelayDialog.java | 1 + .../drawable/ic_content_copy_black_24dp.xml | 0 .../main/res/drawable/ic_nfc_white_24dp.xml | 0 .../res/drawable/ic_wrench_white_24dp.xml | 0 gradlew | 0 23 files changed, 46 insertions(+), 32 deletions(-) mode change 100755 => 100644 app/src/main/res/drawable/ic_content_copy_black_24dp.xml mode change 100755 => 100644 app/src/main/res/drawable/ic_nfc_white_24dp.xml mode change 100755 => 100644 app/src/main/res/drawable/ic_wrench_white_24dp.xml mode change 100755 => 100644 gradlew diff --git a/app/src/main/java/com/tangem/App.java b/app/src/main/java/com/tangem/App.java index b63bdafa7e..8f8a25d409 100644 --- a/app/src/main/java/com/tangem/App.java +++ b/app/src/main/java/com/tangem/App.java @@ -3,10 +3,13 @@ package com.tangem; import android.app.Application; import android.support.v7.app.AppCompatDelegate; +import com.tangem.data.db.PINStorage; import com.tangem.di.DaggerNavigatorComponent; import com.tangem.di.DaggerNetworkComponent; import com.tangem.di.NavigatorComponent; import com.tangem.di.NetworkComponent; +import com.tangem.domain.cardReader.Firmwares; +import com.tangem.domain.wallet.Issuer; public class App extends Application { @@ -38,6 +41,16 @@ public class App extends Application { networkComponent = DaggerNetworkComponent.create(); navigatorComponent = buildNavigatorComponent(); + + // common init + if (PINStorage.needInit()) + PINStorage.init(getApplicationContext()); + + if (Issuer.needInit()) + Issuer.init(getApplicationContext()); + + if (Firmwares.needInit()) + Firmwares.init(getApplicationContext()); } /** 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 f0fa541df9..f7300a2d35 100644 --- a/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java +++ b/app/src/main/java/com/tangem/data/nfc/ReadCardInfoTask.java @@ -27,8 +27,8 @@ public class ReadCardInfoTask extends Thread { private static String lastRead_UID; public static void resetLastReadInfo() { - lastRead_UID=""; - lastRead_Encryption=null; + lastRead_UID = ""; + lastRead_Encryption = null; lastRead_UnsuccessfullPINs.clear(); } diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt index 9b3741d068..e0c1b86d45 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt @@ -61,7 +61,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_confirm_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 f1334508bd..0e7cdd8655 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -43,7 +43,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, super.onCreate(savedInstanceState) setContentView(R.layout.activity_create_new_wallet) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 e31879e9cc..c899e343da 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -46,7 +46,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card super.onCreate(savedInstanceState) setContentView(R.layout.activity_empty_wallet) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt index 1356658cb8..016901085d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt @@ -33,7 +33,7 @@ class LoadedWalletActivity : AppCompatActivity() { App.getNavigatorComponent().inject(this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) if (intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) 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 91186d4325..c923abe3c4 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -55,16 +55,16 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco fun callingIntent(context: Context) = Intent(context, MainActivity::class.java) - fun commonInit(context: Context) { - if (PINStorage.needInit()) - PINStorage.init(context) - - if (Issuer.needInit()) - Issuer.init(context) - - if (Firmwares.needInit()) - Firmwares.init(context) - } +// fun commonInit(context: Context) { +// if (PINStorage.needInit()) +// PINStorage.init(context) +// +// if (Issuer.needInit()) +// Issuer.init(context) +// +// if (Firmwares.needInit()) +// Firmwares.init(context) +// } } private var nfcManager: NfcManager? = null @@ -101,7 +101,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR - commonInit(applicationContext) +// commonInit(applicationContext) setNfcAdapterReaderCallback(this) 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 820dfb4dae..c91c59a6fc 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -53,7 +53,7 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_request) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 de85d4c251..c5a0d1f57a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -56,7 +56,7 @@ class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelper super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_save) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) usePIN2 = intent.getBooleanExtra("PIN2", false) 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 9b7c749348..4bdac7b598 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -44,7 +44,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt super.onCreate(savedInstanceState) setContentView(R.layout.activity_pin_swap) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 d7f21d2cac..ad2c17d0e5 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -38,7 +38,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_cryptonit_other_api_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) @@ -57,7 +57,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt tvCurrency.text = engine!!.balanceCurrency etAmount.setText(engine.convertToAmount(engine.convertToInternalAmount(ctx.card!!.denomination)).toValueString()) - etAmount.filters=engine.amountInputFilters + etAmount.filters = engine.amountInputFilters // set listeners btnLoad.setOnClickListener { @@ -66,7 +66,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt val strAmount: String = etAmount.text.toString().replace(",", ".") // if (!engine.checkAmount(card, strAmount)) // etAmount.error = getString(R.string.unknown_amount_format) - var dblAmount: Double = strAmount.toDouble() + val dblAmount: Double = strAmount.toDouble() rlProgressBar.visibility = View.VISIBLE tvProgressDescription.text = getString(R.string.cryptonit_request_withdrawal) @@ -177,8 +177,8 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if( resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode") ) { - when(requestCode) { + if (resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode")) { + when (requestCode) { REQUEST_CODE_SCAN_QR_KEY -> { cryptonit!!.key = data.getStringExtra("QRCode") tvKey!!.text = cryptonit!!.key 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 167739a07a..edc71f556c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -39,7 +39,7 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_cryptonit_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 1bafe7e5a3..bfbf3652f6 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt @@ -45,7 +45,7 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_kraken_withdrawal) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, 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 987f307e47..456d8d8b0a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt @@ -37,7 +37,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 bc74b7da35..ddb499459b 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -42,7 +42,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc nfcManager = NfcManager(this, this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) ctx = TangemContext.loadFromBundle(this, intent.extras) 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 279c561445..9dfd11aa45 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -36,7 +36,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { super.onCreate(savedInstanceState) setContentView(R.layout.activity_send_transaction) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) 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 52c13893f4..324c129de2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt @@ -56,7 +56,7 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card super.onCreate(savedInstanceState) setContentView(R.layout.activity_sign_payment) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) nfcManager = NfcManager(this, this) diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt index 6841d4bc83..54203243e7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -34,7 +34,7 @@ class VerifyCardActivity : AppCompatActivity() { App.getNavigatorComponent().inject(this) - MainActivity.commonInit(applicationContext) +// MainActivity.commonInit(applicationContext) } override fun onBackPressed() { diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java index 00a53361a6..8e61a1087b 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java @@ -143,6 +143,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { if (msec == 0) { if (instance != null) { + // TODO java.lang.NullPointerException: Attempt to invoke virtual method 'android.support.v4.app.FragmentTransaction android.support.v4.app.FragmentManager.beginTransaction()' on a null object reference instance.dismiss(); instance = null; } diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/drawable/ic_nfc_white_24dp.xml b/app/src/main/res/drawable/ic_nfc_white_24dp.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/drawable/ic_wrench_white_24dp.xml b/app/src/main/res/drawable/ic_wrench_white_24dp.xml old mode 100755 new mode 100644 diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 From cd34e37675cf81a198a5830f1bcc2e673c4accea Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 19:13:22 +0300 Subject: [PATCH 3/5] Updated on 2026-08-14 --- app/src/main/AndroidManifest.xml | 7 +++-- app/src/main/java/com/tangem/Constant.kt | 5 ++++ app/src/main/java/com/tangem/di/Navigator.kt | 13 +++++++--- .../presentation/activity/LogoActivity.kt | 14 +++++++--- .../presentation/activity/MainActivity.kt | 26 +++---------------- .../presentation/activity/PinSaveActivity.kt | 16 ++++++++++-- 6 files changed, 46 insertions(+), 35 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b2cea5d8f7..ac8f4dbac1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + @@ -20,11 +21,13 @@ + android:theme="@style/AppTheme" + tools:ignore="GoogleAppIndexingWarning"> { var f: File? = null @@ -231,17 +230,17 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco return true } R.id.managePIN -> { - showSavePinActivity() + navigator.showPinSave(this, false) return true } R.id.managePIN2 -> { - showSavePin2Activity() + navigator.showPinSave(this, true) return true } R.id.about -> { - showLogoActivity() + navigator.showLogo(this, false) return true } } @@ -391,13 +390,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco onNfcReaderCallback = callback } - private fun showLogoActivity() { - val intent = Intent(baseContext, LogoActivity::class.java) - intent.putExtra(LogoActivity.TAG, true) - intent.putExtra(LogoActivity.EXTRA_AUTO_HIDE, false) - startActivity(intent) - } - private fun animate() { val lp = llHand.layoutParams as RelativeLayout.LayoutParams val lp2 = llNfc.layoutParams as RelativeLayout.LayoutParams @@ -418,18 +410,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco llHand.startAnimation(a) } - private fun showSavePinActivity() { - val intent = Intent(baseContext, PinSaveActivity::class.java) - intent.putExtra("PIN2", false) - startActivity(intent) - } - - private fun showSavePin2Activity() { - val intent = Intent(baseContext, PinSaveActivity::class.java) - intent.putExtra("PIN2", true) - startActivity(intent) - } - private fun showMenu(v: View) { val popup = PopupMenu(this, v) val inflater = popup.menuInflater 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 c5a0d1f57a..0cedd9d5b2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -6,6 +6,7 @@ import android.annotation.TargetApi import android.app.Dialog import android.app.KeyguardManager import android.content.Context +import android.content.Intent import android.content.pm.PackageManager import android.hardware.fingerprint.FingerprintManager import android.os.Build @@ -19,9 +20,10 @@ import android.text.TextUtils import android.view.View import android.widget.Button import android.widget.Toast +import com.tangem.Constant +import com.tangem.data.db.PINStorage import com.tangem.data.fingerprint.ConfirmWithFingerprintTask import com.tangem.data.fingerprint.FingerprintHelper -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.* @@ -38,6 +40,16 @@ import javax.crypto.spec.IvParameterSpec class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelperListener { + companion object { + val TAG: String = PinSaveActivity::class.java.simpleName + + fun callingIntent(context: Context, hasPin2: Boolean): Intent { + val intent = Intent(context, PinSaveActivity::class.java) + intent.putExtra(Constant.EXTRA_PIN2, hasPin2) + return intent + } + } + private var confirmWithFingerprintTask: ConfirmWithFingerprintTask? = null private var keyStore: KeyStore? = null private var cipher: Cipher? = null @@ -58,7 +70,7 @@ class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelper // MainActivity.commonInit(applicationContext) - usePIN2 = intent.getBooleanExtra("PIN2", false) + usePIN2 = intent.getBooleanExtra(Constant.EXTRA_PIN2, false) if (usePIN2) tvPinPrompt.text = getString(R.string.enter_pin2_and_use_fingerprint_to_save_it) From c1c91c9ed9f1b6da2ef493fab1b0f1db088a9908 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Dec 2018 23:59:26 +0300 Subject: [PATCH 4/5] Updated on 2026-08-14 --- app/src/main/java/com/tangem/Constant.kt | 7 ++++++ app/src/main/java/com/tangem/di/Navigator.kt | 9 +++++--- .../presentation/activity/MainActivity.kt | 12 ++-------- .../activity/PinRequestActivity.kt | 8 +++++++ .../presentation/activity/PinSwapActivity.kt | 14 +++++++++-- .../presentation/fragment/LoadedWallet.kt | 23 +++---------------- .../presentation/fragment/VerifyCard.kt | 21 ++++++++--------- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt index cc90cd9b50..2ce7970ca6 100644 --- a/app/src/main/java/com/tangem/Constant.kt +++ b/app/src/main/java/com/tangem/Constant.kt @@ -33,4 +33,11 @@ object Constant { const val EXTRA_AUTO_HIDE = "extra_auto_hide" const val MILLIS_AUTO_HIDE = 1000 + // PinRequestActivity + const val EXTRA_MODE = "mode" + + // PinSwapActivity + const val EXTRA_NEW_PIN = "newPIN" + const val EXTRA_NEW_PIN_2 = "newPIN2" + } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index b49904b0fe..bfa5abc229 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -7,7 +7,6 @@ import com.tangem.Constant import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.activity.* -import com.tangem.presentation.fragment.LoadedWallet class Navigator { @@ -23,6 +22,10 @@ class Navigator { context.startActivity(PinSaveActivity.callingIntent(context, hasPin2)) } + fun showPinRequest(context: Activity, mode: String) { + context.startActivityForResult(PinRequestActivity.callingIntent(context, mode), Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY) + } + fun showLoadedWallet(context: Activity, lastTag: Tag, cardInfo: Bundle) { context.startActivityForResult(LoadedWalletActivity.callingIntent(context, lastTag, cardInfo), Constant.REQUEST_CODE_SHOW_CARD_ACTIVITY) } @@ -35,8 +38,8 @@ class Navigator { context.startActivityForResult(VerifyCardActivity.callingIntent(context, card, coinData), Constant.REQUEST_CODE_VERIFY_CARD) } - fun showPinSwap(context: Activity) { - + fun showPinSwap(context: Activity, newPIN: String, newPIN2: String) { + context.startActivityForResult(PinSwapActivity.callingIntent(context, newPIN, newPIN2), Constant.REQUEST_CODE_SWAP_PIN) } // fun showPreparePayment(context: Activity) { 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 dbdeff2cf7..91be7820e1 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -27,15 +27,13 @@ import com.scottyab.rootbeer.RootBeer import com.tangem.App import com.tangem.Constant import com.tangem.data.Logger -import com.tangem.data.db.PINStorage import com.tangem.data.network.ServerApiCommon import com.tangem.data.nfc.DeviceNFCAntennaLocation import com.tangem.data.nfc.ReadCardInfoTask import com.tangem.di.Navigator import com.tangem.domain.cardReader.CardProtocol -import com.tangem.domain.cardReader.Firmwares import com.tangem.domain.cardReader.NfcManager -import com.tangem.domain.wallet.* +import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.RootFoundDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog @@ -339,7 +337,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco unsuccessReadCount++ if (cardProtocol.error is CardProtocol.TangemException_InvalidPIN) - doEnterPIN() + navigator.showPinRequest(this, PinRequestActivity.Mode.RequestPIN.toString()) else { if (cardProtocol.error is CardProtocol.TangemException_ExtendedLengthNotSupported) if (!NoExtendedLengthSupportDialog.allReadyShowed) @@ -425,10 +423,4 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco popup.show() } - private fun doEnterPIN() { - val intent = Intent(this, PinRequestActivity::class.java) - intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN.toString()) - startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_PIN_ACTIVITY) - } - } \ No newline at end of file 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 c91c59a6fc..faa7b4c7d2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -19,10 +19,12 @@ import android.text.TextUtils import android.util.Log import android.view.View import android.widget.Button +import com.tangem.Constant import com.tangem.data.fingerprint.StartFingerprintReaderTask import com.tangem.domain.cardReader.NfcManager import com.tangem.data.fingerprint.FingerprintHelper import com.tangem.data.db.PINStorage +import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_request.* @@ -34,6 +36,12 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge companion object { const val KEY_ALIAS = "pinKey" const val KEYSTORE = "AndroidKeyStore" + + fun callingIntent(context: Activity, mode: String): Intent { + val intent = Intent(context, PinRequestActivity::class.java) + intent.putExtra(Constant.EXTRA_MODE, mode) + return intent + } } lateinit var mode: Mode 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 4bdac7b598..505e411d4e 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -1,6 +1,7 @@ package com.tangem.presentation.activity import android.app.Activity +import android.content.Context import android.content.Intent import android.content.res.ColorStateList import android.graphics.Color @@ -12,9 +13,11 @@ import android.support.v7.app.AppCompatActivity import android.view.View import android.widget.ProgressBar import android.widget.Toast +import com.tangem.Constant import com.tangem.data.nfc.SwapPINTask import com.tangem.domain.cardReader.CardProtocol import com.tangem.domain.cardReader.NfcManager +import com.tangem.domain.wallet.CoinData import com.tangem.domain.wallet.TangemCard import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.WaitSecurityDelayDialog @@ -27,6 +30,13 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt companion object { val TAG: String = PinSwapActivity::class.java.simpleName + fun callingIntent(context: Context, newPIN: String, newPIN2: String): Intent { + val intent = Intent(context, PinSwapActivity::class.java) + intent.putExtra(Constant.EXTRA_NEW_PIN, newPIN) + intent.putExtra(Constant.EXTRA_NEW_PIN_2, newPIN2) + return intent + } + const val RESULT_INVALID_PIN = Activity.RESULT_FIRST_USER } @@ -51,8 +61,8 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID)) card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD)) - newPIN = intent.getStringExtra("newPIN") - newPIN2 = intent.getStringExtra("newPIN2") + newPIN = intent.getStringExtra(Constant.EXTRA_NEW_PIN) + newPIN2 = intent.getStringExtra(Constant.EXTRA_NEW_PIN_2) tvCardID.text = card!!.cidDescription 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 3c315e1c07..cb93210152 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -183,9 +183,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } btnDetails.setOnClickListener { if (cardProtocol != null) -// openVerifyCard(cardProtocol!!) (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx.card, ctx.coinData) - else showSingleToast(R.string.need_attach_card_again) } @@ -537,7 +535,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific newPIN2 = PINStorage.getPIN2() val pinSwapWarningDialog = PINSwapWarningDialog() - pinSwapWarningDialog.setOnRefreshPage { startSwapPINActivity() } + pinSwapWarningDialog.setOnRefreshPage { (activity as LoadedWalletActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) } val bundle = Bundle() if (!PINStorage.isDefaultPIN(newPIN) || !PINStorage.isDefaultPIN2(newPIN2)) bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget)) @@ -874,17 +872,10 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } -// private fun openVerifyCard(cardProtocol: CardProtocol) { -// val intent = Intent(activity, VerifyCardActivity::class.java) -// ctx.saveToIntent(intent) -// startActivityForResult(intent, REQUEST_CODE_VERIFY_CARD) -// -// ctx.coinData -// } - private fun startVerify(tag: Tag?) { try { - val isoDep = IsoDep.get(tag) ?: throw CardProtocol.TangemException(getString(R.string.wrong_tag_err)) + val isoDep = IsoDep.get(tag) + ?: throw CardProtocol.TangemException(getString(R.string.wrong_tag_err)) val uid = tag!!.id val sUID = Util.byteArrayToHexString(uid) if (ctx.card.uid != sUID) { @@ -942,14 +933,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } - private fun startSwapPINActivity() { - val intent = Intent(activity, PinSwapActivity::class.java) - ctx.saveToIntent(intent) - intent.putExtra("newPIN", newPIN) - intent.putExtra("newPIN2", newPIN2) - startActivityForResult(intent, Constant.REQUEST_CODE_SWAP_PIN) - } - private var showTime: Date = Date() private fun showSingleToast(text: Int) { 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 e9c1f257b1..3568eff663 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -17,10 +17,7 @@ import com.tangem.Constant import com.tangem.data.db.PINStorage import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.* -import com.tangem.presentation.activity.CreateNewWalletActivity -import com.tangem.presentation.activity.PurgeActivity -import com.tangem.presentation.activity.PinRequestActivity -import com.tangem.presentation.activity.PinSwapActivity +import com.tangem.presentation.activity.* import com.tangem.presentation.dialog.PINSwapWarningDialog import com.tangem.wallet.BuildConfig import com.tangem.wallet.R @@ -135,7 +132,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { if (newPIN2 == "") newPIN2 = PINStorage.getPIN2() val pinSwapWarningDialog = PINSwapWarningDialog() - pinSwapWarningDialog.setOnRefreshPage { startSwapPINActivity() } + pinSwapWarningDialog.setOnRefreshPage { (activity as VerifyCardActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) } val bundle = Bundle() if (!PINStorage.isDefaultPIN(newPIN) || !PINStorage.isDefaultPIN2(newPIN2)) bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget)) @@ -481,13 +478,13 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) } - private fun startSwapPINActivity() { - val intent = Intent(context, PinSwapActivity::class.java) - ctx.saveToIntent(intent) - intent.putExtra("newPIN", newPIN) - intent.putExtra("newPIN2", newPIN2) - startActivityForResult(intent, REQUEST_CODE_SWAP_PIN) - } +// private fun startSwapPINActivity() { +// val intent = Intent(context, PinSwapActivity::class.java) +// ctx.saveToIntent(intent) +// intent.putExtra("newPIN", newPIN) +// intent.putExtra("newPIN2", newPIN2) +// startActivityForResult(intent, REQUEST_CODE_SWAP_PIN) +// } fun prepareResultIntent(): Intent { val data = Intent() From 98806df725a72452043150ad3e70da2c0ca2c361 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Dec 2018 00:19:41 +0300 Subject: [PATCH 5/5] Updated on 2026-08-14 --- app/src/main/java/com/tangem/Constant.kt | 2 +- app/src/main/java/com/tangem/di/Navigator.kt | 18 +++--- .../presentation/fragment/VerifyCard.kt | 62 +++++++------------ 3 files changed, 35 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/tangem/Constant.kt b/app/src/main/java/com/tangem/Constant.kt index 2ce7970ca6..8e1fdf1955 100644 --- a/app/src/main/java/com/tangem/Constant.kt +++ b/app/src/main/java/com/tangem/Constant.kt @@ -9,7 +9,7 @@ object Constant { const val EXTRA_MODIFICATION = "modification" - // LoadedWallet + // LoadedWallet, VerifyCard const val REQUEST_CODE_SEND_PAYMENT = 1 const val REQUEST_CODE_PURGE = 2 const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt index bfa5abc229..82ca8238fb 100644 --- a/app/src/main/java/com/tangem/di/Navigator.kt +++ b/app/src/main/java/com/tangem/di/Navigator.kt @@ -42,12 +42,16 @@ class Navigator { context.startActivityForResult(PinSwapActivity.callingIntent(context, newPIN, newPIN2), Constant.REQUEST_CODE_SWAP_PIN) } -// fun showPreparePayment(context: Activity) { -// -// } -// -// fun showCreateNewWallet(context: Activity) { -// -// } + fun showPurge(context: Activity) { + + } + + fun showPreparePayment(context: Activity) { + + } + + fun showCreateNewWallet(context: Activity) { + + } } \ No newline at end of file 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 3568eff663..0ef5bddedf 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -30,14 +30,6 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { companion object { val TAG: String = VerifyCard::class.java.simpleName - private const val REQUEST_CODE_SEND_PAYMENT = 1 - private const val REQUEST_CODE_PURGE = 2 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_PURGE = 3 - private const val REQUEST_CODE_VERIFY_CARD = 4 - private const val REQUEST_CODE_ENTER_NEW_PIN = 5 - private const val REQUEST_CODE_ENTER_NEW_PIN2 = 6 - private const val REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7 - private const val REQUEST_CODE_SWAP_PIN = 8 } private var nfcManager: NfcManager? = null @@ -94,39 +86,39 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { var data = data super.onActivityResult(requestCode, resultCode, data) when (requestCode) { - REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras!!.containsKey("confirmPIN")) { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN = data.getStringExtra("newPIN") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("newPIN", data.getStringExtra("newPIN")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN) } } } - REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_ENTER_NEW_PIN2 -> if (resultCode == Activity.RESULT_OK) { if (data != null) { if (data.extras!!.containsKey("confirmPIN2")) { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) newPIN2 = data.getStringExtra("newPIN2") - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } else { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("newPIN2", data.getStringExtra("newPIN2")) intent.putExtra("mode", PinRequestActivity.Mode.ConfirmNewPIN2.toString()) - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN2) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2) } } } - REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (newPIN == "") newPIN = ctx.card!!.pin if (newPIN2 == "") newPIN2 = PINStorage.getPIN2() @@ -142,7 +134,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { pinSwapWarningDialog.show(activity?.supportFragmentManager, PINSwapWarningDialog.TAG) } - REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) @@ -162,7 +154,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -170,18 +162,18 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { } } } - REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE -> if (resultCode == Activity.RESULT_OK) { val intent = Intent(context, PurgeActivity::class.java) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_PURGE) } - REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { + Constant.REQUEST_CODE_PURGE -> if (resultCode == Activity.RESULT_OK) { if (data == null) { data = Intent() ctx.saveToIntent(data) - data.putExtra("modification", "delete") + data.putExtra(Constant.EXTRA_MODIFICATION, "delete") } else { - data.putExtra("modification", "update") + data.putExtra(Constant.EXTRA_MODIFICATION, "update") } activity!!.setResult(Activity.RESULT_OK, data) activity!!.finish() @@ -194,9 +186,9 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { if (resultCode == CreateNewWalletActivity.RESULT_INVALID_PIN && requestPIN2Count < 2) { requestPIN2Count++ val intent = Intent(context, PinRequestActivity::class.java) - intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) + intent.putExtra(Constant.EXTRA_MODE, PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) return } else { if (data != null && data.extras!!.containsKey("message")) { @@ -205,7 +197,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { } updateViews() } - REQUEST_CODE_SEND_PAYMENT -> { + Constant.REQUEST_CODE_SEND_PAYMENT -> { if (resultCode == Activity.RESULT_OK) { srlVerifyCard.isRefreshing = true ctx.coinData!!.clearInfo() @@ -420,7 +412,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { intent.putExtra("mode", PinRequestActivity.Mode.RequestNewPIN.toString()) newPIN = "" newPIN2 = "" - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN) } private fun doResetPin() { @@ -430,7 +422,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { ctx.saveToIntent(intent) newPIN = PINStorage.getDefaultPIN() newPIN2 = "" - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } private fun doResetPin2() { @@ -440,7 +432,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { ctx.saveToIntent(intent) newPIN = "" newPIN2 = PINStorage.getDefaultPIN2() - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } private fun doResetPins() { @@ -450,7 +442,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { ctx.saveToIntent(intent) newPIN = PINStorage.getDefaultPIN() newPIN2 = PINStorage.getDefaultPIN2() - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN) } private fun doSetPin2() { @@ -459,7 +451,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { intent.putExtra("mode", PinRequestActivity.Mode.RequestNewPIN2.toString()) newPIN = "" newPIN2 = "" - startActivityForResult(intent, REQUEST_CODE_ENTER_NEW_PIN2) + startActivityForResult(intent, Constant.REQUEST_CODE_ENTER_NEW_PIN2) } private fun doPurge() { @@ -475,17 +467,9 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { val intent = Intent(context, PinRequestActivity::class.java) intent.putExtra("mode", PinRequestActivity.Mode.RequestPIN2.toString()) ctx.saveToIntent(intent) - startActivityForResult(intent, REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) + startActivityForResult(intent, Constant.REQUEST_CODE_REQUEST_PIN2_FOR_PURGE) } -// private fun startSwapPINActivity() { -// val intent = Intent(context, PinSwapActivity::class.java) -// ctx.saveToIntent(intent) -// intent.putExtra("newPIN", newPIN) -// intent.putExtra("newPIN2", newPIN2) -// startActivityForResult(intent, REQUEST_CODE_SWAP_PIN) -// } - fun prepareResultIntent(): Intent { val data = Intent() ctx.saveToIntent(data)