GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2019-01-10 15:49:52 +03:00
parent aac014439b
commit dfd7409c5d
3 changed files with 22 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
View file

@ -28,21 +28,20 @@ import com.tangem.App
import com.tangem.Constant
import com.tangem.data.Logger
import com.tangem.data.network.ServerApiCommon
import com.tangem.tangemcard.android.nfc.DeviceNFCAntennaLocation
import com.tangem.tangemcard.tasks.ReadCardInfoTask
import com.tangem.di.Navigator
import com.tangem.domain.wallet.CoinEngineFactory
import com.tangem.domain.wallet.TangemContext
import com.tangem.tangemcard.reader.CardProtocol
import com.tangem.tangemcard.android.reader.NfcManager
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
import com.tangem.presentation.dialog.RootFoundDialog
import com.tangem.presentation.dialog.WaitSecurityDelayDialog
import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew
import com.tangem.tangemcard.android.nfc.DeviceNFCAntennaLocation
import com.tangem.tangemcard.android.reader.NfcManager
import com.tangem.tangemcard.android.reader.NfcReader
import com.tangem.tangemcard.data.TangemCard
import com.tangem.tangemcard.data.loadFromBundle
import com.tangem.tangemcard.data.saveToBundle
import com.tangem.tangemcard.reader.CardProtocol
import com.tangem.tangemcard.tasks.ReadCardInfoTask
import com.tangem.util.CommonUtil
import com.tangem.util.LOG
import com.tangem.util.PhoneUtility

42
app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
View file

@ -20,21 +20,15 @@ import com.tangem.domain.wallet.CoinEngineFactory
import com.tangem.domain.wallet.TangemContext
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
import com.tangem.presentation.dialog.WaitSecurityDelayDialog
import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew
import com.tangem.presentation.event.ReadAfterRequest
import com.tangem.presentation.event.ReadBeforeRequest
import com.tangem.presentation.event.ReadWait
import com.tangem.presentation.event.TransactionFinishWithError
import com.tangem.tangemcard.reader.CardProtocol
import com.tangem.tangemcard.android.reader.NfcManager
import com.tangem.tangemcard.android.reader.NfcReader
import com.tangem.tangemcard.data.asBundle
import com.tangem.tangemcard.reader.CardProtocol
import com.tangem.tangemcard.tasks.SignTask
import com.tangem.tangemcard.util.Util
import com.tangem.util.LOG
import com.tangem.wallet.R
import kotlinx.android.synthetic.main.activity_sign_payment.*
import org.greenrobot.eventbus.EventBus
class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
@ -259,38 +253,38 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
}, 500)
}
private val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
// private val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
override fun onReadBeforeRequest(timeout: Int) {
// LOG.i(TAG, "onReadBeforeRequest timeout $timeout")
// WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
LOG.i(TAG, "onReadBeforeRequest timeout $timeout")
WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
if (!waitSecurityDelayDialogNew.isAdded)
waitSecurityDelayDialogNew.show(supportFragmentManager, WaitSecurityDelayDialogNew.TAG)
// if (!waitSecurityDelayDialogNew.isAdded)
// waitSecurityDelayDialogNew.show(supportFragmentManager, WaitSecurityDelayDialogNew.TAG)
val readBeforeRequest = ReadBeforeRequest()
readBeforeRequest.timeout = timeout
EventBus.getDefault().post(readBeforeRequest)
// val readBeforeRequest = ReadBeforeRequest()
// readBeforeRequest.timeout = timeout
// EventBus.getDefault().post(readBeforeRequest)
}
override fun onReadAfterRequest() {
// LOG.i(TAG, "onReadAfterRequest")
// WaitSecurityDelayDialog.onReadAfterRequest(this)
LOG.i(TAG, "onReadAfterRequest")
WaitSecurityDelayDialog.onReadAfterRequest(this)
val readAfterRequest = ReadAfterRequest()
EventBus.getDefault().post(readAfterRequest)
// val readAfterRequest = ReadAfterRequest()
// EventBus.getDefault().post(readAfterRequest)
}
override fun onReadWait(msec: Int) {
// LOG.i(TAG, "onReadWait msec $msec")
// WaitSecurityDelayDialog.onReadWait(this, msec)
LOG.i(TAG, "onReadWait msec $msec")
WaitSecurityDelayDialog.onReadWait(this, msec)
val readWait = ReadWait()
readWait.msec = msec
EventBus.getDefault().post(readWait)
// val readWait = ReadWait()
// readWait.msec = msec
// EventBus.getDefault().post(readWait)
}

45
app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
View file

@ -126,51 +126,6 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
setRemainingTimeout(readWait.msec!!)
}
fun onReadBeforeRequest(timeout: Int) {
// if (timerToShowDelayDialog != null || timeout < DELAY_BEFORE_SHOW_DIALOG + MIN_REMAINING_DELAY_TO_SHOW_DIALOG)
// return
//
// timerToShowDelayDialog = Timer()
// timerToShowDelayDialog!!.schedule(object : TimerTask() {
// override fun run() {
// setup(timeout, DELAY_BEFORE_SHOW_DIALOG)
// isCancelable = false
// if (!isVisible)
// show(activity?.supportFragmentManager, TAG)
// }
// }, DELAY_BEFORE_SHOW_DIALOG.toLong())
}
fun onReadAfterRequest() {
// if (timerToShowDelayDialog == null)
// return
//
// timerToShowDelayDialog!!.cancel()
// timerToShowDelayDialog = null
}
fun onReadWait(msec: Int) {
// if (timerToShowDelayDialog != null) {
// timerToShowDelayDialog!!.cancel()
// timerToShowDelayDialog = null
// }
//
// if (msec == 0) {
// dismiss()
// return
// }
//
// if (msec > MIN_REMAINING_DELAY_TO_SHOW_DIALOG) {
// // 1000ms - card delay notification interval
// setup(msec + 1000, 1000)
// isCancelable = false
//// if (!isVisible)
// show(activity?.supportFragmentManager, TAG)
//
// } else
// setRemainingTimeout(msec)
}
private fun setup(msTimeout: Int, msProgress: Int) {
this.msTimeout = msTimeout
this.msProgress = msProgress