Updated on 2026-08-14

This commit is contained in:
Tangem 2018-08-08 16:20:27 +03:00
parent 2b6b129096
commit 57a20d3cfc
15 changed files with 128 additions and 130 deletions

View file

@ -103,14 +103,14 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
super.onStop()
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
progressBar!!.post {
progressBar!!.visibility = View.VISIBLE
progressBar!!.progress = 5
}
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadFinish(cardProtocol: CardProtocol?) {
createNewWalletTask = null
if (cardProtocol != null) {
if (cardProtocol.error == null) {
@ -172,11 +172,11 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
}, 500)
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun OnReadCancel() {
override fun onReadCancel() {
createNewWalletTask = null
@ -191,15 +191,15 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(this, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(this)
}

View file

@ -167,14 +167,14 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
progressBar!!.post {
progressBar!!.visibility = View.VISIBLE
progressBar!!.progress = 5
}
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadFinish(cardProtocol: CardProtocol?) {
verifyCardTask = null
if (cardProtocol != null) {
if (cardProtocol.error == null) {
@ -215,11 +215,11 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}, 500)
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun OnReadCancel() {
override fun onReadCancel() {
verifyCardTask = null
progressBar!!.postDelayed({
try {
@ -232,15 +232,15 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(this, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(this)
}

View file

@ -265,15 +265,15 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
super.onStop()
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
rlProgressBar.post { rlProgressBar.visibility = View.VISIBLE }
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadFinish(cardProtocol: CardProtocol?) {
readCardInfoTask = null
if (cardProtocol != null) {
if (cardProtocol.error == null) {
@ -341,7 +341,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
}, 500)
}
override fun OnReadCancel() {
override fun onReadCancel() {
readCardInfoTask = null
ReadCardInfoTask.resetLastReadInfo()
rlProgressBar.postDelayed({
@ -353,15 +353,15 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(Objects.requireNonNull(this), msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(Objects.requireNonNull(this), timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(Objects.requireNonNull(this))
}

View file

@ -104,14 +104,14 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
super.onStop()
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
progressBar!!.post {
progressBar!!.visibility = View.VISIBLE
progressBar!!.progress = 5
}
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadFinish(cardProtocol: CardProtocol?) {
swapPinTask = null
if (cardProtocol != null) {
@ -171,11 +171,11 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
}
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun OnReadCancel() {
override fun onReadCancel() {
swapPinTask = null
progressBar!!.postDelayed({
@ -189,15 +189,15 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(this, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(this)
}

View file

@ -96,26 +96,26 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
}
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(this, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(this)
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
progressBar!!.post {
progressBar!!.visibility = View.VISIBLE
progressBar!!.progress = 5
}
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadFinish(cardProtocol: CardProtocol?) {
purgeTask = null
if (cardProtocol != null) {
@ -176,11 +176,11 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
}, 500)
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun OnReadCancel() {
override fun onReadCancel() {
purgeTask = null
progressBar!!.postDelayed({
try {

View file

@ -135,14 +135,18 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
return super.onKeyDown(keyCode, event)
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
progressBar!!.post {
progressBar!!.visibility = View.VISIBLE
progressBar!!.progress = 5
}
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun onReadFinish(cardProtocol: CardProtocol?) {
signPaymentTask = null
if (cardProtocol != null) {
if (cardProtocol.error == null) {
@ -199,11 +203,7 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}, 500)
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
progressBar!!.post { progressBar!!.progress = progress }
}
override fun OnReadCancel() {
override fun onReadCancel() {
signPaymentTask = null
progressBar!!.postDelayed({
@ -217,15 +217,15 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(this, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(this)
}

View file

@ -516,11 +516,15 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
return data
}
override fun OnReadStart(cardProtocol: CardProtocol) {
override fun onReadStart(cardProtocol: CardProtocol) {
rlProgressBar.post { rlProgressBar.visibility = View.VISIBLE }
}
override fun OnReadFinish(cardProtocol: CardProtocol?) {
override fun onReadProgress(protocol: CardProtocol, progress: Int) {
}
override fun onReadFinish(cardProtocol: CardProtocol?) {
verifyCardTask = null
if (cardProtocol != null) {
@ -552,11 +556,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}, 500)
}
override fun OnReadProgress(protocol: CardProtocol, progress: Int) {
}
override fun OnReadCancel() {
override fun onReadCancel() {
verifyCardTask = null
rlProgressBar.postDelayed({
try {
@ -567,15 +567,15 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}, 500)
}
override fun OnReadWait(msec: Int) {
override fun onReadWait(msec: Int) {
WaitSecurityDelayDialog.OnReadWait(activity!!, msec)
}
override fun OnReadBeforeRequest(timeout: Int) {
override fun onReadBeforeRequest(timeout: Int) {
WaitSecurityDelayDialog.onReadBeforeRequest(activity!!, timeout)
}
override fun OnReadAfterRequest() {
override fun onReadAfterRequest() {
WaitSecurityDelayDialog.onReadAfterRequest(activity!!)
}