From 0e79fb7b511602cf9251c8a229e6057058e307a2 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Thu, 22 Oct 2020 11:19:51 +0200
Subject: [PATCH] Suppress NDEF tag handling when in foreground

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../keycard/connect/ui/ChangePINActivity.kt   |  2 +-
 .../keycard/connect/ui/ChangePUKActivity.kt   |  2 +-
 .../ui/ChangePairingPasswordActivity.kt       |  2 +-
 .../status/keycard/connect/ui/InitActivity.kt |  2 +-
 .../keycard/connect/ui/LoadKeyActivity.kt     |  2 +-
 .../status/keycard/connect/ui/MainActivity.kt | 72 ++++++++++++++-----
 .../keycard/connect/ui/NoNFCActivity.kt       | 22 ++++++
 .../status/keycard/connect/ui/PINActivity.kt  |  2 +-
 .../status/keycard/connect/ui/PUKActivity.kt  |  2 +-
 .../keycard/connect/ui/PairingActivity.kt     |  2 +-
 .../keycard/connect/ui/QRCodeActivity.kt      | 20 ++++++
 .../keycard/connect/ui/ReinstallActivity.kt   |  2 +-
 .../connect/ui/ShowMnemonicActivity.kt        |  2 +-
 .../keycard/connect/ui/SignMessageActivity.kt |  2 +-
 .../connect/ui/SignTransactionActivity.kt     |  2 +-
 16 files changed, 109 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/im/status/keycard/connect/ui/NoNFCActivity.kt
 create mode 100644 app/src/main/java/im/status/keycard/connect/ui/QRCodeActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c01d068..48e401c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
         <activity android:name=".ui.PairingActivity" />
         <activity android:name=".ui.PINActivity" />
         <activity android:name=".ui.ReinstallActivity" />
+        <activity android:name=".ui.QRCodeActivity" />
         <activity
             android:name=".ui.MainActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
index c056ca3..539ba06 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
@@ -12,7 +12,7 @@ import im.status.keycard.connect.card.ChangePINCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
 import im.status.keycard.connect.data.isValidPIN
 
-class ChangePINActivity : AppCompatActivity() {
+class ChangePINActivity : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_pin)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ChangePUKActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ChangePUKActivity.kt
index fe0983d..e52d742 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ChangePUKActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ChangePUKActivity.kt
@@ -12,7 +12,7 @@ import im.status.keycard.connect.card.ChangePUKCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
 import im.status.keycard.connect.data.isValidPUK
 
-class ChangePUKActivity : AppCompatActivity() {
+class ChangePUKActivity : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_puk)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
index 3213b91..3fcd808 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
@@ -12,7 +12,7 @@ import im.status.keycard.connect.card.ChangePairingPasswordCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
 import im.status.keycard.connect.data.isValidPUK
 
-class ChangePairingPasswordActivity : AppCompatActivity() {
+class ChangePairingPasswordActivity : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_pairing_password)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/InitActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/InitActivity.kt
index 88f959f..a7ab8e8 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/InitActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/InitActivity.kt
@@ -15,7 +15,7 @@ import im.status.keycard.connect.data.INIT_ACTIVITY_PIN
 import im.status.keycard.connect.data.INIT_ACTIVITY_PUK
 import im.status.keycard.globalplatform.Crypto
 
-class InitActivity : AppCompatActivity() {
+class InitActivity : NoNFCActivity() {
     private lateinit var pin: String
     private lateinit var puk: String
     private lateinit var pairing: String
diff --git a/app/src/main/java/im/status/keycard/connect/ui/LoadKeyActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/LoadKeyActivity.kt
index 40c5c1a..978a48b 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/LoadKeyActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/LoadKeyActivity.kt
@@ -10,7 +10,7 @@ import im.status.keycard.connect.R
 import im.status.keycard.connect.data.*
 import java.util.*
 
-class LoadKeyActivity : AppCompatActivity() {
+class LoadKeyActivity : NoNFCActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
index 77a5da4..fdf47cc 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.nfc.NfcAdapter
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.*
@@ -18,6 +19,8 @@ import im.status.keycard.connect.net.WalletConnectListener
 import org.walletconnect.Session.Config.Companion.fromWCUri
 import kotlin.reflect.KClass
 
+private const val TAG = "MainActivity"
+
 class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener {
     private lateinit var viewSwitcher: ViewSwitcher
     private lateinit var networkSpinner: Spinner
@@ -48,9 +51,18 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         handleIntent(intent)
     }
 
+    private fun activateNFC() {
+        Registry.nfcAdapter.enableReaderMode(
+            this,
+            Registry.cardManager,
+            NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,
+            null
+        )
+    }
+
     override fun onResume() {
         super.onResume()
-        Registry.nfcAdapter.enableReaderMode(this, Registry.cardManager,NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null)
+        activateNFC()
     }
 
     override fun onPause() {
@@ -81,7 +93,10 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         super.onActivityResult(requestCode, resultCode, data)
 
         when (requestCode) {
-            REQ_INTERACTIVE_SCRIPT -> Registry.scriptExecutor.onUserInteractionReturned(resultCode, data)
+            REQ_INTERACTIVE_SCRIPT -> Registry.scriptExecutor.onUserInteractionReturned(
+                resultCode,
+                data
+            )
             REQ_WALLETCONNECT -> Registry.walletConnect.onUserInteractionReturned(resultCode, data)
             REQ_LOADKEY -> loadKeyHandler(resultCode, data)
             IntentIntegrator.REQUEST_CODE -> qrCodeScanned(resultCode, data)
@@ -90,6 +105,7 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
 
     override fun onScriptStarted() {
         this.runOnUiThread {
+            activateNFC()
             viewSwitcher.showNext()
         }
     }
@@ -119,6 +135,7 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
     fun connectWallet(view: View) {
         updateConnection(view)
         val integrator = IntentIntegrator(this)
+        integrator.captureActivity = QRCodeActivity::class.java
         integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
         integrator.setOrientationLocked(false)
         integrator.initiateScan()
@@ -167,7 +184,14 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         val loadType = data.getIntExtra(LOAD_TYPE, LOAD_NONE)
         val mnemonic = data.getStringExtra(LOAD_MNEMONIC)
 
-        Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(LoadKeyCommand(loadType, mnemonic)))
+        Registry.scriptExecutor.runScript(
+            scriptWithAuthentication().plus(
+                LoadKeyCommand(
+                    loadType,
+                    mnemonic
+                )
+            )
+        )
     }
 
     private fun startCommand(activity: KClass<out Activity>) {
@@ -176,37 +200,49 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
     }
 
     private fun qrCodeScanned(resultCode: Int, data: Intent?) {
-        if (resultCode != Activity.RESULT_OK || data == null) return
-
-        handleWCURI(data.getStringExtra(Intents.Scan.RESULT))
-
+        if (resultCode != Activity.RESULT_OK || data == null) {
+            Log.e(TAG, "QRCode result: $resultCode")
+        } else {
+            handleWCURI(data.getStringExtra(Intents.Scan.RESULT))
+        }
     }
 
     private fun handleWCURI(uri: String?) {
         if (uri != null) {
+            Log.d(TAG, "Connecting to $uri")
             try {
                 Registry.walletConnect.connect(fromWCUri(uri).toFullyQualifiedConfig())
-            } catch (e: Exception) {}
+            } catch (e: Exception) {
+                Log.e(TAG, "Parsing $uri failed", e)
+            }
+        } else {
+            Log.e(TAG, "Null URI received")
         }
     }
 
     override fun onConnected() {
-        val button = findViewById<Button>(R.id.walletConnectButton)
-        button.setOnClickListener(this::disconnectWallet)
-        button.text = getString(R.string.disconnect_wallet)
+        this.runOnUiThread {
+            val button = findViewById<Button>(R.id.walletConnectButton)
+            button.setOnClickListener(this::disconnectWallet)
+            button.text = getString(R.string.disconnect_wallet)
+        }
     }
 
     override fun onDisconnected() {
-        val button = findViewById<Button>(R.id.walletConnectButton)
-        button.setOnClickListener(this::connectWallet)
-        button.text = getString(R.string.connect_wallet)
+        this.runOnUiThread {
+            val button = findViewById<Button>(R.id.walletConnectButton)
+            button.setOnClickListener(this::connectWallet)
+            button.text = getString(R.string.connect_wallet)
+        }
     }
 
     override fun onAccountChanged(account: String?) {
-        if (account == null) {
-            findViewById<TextView>(R.id.walletAddress).text = getString(R.string.wallet_not_connected)
-        } else {
-            findViewById<TextView>(R.id.walletAddress).text = account
+        this.runOnUiThread {
+            if (account == null) {
+                findViewById<TextView>(R.id.walletAddress).text = getString(R.string.wallet_not_connected)
+            } else {
+                findViewById<TextView>(R.id.walletAddress).text = account
+            }
         }
     }
 }
diff --git a/app/src/main/java/im/status/keycard/connect/ui/NoNFCActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/NoNFCActivity.kt
new file mode 100644
index 0000000..10d454f
--- /dev/null
+++ b/app/src/main/java/im/status/keycard/connect/ui/NoNFCActivity.kt
@@ -0,0 +1,22 @@
+package im.status.keycard.connect.ui
+
+import android.nfc.NfcAdapter
+import android.nfc.NfcAdapter.ReaderCallback
+import android.nfc.Tag
+import androidx.appcompat.app.AppCompatActivity
+import im.status.keycard.connect.Registry
+
+
+open class NoNFCActivity : AppCompatActivity(), ReaderCallback {
+    override fun onResume() {
+        super.onResume()
+        Registry.nfcAdapter.enableReaderMode(this, this, NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Registry.nfcAdapter.disableReaderMode(this)
+    }
+
+    override fun onTagDiscovered(tag: Tag?) {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/status/keycard/connect/ui/PINActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/PINActivity.kt
index b872879..628f54a 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/PINActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/PINActivity.kt
@@ -14,7 +14,7 @@ import im.status.keycard.connect.data.PIN_ACTIVITY_ATTEMPTS
 import im.status.keycard.connect.data.PIN_ACTIVITY_CARD_UID
 import im.status.keycard.connect.data.isValidPIN
 
-class PINActivity : AppCompatActivity() {
+class PINActivity : NoNFCActivity() {
     private lateinit var cardUID: ByteArray
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/im/status/keycard/connect/ui/PUKActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/PUKActivity.kt
index 8c799eb..e6e099c 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/PUKActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/PUKActivity.kt
@@ -14,7 +14,7 @@ import im.status.keycard.connect.data.PUK_ACTIVITY_ATTEMPTS
 import im.status.keycard.connect.data.isValidPIN
 import im.status.keycard.connect.data.isValidPUK
 
-class PUKActivity : AppCompatActivity() {
+class PUKActivity : NoNFCActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/PairingActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/PairingActivity.kt
index 858673e..55fdde1 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/PairingActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/PairingActivity.kt
@@ -11,7 +11,7 @@ import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.PAIRING_ACTIVITY_PASSWORD
 
-class PairingActivity : AppCompatActivity() {
+class PairingActivity : NoNFCActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/QRCodeActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/QRCodeActivity.kt
new file mode 100644
index 0000000..b6955a9
--- /dev/null
+++ b/app/src/main/java/im/status/keycard/connect/ui/QRCodeActivity.kt
@@ -0,0 +1,20 @@
+package im.status.keycard.connect.ui
+
+import android.nfc.NfcAdapter
+import android.nfc.Tag
+import com.journeyapps.barcodescanner.CaptureActivity
+import im.status.keycard.connect.Registry
+
+class QRCodeActivity : CaptureActivity(), NfcAdapter.ReaderCallback {
+    override fun onResume() {
+        super.onResume()
+        Registry.nfcAdapter.enableReaderMode(this, this, NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Registry.nfcAdapter.disableReaderMode(this)
+    }
+
+    override fun onTagDiscovered(tag: Tag?) {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ReinstallActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ReinstallActivity.kt
index f11576b..26e40d9 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ReinstallActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ReinstallActivity.kt
@@ -10,7 +10,7 @@ import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ReinstallCommand
 import im.status.keycard.connect.data.REQ_APPLET_FILE
 
-class ReinstallActivity : AppCompatActivity() {
+class ReinstallActivity : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reinstall)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ShowMnemonicActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ShowMnemonicActivity.kt
index 720b015..f86460d 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ShowMnemonicActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ShowMnemonicActivity.kt
@@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.MNEMONIC_PHRASE
 
-class ShowMnemonicActivity : AppCompatActivity() {
+class ShowMnemonicActivity : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_show_mnemonic)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/SignMessageActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/SignMessageActivity.kt
index 3823ad5..48d729c 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/SignMessageActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/SignMessageActivity.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.SIGN_TEXT_MESSAGE
 
-class SignMessageActivity : AppCompatActivity() {
+class SignMessageActivity : NoNFCActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/im/status/keycard/connect/ui/SignTransactionActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/SignTransactionActivity.kt
index da15a11..940a958 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/SignTransactionActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/SignTransactionActivity.kt
@@ -11,7 +11,7 @@ import im.status.keycard.connect.data.SIGN_TX_CURRENCY
 import im.status.keycard.connect.data.SIGN_TX_DATA
 import im.status.keycard.connect.data.SIGN_TX_TO
 
-class SignTransactionActivity : AppCompatActivity() {
+class SignTransactionActivity : NoNFCActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)