From 0ed2dc6dd9196f1c19676318756c415971a4b390 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 28 Aug 2019 09:25:41 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ba1ec0f15a..b7f083cbfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,8 @@ android { versionNameSuffix "-beta" applicationIdSuffix ".debug_beta" buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("true")' - manifestPlaceholders = [fabric_api_key: properties.getProperty('fabric_api_key')] + manifestPlaceholders = [fabric_api_key: properties.hasProperty('fabric_api_key') + ? project.property('fabric_api_key') : 000] } } flavorDimensions "" From 487c4a90941a43814784db03a6b060be0517c888 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 28 Aug 2019 15:19:13 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- .../tangem/ui/activity/EmptyWalletActivity.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt index 0b6abbc166..2eecc94b7f 100644 --- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt @@ -10,33 +10,32 @@ import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Build import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.text.Html import android.view.View import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.di.Navigator -import com.tangem.wallet.TangemContext -import com.tangem.ui.dialog.NoExtendedLengthSupportDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.android.reader.NfcReader +import com.tangem.card_android.data.EXTRA_TANGEM_CARD +import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID import com.tangem.card_android.data.asBundle import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.VerifyCardTask import com.tangem.card_common.util.Util -import com.tangem.util.UtilHelper +import com.tangem.di.Navigator +import com.tangem.di.ToastHelper +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_empty_wallet.* import kotlinx.android.synthetic.main.layout_tangem_card.* import javax.inject.Inject -import com.tangem.card_android.data.EXTRA_TANGEM_CARD -import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID -import com.tangem.di.ToastHelper class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { companion object { @@ -146,7 +145,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card val isoDep = IsoDep.get(tag) val uid = tag.id val sUID = Util.byteArrayToHexString(uid) - if (ctx.card.uid != sUID) { + if (ctx.card.uid != sUID || cardProtocol != null) { nfcManager.ignoreTag(isoDep.tag) return }