diff --git a/app/build.gradle b/app/build.gradle index 39eb739921..728a744d67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 28 - versionCode 96 + versionCode 97 versionName "0.810.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } 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 c59e741ca7..7b706af726 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -41,7 +41,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { nfcManager = NfcManager(this, this) - ctx=TangemContext.loadFromBundle(this, intent.extras) + ctx = TangemContext.loadFromBundle(this, intent.extras) tx = intent.getStringExtra(EXTRA_TX) val engine = CoinEngineFactory.create(ctx) @@ -58,16 +58,11 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { override fun onSuccess(electrumRequest: ElectrumRequest?) { if (electrumRequest!!.isMethod(ElectrumRequest.METHOD_SendTransaction)) { try { - //TODO error processing - var hashTX = electrumRequest.resultString - try { - if (hashTX.startsWith("0x") || hashTX.startsWith("0X")) { - hashTX = hashTX.substring(2) - } + val hashTX = electrumRequest.resultString + if (hashTX.length > 1) finishWithSuccess() - } catch (e: Exception) { - e.printStackTrace() - } + else + finishWithError("empty hash") } catch (e: JSONException) { e.printStackTrace() } @@ -87,8 +82,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION -> { try { //infuraResponse.result - it's HashTX - if( infuraResponse.result.isEmpty() ) - { + if (infuraResponse.result.isEmpty()) { finishWithError("rejected by server") }