From 4d911a976c8a9c07d3614dd14be89421eea33433 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Mon, 12 Oct 2020 13:18:03 +0200
Subject: [PATCH 01/13] remove calls to deprecated methods, optimize imports

---
 .../main/java/im/status/keycard/connect/Registry.kt   |  7 +++++--
 .../im/status/keycard/connect/card/InitCommand.kt     |  5 ++++-
 .../keycard/connect/card/OpenSecureChannelCommand.kt  |  2 --
 .../java/im/status/keycard/connect/card/Script.kt     |  1 -
 .../status/keycard/connect/card/VerifyPINCommand.kt   |  5 ++++-
 .../java/im/status/keycard/connect/data/PINCache.kt   |  1 -
 .../im/status/keycard/connect/data/PairingManager.kt  |  8 ++++----
 .../java/im/status/keycard/connect/net/EthereumRPC.kt |  1 -
 .../im/status/keycard/connect/net/WalletConnect.kt    | 11 ++++++++---
 .../im/status/keycard/connect/ui/ChangePINActivity.kt |  2 +-
 .../im/status/keycard/connect/ui/ChangePUKActivity.kt |  2 +-
 .../connect/ui/ChangePairingPasswordActivity.kt       |  2 +-
 .../java/im/status/keycard/connect/ui/InitActivity.kt |  6 +++---
 .../im/status/keycard/connect/ui/LoadKeyActivity.kt   |  2 +-
 .../java/im/status/keycard/connect/ui/MainActivity.kt |  8 ++++----
 .../java/im/status/keycard/connect/ui/PINActivity.kt  |  2 +-
 .../java/im/status/keycard/connect/ui/PUKActivity.kt  |  2 +-
 .../im/status/keycard/connect/ui/PairingActivity.kt   |  4 ++--
 .../im/status/keycard/connect/ui/ReinstallActivity.kt |  2 +-
 .../im/status/keycard/connect/ui/SettingsActivity.kt  |  2 +-
 .../status/keycard/connect/ui/ShowMnemonicActivity.kt |  2 +-
 .../status/keycard/connect/ui/SignMessageActivity.kt  |  2 +-
 .../keycard/connect/ui/SignTransactionActivity.kt     |  2 +-
 23 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/im/status/keycard/connect/Registry.kt b/app/src/main/java/im/status/keycard/connect/Registry.kt
index a5dd03c..5d60261 100644
--- a/app/src/main/java/im/status/keycard/connect/Registry.kt
+++ b/app/src/main/java/im/status/keycard/connect/Registry.kt
@@ -6,8 +6,11 @@ import android.nfc.NfcAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import im.status.keycard.android.NFCCardManager
-import im.status.keycard.connect.card.*
-import im.status.keycard.connect.data.*
+import im.status.keycard.connect.card.CardScriptExecutor
+import im.status.keycard.connect.card.ScriptListener
+import im.status.keycard.connect.data.PINCache
+import im.status.keycard.connect.data.PairingManager
+import im.status.keycard.connect.data.SettingsManager
 import im.status.keycard.connect.net.EthereumRPC
 import im.status.keycard.connect.net.WalletConnect
 
diff --git a/app/src/main/java/im/status/keycard/connect/card/InitCommand.kt b/app/src/main/java/im/status/keycard/connect/card/InitCommand.kt
index 6949f5e..87c44e9 100644
--- a/app/src/main/java/im/status/keycard/connect/card/InitCommand.kt
+++ b/app/src/main/java/im/status/keycard/connect/card/InitCommand.kt
@@ -3,7 +3,10 @@ package im.status.keycard.connect.card
 import android.app.Activity
 import android.content.Intent
 import im.status.keycard.connect.Registry
-import im.status.keycard.connect.data.*
+import im.status.keycard.connect.data.INIT_ACTIVITY_PAIRING
+import im.status.keycard.connect.data.INIT_ACTIVITY_PIN
+import im.status.keycard.connect.data.INIT_ACTIVITY_PUK
+import im.status.keycard.connect.data.REQ_INTERACTIVE_SCRIPT
 import im.status.keycard.connect.ui.InitActivity
 import im.status.keycard.io.APDUException
 import java.io.IOException
diff --git a/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt b/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt
index 74c9421..39cdfcd 100644
--- a/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt
+++ b/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt
@@ -7,8 +7,6 @@ import im.status.keycard.connect.Registry
 import im.status.keycard.connect.data.PAIRING_ACTIVITY_PASSWORD
 import im.status.keycard.connect.data.REQ_INTERACTIVE_SCRIPT
 import im.status.keycard.connect.ui.PairingActivity
-import im.status.keycard.io.APDUException
-import java.io.IOException
 
 class OpenSecureChannelCommand : CardCommand {
     private var pairingPassword: String? = null
diff --git a/app/src/main/java/im/status/keycard/connect/card/Script.kt b/app/src/main/java/im/status/keycard/connect/card/Script.kt
index 4c7b3b3..3bb3608 100644
--- a/app/src/main/java/im/status/keycard/connect/card/Script.kt
+++ b/app/src/main/java/im/status/keycard/connect/card/Script.kt
@@ -1,7 +1,6 @@
 package im.status.keycard.connect.card
 
 import java.io.IOException
-import java.lang.Exception
 
 fun scriptWithSecureChannel(): List<CardCommand> = listOf(SelectCommand(), InitCommand(), OpenSecureChannelCommand())
 fun scriptWithAuthentication(): List<CardCommand> = scriptWithSecureChannel().plus(VerifyPINCommand())
diff --git a/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt b/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt
index 43f9668..46b705f 100644
--- a/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt
+++ b/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt
@@ -3,7 +3,10 @@ package im.status.keycard.connect.card
 import android.app.Activity
 import android.content.Intent
 import im.status.keycard.connect.Registry
-import im.status.keycard.connect.data.*
+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.PUK_ACTIVITY_ATTEMPTS
+import im.status.keycard.connect.data.REQ_INTERACTIVE_SCRIPT
 import im.status.keycard.connect.ui.PINActivity
 import im.status.keycard.connect.ui.PUKActivity
 import im.status.keycard.io.APDUException
diff --git a/app/src/main/java/im/status/keycard/connect/data/PINCache.kt b/app/src/main/java/im/status/keycard/connect/data/PINCache.kt
index 1fa253a..99c98cc 100644
--- a/app/src/main/java/im/status/keycard/connect/data/PINCache.kt
+++ b/app/src/main/java/im/status/keycard/connect/data/PINCache.kt
@@ -3,7 +3,6 @@ package im.status.keycard.connect.data
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
-import kotlin.collections.HashMap
 
 class PINCache {
     //TODO: don't use Strings, the memory should be cleared before release. For this the entire
diff --git a/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt b/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt
index 41d49e3..07f5a26 100644
--- a/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt
+++ b/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt
@@ -5,9 +5,9 @@ import android.content.SharedPreferences
 import android.util.Base64
 import android.util.Base64.NO_PADDING
 import android.util.Base64.NO_WRAP
-import im.status.keycard.applet.Pairing
 import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKeys
+import androidx.security.crypto.MasterKey
+import im.status.keycard.applet.Pairing
 
 class PairingManager(context: Context) {
     private val sharedPreferences: SharedPreferences
@@ -17,8 +17,8 @@ class PairingManager(context: Context) {
     }
 
     init {
-        val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
-        sharedPreferences = EncryptedSharedPreferences.create("pairings", masterKeyAlias, context, EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM)
+        val masterKey = MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build()
+        sharedPreferences = EncryptedSharedPreferences.create(context,"pairings", masterKey, EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM)
     }
 
     fun getPairing(instanceUID: ByteArray): Pairing? {
diff --git a/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt b/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
index 67cd2a8..0a52027 100644
--- a/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
@@ -6,7 +6,6 @@ import com.squareup.moshi.Types
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.kethereum.rpc.HttpEthereumRPC
-import java.lang.Exception
 import java.lang.reflect.Type
 import java.math.BigInteger
 
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index f17120e..47b2ce9 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -24,7 +24,10 @@ import org.kethereum.extensions.transactions.getTokenTransferTo
 import org.kethereum.extensions.transactions.getTokenTransferValue
 import org.kethereum.extensions.transactions.isTokenTransfer
 import org.kethereum.keccakshortcut.keccak
-import org.kethereum.model.*
+import org.kethereum.model.Address
+import org.kethereum.model.SignatureData
+import org.kethereum.model.SignedTransaction
+import org.kethereum.model.Transaction
 import org.komputing.khex.encode
 import org.komputing.khex.extensions.hexToByteArray
 import org.komputing.khex.extensions.toHexString
@@ -32,9 +35,11 @@ import org.komputing.khex.extensions.toNoPrefixHexString
 import org.komputing.khex.model.HexString
 import org.walletconnect.Session
 import org.walletconnect.Session.Config.Companion.fromWCUri
-import org.walletconnect.impls.*
+import org.walletconnect.impls.FileWCSessionStore
+import org.walletconnect.impls.MoshiPayloadAdapter
+import org.walletconnect.impls.OkHttpTransport
+import org.walletconnect.impls.WCSession
 import java.io.File
-import java.lang.Exception
 
 class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
 
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 cc844f1..c2f458c 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
@@ -1,9 +1,9 @@
 package im.status.keycard.connect.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePINCommand
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 95e9ccf..fe78b2c 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
@@ -1,9 +1,9 @@
 package im.status.keycard.connect.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePUKCommand
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 24c69df..6907f23 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
@@ -1,9 +1,9 @@
 package im.status.keycard.connect.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePairingPasswordCommand
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 c9185fc..aec81d7 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
@@ -2,18 +2,18 @@ package im.status.keycard.connect.ui
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Base64
-import android.view.View
-import im.status.keycard.globalplatform.Crypto
 import android.util.Base64.NO_PADDING
 import android.util.Base64.NO_WRAP
+import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.INIT_ACTIVITY_PAIRING
 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() {
     private lateinit var pin: 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 27b3703..0c0dd61 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
@@ -2,10 +2,10 @@ package im.status.keycard.connect.ui
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.*
 import java.util.*
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 9b7a932..91497f3 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
@@ -1,20 +1,20 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
+import android.content.Intent
 import android.nfc.NfcAdapter
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.ViewSwitcher
+import androidx.appcompat.app.AppCompatActivity
+import com.google.zxing.client.android.Intents
 import com.google.zxing.integration.android.IntentIntegrator
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
-import kotlin.reflect.KClass
-import com.google.zxing.client.android.Intents
 import im.status.keycard.connect.data.*
+import kotlin.reflect.KClass
 
 class MainActivity : AppCompatActivity(), ScriptListener {
     private lateinit var viewSwitcher: ViewSwitcher
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 5f0b5b2..08ed061 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
@@ -1,11 +1,11 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.data.PIN_ACTIVITY_ATTEMPTS
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 bc06825..3f63cb5 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
@@ -1,11 +1,11 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.data.PUK_ACTIVITY_ATTEMPTS
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 4039ecc..c036be8 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
@@ -1,11 +1,11 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
-import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.PAIRING_ACTIVITY_PASSWORD
 
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 df2f38e..f11576b 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
@@ -1,10 +1,10 @@
 package im.status.keycard.connect.ui
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.CheckBox
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ReinstallCommand
diff --git a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
index 872ef5c..5bd2c15 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
@@ -1,11 +1,11 @@
 package im.status.keycard.connect.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.Spinner
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.data.CHAIN_IDS
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 d22b8e4..720b015 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
@@ -1,9 +1,9 @@
 package im.status.keycard.connect.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.MNEMONIC_PHRASE
 
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 2ddf8c3..e23f158 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
@@ -1,10 +1,10 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.SIGN_TEXT_MESSAGE
 
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 20cf4b6..8efbbb6 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
@@ -1,10 +1,10 @@
 package im.status.keycard.connect.ui
 
 import android.app.Activity
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.SIGN_TX_AMOUNT
 import im.status.keycard.connect.data.SIGN_TX_CURRENCY

From 85fdae61542420f083397f429578e4f824e59d52 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Mon, 12 Oct 2020 14:45:41 +0200
Subject: [PATCH 02/13] support EIP-712 tx

---
 README.md                                     |  2 +-
 app/build.gradle                              |  2 ++
 .../keycard/connect/net/WalletConnect.kt      | 22 ++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1ff0885..e21682b 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ At the moment all dApps tested worked fine. The implemented functions are:
 * eth_sendRawTransaction
 * eth_signTransaction
 * eth_sign
+* eth_signTypedData
 * personal_sign
 
 ### Seed management
@@ -36,7 +37,6 @@ At the moment all dApps tested worked fine. The implemented functions are:
 * allow switching account (BIP32 path) on card and used network (for WalletConnect)
 
 ## What needs to be done for 1.0
-* implement signedTypedData (WalletConnect integration)
 * design and implement a user-friendly UI
 
 ## Future plans (after 1.0)
diff --git a/app/build.gradle b/app/build.gradle
index a63f48e..109ce9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,6 +68,8 @@ dependencies {
     implementation "com.github.komputing.kethereum:extensions_kotlin:$kethereum_version"
     implementation "com.github.komputing.kethereum:keccak_shortcut:$kethereum_version"
     implementation 'com.github.komputing:khex:1.0.0'
+    implementation 'com.github.gnosis.svalinn-kotlin:eip712-adapter-moshi:v0.13.0'
+    implementation 'com.github.gnosis.svalinn-kotlin:eip712:v0.13.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index 47b2ce9..003e596 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -39,7 +39,11 @@ import org.walletconnect.impls.FileWCSessionStore
 import org.walletconnect.impls.MoshiPayloadAdapter
 import org.walletconnect.impls.OkHttpTransport
 import org.walletconnect.impls.WCSession
+import pm.gnosis.eip712.EIP712JsonParser
+import pm.gnosis.eip712.adapters.moshi.MoshiAdapter
+import pm.gnosis.eip712.typedDataHash
 import java.io.File
+import kotlin.reflect.typeOf
 
 class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
 
@@ -91,7 +95,7 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
     private fun onCustomCall(call: Session.MethodCall.Custom) {
         when(call.method) {
             "personal_sign" -> runOnValidParam<String>(call, 0) { signText(call.id, it) }
-            "eth_signTypedData" -> { runOnValidParam<Map<*, *>>(call, 1) { @Suppress("UNCHECKED_CAST") signTypedData(call.id, it as Map<String, String>) } }
+            "eth_signTypedData" -> { runOnValidParam<String>(call, 1) { @Suppress("UNCHECKED_CAST") signTypedData(call.id, it) } }
             "eth_signTransaction" -> { runOnValidParam<Map<*, *>>(call, 0) { signTransaction(call.id, toTransaction(toSendTransaction(call.id, it)), false)} }
             "eth_sendRawTransaction" -> { runOnValidParam<String>(call, 0) { relayTX(call.id, it) } }
             else -> session?.rejectRequest(call.id, 1L, "Not implemented")
@@ -140,9 +144,21 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
         Registry.mainActivity.startActivityForResult(intent, REQ_WALLETCONNECT)
     }
 
-    private fun signTypedData(id: Long, message: Map<String, String>) {
+    private fun signTypedData(id: Long, message: String) {
         requestId = id
-        session?.rejectRequest(id, 1L, "Not implemented yet")
+        uiAction = {
+            val domainWithMessage = EIP712JsonParser(MoshiAdapter()).parseMessage(message)
+            val hash = typedDataHash(domainWithMessage.message, domainWithMessage.domain)
+            Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(SignCommand(Registry.walletConnect, hash)))
+        }
+
+        signAction = { session?.approveRequest(requestId, "0x${it.r.toNoPrefixHexString()}${it.s.toNoPrefixHexString()}${encode((it.recId + 27).toByte())}") }
+
+        val intent = Intent(Registry.mainActivity, SignMessageActivity::class.java).apply {
+            putExtra(SIGN_TEXT_MESSAGE, message)
+        }
+
+        Registry.mainActivity.startActivityForResult(intent, REQ_WALLETCONNECT)
     }
 
     private fun signTransaction(id: Long, tx: Transaction, send: Boolean) {

From 916f6940c5bd5d413b42d89dcd3ebac7e8c04295 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Mon, 12 Oct 2020 14:50:24 +0200
Subject: [PATCH 03/13] remove unused import

---
 app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index 003e596..e4f5062 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -43,7 +43,6 @@ import pm.gnosis.eip712.EIP712JsonParser
 import pm.gnosis.eip712.adapters.moshi.MoshiAdapter
 import pm.gnosis.eip712.typedDataHash
 import java.io.File
-import kotlin.reflect.typeOf
 
 class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
 

From 5f658eb049b3764cd08eed80dfe83879f713572a Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 10:17:09 +0200
Subject: [PATCH 04/13] add PIN/PUK/pairing validation/confirmation

---
 README.md                                     |  2 +-
 .../status/keycard/connect/data/PINUtils.kt   |  4 ++++
 .../status/keycard/connect/net/EthereumRPC.kt |  2 +-
 .../keycard/connect/ui/ChangePINActivity.kt   | 16 ++++++++++++-
 .../keycard/connect/ui/ChangePUKActivity.kt   | 16 ++++++++++++-
 .../ui/ChangePairingPasswordActivity.kt       | 16 ++++++++++++-
 .../activity_change_pairing_password.xml      | 20 +++++++++++++---
 .../main/res/layout/activity_change_pin.xml   | 19 ++++++++++++---
 .../main/res/layout/activity_change_puk.xml   | 23 +++++++++++++++----
 build.gradle                                  |  2 +-
 10 files changed, 104 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/im/status/keycard/connect/data/PINUtils.kt

diff --git a/README.md b/README.md
index e21682b..714807e 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 **NOTE**: _This app is a prototype. While it seems to work reasonably well and stable, the UI has not received any thought yet. 
 It is fine to use but keep in mind that there isn't much error reporting, no progress indicators and some screens are crammed with info_
 
-Keycard Connect's main function is to enable using the Keycard with dApps outside of a web3 browser using WalletConnect. The dApp must of course support WalletConnect for this to work. Additionally, this app is a little toolbox for Keycardm allowing things like changing PIN, initializing cards, changing seed etc.
+Keycard Connect's main function is to enable using the Keycard with dApps outside of a web3 browser using WalletConnect. The dApp must of course support WalletConnect for this to work. Additionally, this app is a little toolbox for Keycard, allowing things like changing PIN, initializing cards, changing seed etc.
 
 ## What works
 
diff --git a/app/src/main/java/im/status/keycard/connect/data/PINUtils.kt b/app/src/main/java/im/status/keycard/connect/data/PINUtils.kt
new file mode 100644
index 0000000..b11c7e1
--- /dev/null
+++ b/app/src/main/java/im/status/keycard/connect/data/PINUtils.kt
@@ -0,0 +1,4 @@
+package im.status.keycard.connect.data
+
+fun isValidPIN(pin: String) : Boolean = pin.length == 6 && pin.all { it.isDigit() }
+fun isValidPUK(puk: String) : Boolean = puk.length == 12 && puk.all { it.isDigit() }
diff --git a/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt b/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
index 0a52027..a9db78d 100644
--- a/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/EthereumRPC.kt
@@ -18,7 +18,7 @@ class EthereumRPC(endpointURL: String) {
     init {
         val moshi = Moshi.Builder().build()
         val type: Type = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
-        ethplorerJSONAdapter = moshi.adapter<Map<String, Any>>(type)
+        ethplorerJSONAdapter = moshi.adapter(type)
     }
 
     fun changeEndpoint(endpointURL: String) {
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 c2f458c..c056ca3 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
@@ -2,18 +2,25 @@ package im.status.keycard.connect.ui
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePINCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
+import im.status.keycard.connect.data.isValidPIN
 
 class ChangePINActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        //TODO: pin validation and confirmation
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_pin)
+
+        val pinText = findViewById<EditText>(R.id.newPINText)
+        val pinConfirmation = findViewById<EditText>(R.id.pinConfirmation)
+        pinText.doAfterTextChanged { validatePIN() }
+        pinConfirmation.doAfterTextChanged { validatePIN() }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
@@ -26,4 +33,11 @@ class ChangePINActivity : AppCompatActivity() {
     fun cancel(@Suppress("UNUSED_PARAMETER") view: View) {
         finish()
     }
+
+    private fun validatePIN() {
+        val pinText = findViewById<EditText>(R.id.newPINText).text.toString()
+        val pinConfirmation = findViewById<EditText>(R.id.pinConfirmation).text.toString()
+        val button = findViewById<Button>(R.id.okButton)
+        button.isEnabled = (pinText == pinConfirmation) && isValidPIN(pinText)
+    }
 }
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 fe78b2c..fe0983d 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
@@ -2,18 +2,25 @@ package im.status.keycard.connect.ui
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePUKCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
+import im.status.keycard.connect.data.isValidPUK
 
 class ChangePUKActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        //TODO: puk validation and confirmation
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_puk)
+
+        val pukText = findViewById<EditText>(R.id.newPUKText)
+        val pukConfirmation = findViewById<EditText>(R.id.pukConfirmation)
+        pukText.doAfterTextChanged { validatePUK() }
+        pukConfirmation.doAfterTextChanged { validatePUK() }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
@@ -26,4 +33,11 @@ class ChangePUKActivity : AppCompatActivity() {
     fun cancel(@Suppress("UNUSED_PARAMETER") view: View) {
         finish()
     }
+
+    private fun validatePUK() {
+        val pukText = findViewById<EditText>(R.id.newPUKText).text.toString()
+        val pukConfirmation = findViewById<EditText>(R.id.pukConfirmation).text.toString()
+        val button = findViewById<Button>(R.id.okButton)
+        button.isEnabled = (pukText == pukConfirmation) && isValidPUK(pukText)
+    }
 }
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 6907f23..3213b91 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
@@ -2,18 +2,25 @@ package im.status.keycard.connect.ui
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.ChangePairingPasswordCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
+import im.status.keycard.connect.data.isValidPUK
 
 class ChangePairingPasswordActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        //TODO: pairing password confirmation
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_change_pairing_password)
+
+        val pairingPasswordText = findViewById<EditText>(R.id.newPairingPasswordText)
+        val pairingPasswordConfirmation = findViewById<EditText>(R.id.pairingPasswordConfirmation)
+        pairingPasswordText.doAfterTextChanged { validatePairingPassword() }
+        pairingPasswordConfirmation.doAfterTextChanged { validatePairingPassword() }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
@@ -26,4 +33,11 @@ class ChangePairingPasswordActivity : AppCompatActivity() {
     fun cancel(@Suppress("UNUSED_PARAMETER") view: View) {
         finish()
     }
+
+    private fun validatePairingPassword() {
+        val pairingPasswordText = findViewById<EditText>(R.id.newPairingPasswordText).text.toString()
+        val pairingPasswordConfirmation = findViewById<EditText>(R.id.pairingPasswordConfirmation).text.toString()
+        val button = findViewById<Button>(R.id.okButton)
+        button.isEnabled = (pairingPasswordText == pairingPasswordConfirmation) && pairingPasswordText.isNotEmpty()
+    }
 }
diff --git a/app/src/main/res/layout/activity_change_pairing_password.xml b/app/src/main/res/layout/activity_change_pairing_password.xml
index 2306f6b..8ea5672 100644
--- a/app/src/main/res/layout/activity_change_pairing_password.xml
+++ b/app/src/main/res/layout/activity_change_pairing_password.xml
@@ -23,6 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="88dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
@@ -32,12 +33,12 @@
         android:id="@+id/cancelButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="68dp"
-        android:layout_marginTop="76dp"
+        android:layout_marginStart="64dp"
+        android:layout_marginTop="88dp"
         android:onClick="cancel"
         android:text="@android:string/cancel"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newPairingPasswordText" />
+        app:layout_constraintTop_toBottomOf="@+id/pairingPasswordConfirmation" />
 
     <EditText
         android:id="@+id/newPairingPasswordText"
@@ -50,4 +51,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/newPairingPasswordPrompt"
         tools:text="password" />
+
+    <EditText
+        android:id="@+id/pairingPasswordConfirmation"
+        android:layout_width="328dp"
+        android:layout_height="46dp"
+        android:layout_marginTop="68dp"
+        android:ems="10"
+        android:inputType="textPassword"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.493"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newPairingPasswordText"
+        tools:text="password" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_change_pin.xml b/app/src/main/res/layout/activity_change_pin.xml
index fb88c81..6650f03 100644
--- a/app/src/main/res/layout/activity_change_pin.xml
+++ b/app/src/main/res/layout/activity_change_pin.xml
@@ -22,6 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="88dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
@@ -31,12 +32,12 @@
         android:id="@+id/cancelButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="68dp"
-        android:layout_marginTop="76dp"
+        android:layout_marginTop="68dp"
         android:onClick="cancel"
         android:text="@android:string/cancel"
+        app:layout_constraintEnd_toStartOf="@+id/okButton"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newPINText" />
+        app:layout_constraintTop_toBottomOf="@+id/pinConfirmation" />
 
     <EditText
         android:id="@+id/newPINText"
@@ -49,4 +50,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/newPinPrompt"
         tools:text="123456" />
+
+    <EditText
+        android:id="@+id/pinConfirmation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="64dp"
+        android:ems="10"
+        android:inputType="numberPassword"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newPINText"
+        tools:text="123456" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_change_puk.xml b/app/src/main/res/layout/activity_change_puk.xml
index 7d73f81..269d0b0 100644
--- a/app/src/main/res/layout/activity_change_puk.xml
+++ b/app/src/main/res/layout/activity_change_puk.xml
@@ -22,6 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="88dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
@@ -31,12 +32,13 @@
         android:id="@+id/cancelButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="68dp"
-        android:layout_marginTop="76dp"
+        android:layout_marginTop="84dp"
         android:onClick="cancel"
         android:text="@android:string/cancel"
+        app:layout_constraintEnd_toStartOf="@+id/okButton"
+        app:layout_constraintHorizontal_bias="0.557"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newPUKText" />
+        app:layout_constraintTop_toBottomOf="@+id/pukConfirmation" />
 
     <EditText
         android:id="@+id/newPUKText"
@@ -48,5 +50,18 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/newPukPrompt"
-        tools:text="123456" />
+        tools:text="123456123456" />
+
+    <EditText
+        android:id="@+id/pukConfirmation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:ems="10"
+        android:inputType="numberPassword"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newPUKText"
+        tools:text="123456123456" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2088f28..ad064d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 46b8387b14ad2ea9685aa8697d1fc2372fa8d187 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 10:36:49 +0200
Subject: [PATCH 05/13] add PIN/PUK/pairing validation/confirmation

---
 .../status/keycard/connect/ui/PINActivity.kt  |  8 ++++++--
 .../status/keycard/connect/ui/PUKActivity.kt  | 20 ++++++++++++++++---
 .../keycard/connect/ui/PairingActivity.kt     |  4 ++++
 app/src/main/res/layout/activity_pairing.xml  |  1 +
 app/src/main/res/layout/activity_pin.xml      |  1 +
 app/src/main/res/layout/activity_puk.xml      | 18 +++++++++++++++--
 6 files changed, 45 insertions(+), 7 deletions(-)

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 08ed061..b700204 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
@@ -3,20 +3,21 @@ package im.status.keycard.connect.ui
 import android.app.Activity
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 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() {
     private lateinit var cardUID: ByteArray
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        //TODO: validate PIN length == 6
-
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_pin)
         val attempts = intent.getIntExtra(PIN_ACTIVITY_ATTEMPTS, -1)
@@ -29,6 +30,9 @@ class PINActivity : AppCompatActivity() {
         } else {
             attemptLabel.text = getString(R.string.pin_attempts, attempts)
         }
+
+        val pinText = findViewById<EditText>(R.id.pinText)
+        pinText.doAfterTextChanged { findViewById<Button>(R.id.okButton).isEnabled = isValidPIN(pinText.text.toString()) }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
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 3f63cb5..f6f1361 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
@@ -3,19 +3,20 @@ package im.status.keycard.connect.ui
 import android.app.Activity
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 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() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        //TODO: validate PUK length == 12
-        //TODO: validate PIN length == 6
-
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_puk)
         val attempts = intent.getIntExtra(PUK_ACTIVITY_ATTEMPTS, -1)
@@ -27,6 +28,10 @@ class PUKActivity : AppCompatActivity() {
         } else {
             attemptLabel.text = getString(R.string.pin_attempts, attempts)
         }
+
+        findViewById<EditText>(R.id.pukText).doAfterTextChanged { validateFields() }
+        findViewById<EditText>(R.id.newPINText).doAfterTextChanged { validateFields() }
+        findViewById<EditText>(R.id.pinConfirmation).doAfterTextChanged { validateFields() }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
@@ -42,4 +47,13 @@ class PUKActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    private fun validateFields() {
+        val pukText = findViewById<EditText>(R.id.pukText).text.toString()
+        val pinText = findViewById<EditText>(R.id.newPINText).text.toString()
+        val pinConfirmationText = findViewById<EditText>(R.id.pinConfirmation).text.toString()
+        val button = findViewById<Button>(R.id.okButton)
+        button.isEnabled = (pinText == pinConfirmationText) && isValidPIN(pinText) && isValidPUK(pukText)
+    }
+
 }
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 c036be8..cf4f16a 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
@@ -4,8 +4,10 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.doAfterTextChanged
 import im.status.keycard.connect.R
 import im.status.keycard.connect.data.PAIRING_ACTIVITY_PASSWORD
 
@@ -14,6 +16,8 @@ class PairingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_pairing)
+        val passText = findViewById<EditText>(R.id.passwordText)
+        passText.doAfterTextChanged { findViewById<Button>(R.id.okButton).isEnabled = passText.text.toString().isNotEmpty() }
     }
 
     fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
diff --git a/app/src/main/res/layout/activity_pairing.xml b/app/src/main/res/layout/activity_pairing.xml
index 488b4c9..0130024 100644
--- a/app/src/main/res/layout/activity_pairing.xml
+++ b/app/src/main/res/layout/activity_pairing.xml
@@ -34,6 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="44dp"
         android:layout_marginEnd="99dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_pin.xml b/app/src/main/res/layout/activity_pin.xml
index e7e6352..6160393 100644
--- a/app/src/main/res/layout/activity_pin.xml
+++ b/app/src/main/res/layout/activity_pin.xml
@@ -34,6 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="81dp"
         android:layout_marginEnd="57dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_puk.xml b/app/src/main/res/layout/activity_puk.xml
index a6a26b2..32bf827 100644
--- a/app/src/main/res/layout/activity_puk.xml
+++ b/app/src/main/res/layout/activity_puk.xml
@@ -50,15 +50,28 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/newPIN" />
 
+    <EditText
+        android:id="@+id/pinConfirmation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:ems="10"
+        android:inputType="numberPassword"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/newPINText" />
+
     <TextView
         android:id="@+id/attemptLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="36dp"
+        android:layout_marginTop="40dp"
         android:text="@string/pin_attempts"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newPINText" />
+        app:layout_constraintTop_toBottomOf="@+id/pinConfirmation" />
 
     <Button
         android:id="@+id/okButton"
@@ -66,6 +79,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="60dp"
         android:layout_marginEnd="68dp"
+        android:enabled="false"
         android:onClick="ok"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"

From 2f643b53f1a06a19dc1d9c776251eb50a7664966 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 12:01:32 +0200
Subject: [PATCH 06/13] add disconnect function

---
 .../im/status/keycard/connect/Registry.kt     |  5 ++--
 .../keycard/connect/net/WalletConnect.kt      | 24 ++++++++-------
 .../status/keycard/connect/ui/MainActivity.kt | 30 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/im/status/keycard/connect/Registry.kt b/app/src/main/java/im/status/keycard/connect/Registry.kt
index 5d60261..08dfaa3 100644
--- a/app/src/main/java/im/status/keycard/connect/Registry.kt
+++ b/app/src/main/java/im/status/keycard/connect/Registry.kt
@@ -13,6 +13,7 @@ import im.status.keycard.connect.data.PairingManager
 import im.status.keycard.connect.data.SettingsManager
 import im.status.keycard.connect.net.EthereumRPC
 import im.status.keycard.connect.net.WalletConnect
+import org.walletconnect.Session
 
 @SuppressLint("StaticFieldLeak")
 object Registry {
@@ -52,7 +53,7 @@ object Registry {
         value.add(0, KotlinJsonAdapterFactory())
     }
 
-    fun init(activity: Activity, listener: ScriptListener) {
+    fun init(activity: Activity, listener: ScriptListener, sessionListener: Session.Callback) {
         //TODO: remove this hack, it is needed  now because KEthereum does not add the KotlinJsonAdapterFactory
         moshiAddKotlin()
 
@@ -70,6 +71,6 @@ object Registry {
         cardManager.start()
 
         ethereumRPC = EthereumRPC(settingsManager.rpcEndpoint)
-        walletConnect = WalletConnect(settingsManager.bip32Path, settingsManager.chainID)
+        walletConnect = WalletConnect(sessionListener, settingsManager.bip32Path, settingsManager.chainID)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index e4f5062..3072c52 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -44,8 +44,7 @@ import pm.gnosis.eip712.adapters.moshi.MoshiAdapter
 import pm.gnosis.eip712.typedDataHash
 import java.io.File
 
-class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
-
+class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
     private val scope = MainScope()
     private val moshi = Moshi.Builder().build()
     private val okHttpClient = OkHttpClient()
@@ -56,12 +55,8 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
     private var signAction: (RecoverableSignature) -> Unit = this::nop
 
     override fun onStatus(status: Session.Status) {
-        when (status) {
-            is Session.Status.Error -> println("WalletConnect Error")
-            is Session.Status.Approved -> println("WalletConnect Approved")
-            is Session.Status.Connected -> println("WalletConnect Connected")
-            is Session.Status.Disconnected -> println("WalletConnect Disconnected")
-            is Session.Status.Closed -> session = null
+        if (status == Session.Status.Closed) {
+            session = null
         }
     }
 
@@ -94,7 +89,7 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
     private fun onCustomCall(call: Session.MethodCall.Custom) {
         when(call.method) {
             "personal_sign" -> runOnValidParam<String>(call, 0) { signText(call.id, it) }
-            "eth_signTypedData" -> { runOnValidParam<String>(call, 1) { @Suppress("UNCHECKED_CAST") signTypedData(call.id, it) } }
+            "eth_signTypedData" -> { runOnValidParam<String>(call, 1) { signTypedData(call.id, it) } }
             "eth_signTransaction" -> { runOnValidParam<Map<*, *>>(call, 0) { signTransaction(call.id, toTransaction(toSendTransaction(call.id, it)), false)} }
             "eth_sendRawTransaction" -> { runOnValidParam<String>(call, 0) { relayTX(call.id, it) } }
             else -> session?.rejectRequest(call.id, 1L, "Not implemented")
@@ -134,7 +129,7 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
             Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(SignCommand(Registry.walletConnect, hash)))
         }
 
-        signAction = { session?.approveRequest(requestId, "0x${it.r.toNoPrefixHexString()}${it.s.toNoPrefixHexString()}${encode((it.recId + 27).toByte())}") }
+        signAction = { session?.approveRequest(requestId, formatDataSignature(it)) }
 
         val intent = Intent(Registry.mainActivity, SignMessageActivity::class.java).apply {
             putExtra(SIGN_TEXT_MESSAGE, text)
@@ -151,7 +146,7 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
             Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(SignCommand(Registry.walletConnect, hash)))
         }
 
-        signAction = { session?.approveRequest(requestId, "0x${it.r.toNoPrefixHexString()}${it.s.toNoPrefixHexString()}${encode((it.recId + 27).toByte())}") }
+        signAction = { session?.approveRequest(requestId, formatDataSignature(it)) }
 
         val intent = Intent(Registry.mainActivity, SignMessageActivity::class.java).apply {
             putExtra(SIGN_TEXT_MESSAGE, message)
@@ -160,6 +155,8 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
         Registry.mainActivity.startActivityForResult(intent, REQ_WALLETCONNECT)
     }
 
+    private fun formatDataSignature(sig: RecoverableSignature) : String = "0x${sig.r.toNoPrefixHexString()}${sig.s.toNoPrefixHexString()}${encode((sig.recId + 27).toByte())}"
+
     private fun signTransaction(id: Long, tx: Transaction, send: Boolean) {
         requestId = id
 
@@ -227,11 +224,16 @@ class WalletConnect(var bip32Path: String, var chainID: Long) : ExportKeyCommand
                 Session.PeerMeta(name = "Keycard Connect")
             )
 
+            session?.addCallback(Registry.walletConnect.sessionStatusListener)
             session?.addCallback(Registry.walletConnect)
             session?.init()
         }
     }
 
+    fun disconnect() {
+        session?.kill()
+    }
+
     override fun onResponse(keyPair: BIP32KeyPair) {
         scope.launch(Dispatchers.IO) {
             val addr = keyPair.toEthereumAddress().toHexString()
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 91497f3..1e84ecd 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
@@ -6,6 +6,7 @@ import android.nfc.NfcAdapter
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.Button
 import android.widget.ViewSwitcher
 import androidx.appcompat.app.AppCompatActivity
 import com.google.zxing.client.android.Intents
@@ -14,9 +15,10 @@ import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
 import im.status.keycard.connect.data.*
+import org.walletconnect.Session
 import kotlin.reflect.KClass
 
-class MainActivity : AppCompatActivity(), ScriptListener {
+class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
     private lateinit var viewSwitcher: ViewSwitcher
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,7 +30,7 @@ class MainActivity : AppCompatActivity(), ScriptListener {
         inflater.inflate(R.layout.activity_nfc, viewSwitcher)
 
         setContentView(viewSwitcher)
-        Registry.init(this, this)
+        Registry.init(this, this, this)
         Registry.scriptExecutor.defaultScript = cardCheckupScript()
     }
 
@@ -77,6 +79,10 @@ class MainActivity : AppCompatActivity(), ScriptListener {
         integrator.initiateScan()
     }
 
+    fun disconnectWallet(@Suppress("UNUSED_PARAMETER") view: View) {
+        Registry.walletConnect.disconnect()
+    }
+
     fun changePIN(@Suppress("UNUSED_PARAMETER") view: View) {
         startCommand(ChangePINActivity::class)
     }
@@ -137,4 +143,24 @@ class MainActivity : AppCompatActivity(), ScriptListener {
             Registry.walletConnect.connect(uri)
         }
     }
+
+    override fun onMethodCall(call: Session.MethodCall) {}
+    override fun onStatus(status: Session.Status) {
+        when (status) {
+            is Session.Status.Error, Session.Status.Closed, Session.Status.Disconnected -> walletConnectDisconnected()
+            is Session.Status.Connected, Session.Status.Approved -> walletConnectConnected()
+        }
+    }
+
+    private fun walletConnectConnected() {
+        val button = findViewById<Button>(R.id.walletConnectButton)
+        button.setOnClickListener(this::disconnectWallet)
+        button.text = getString(R.string.disconnect_wallet)
+    }
+
+    private fun walletConnectDisconnected() {
+        val button = findViewById<Button>(R.id.walletConnectButton)
+        button.setOnClickListener(this::connectWallet)
+        button.text = getString(R.string.connect_wallet)
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7dde6b..dc36504 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,4 +44,5 @@
     <string name="reinstall_cash_checkbox">Install Cash applet</string>
     <string name="reinstall_ndef_checkbox">Install NDEF applet</string>
     <string name="reinstall_button">Select cap file and install</string>
+    <string name="disconnect_wallet">Disconnect</string>
 </resources>

From a6746bbc2ed5de9634f8f537470f14a916e8a456 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 14:14:09 +0200
Subject: [PATCH 07/13] handle wc links to use with mobile dapps

---
 app/src/main/AndroidManifest.xml              | 11 +++++--
 .../keycard/connect/net/WalletConnect.kt      |  5 ++--
 .../status/keycard/connect/ui/MainActivity.kt | 29 +++++++++++++++++--
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c75396..7f93a22 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,12 +32,19 @@
         <activity android:name=".ui.ReinstallActivity" />
         <activity
             android:name=".ui.MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:alwaysRetainTaskState="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wc" />
+            </intent-filter>
         </activity>
     </application>
 
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index 3072c52..3677f70 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -34,7 +34,6 @@ import org.komputing.khex.extensions.toHexString
 import org.komputing.khex.extensions.toNoPrefixHexString
 import org.komputing.khex.model.HexString
 import org.walletconnect.Session
-import org.walletconnect.Session.Config.Companion.fromWCUri
 import org.walletconnect.impls.FileWCSessionStore
 import org.walletconnect.impls.MoshiPayloadAdapter
 import org.walletconnect.impls.OkHttpTransport
@@ -212,12 +211,12 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
         uiAction = this::nop
     }
 
-    fun connect(uri: String) {
+    fun connect(uri: Session.FullyQualifiedConfig) {
         scope.launch(Dispatchers.IO) {
             session?.kill()
 
             session = WCSession(
-                fromWCUri(uri).toFullyQualifiedConfig(),
+                uri,
                 MoshiPayloadAdapter(moshi),
                 sessionStore,
                 OkHttpTransport.Builder(okHttpClient, moshi),
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 1e84ecd..09d84d5 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
@@ -16,6 +16,7 @@ import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
 import im.status.keycard.connect.data.*
 import org.walletconnect.Session
+import org.walletconnect.Session.Config.Companion.fromWCUri
 import kotlin.reflect.KClass
 
 class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
@@ -32,6 +33,8 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
         setContentView(viewSwitcher)
         Registry.init(this, this, this)
         Registry.scriptExecutor.defaultScript = cardCheckupScript()
+
+        handleIntent(intent)
     }
 
     override fun onResume() {
@@ -44,6 +47,21 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
         Registry.nfcAdapter.disableReaderMode(this)
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        handleIntent(intent)
+    }
+
+    private fun handleIntent(intent: Intent?) {
+        if (intent?.action == Intent.ACTION_VIEW) {
+            handleWCURI(intent.data?.toString())
+        }
+    }
+
+    override fun onBackPressed() {
+        moveTaskToBack(false)
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -137,10 +155,15 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
     private fun qrCodeScanned(resultCode: Int, data: Intent?) {
         if (resultCode != Activity.RESULT_OK || data == null) return
 
-        val uri: String? = data.getStringExtra(Intents.Scan.RESULT)
+        handleWCURI(data.getStringExtra(Intents.Scan.RESULT))
 
-        if (uri != null && uri.startsWith("wc:")) {
-            Registry.walletConnect.connect(uri)
+    }
+
+    private fun handleWCURI(uri: String?) {
+        if (uri != null) {
+            try {
+                Registry.walletConnect.connect(fromWCUri(uri).toFullyQualifiedConfig())
+            } catch (e: Exception) {}
         }
     }
 

From 683f3c8623c23107883b54a47901cc746033f0c8 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 14:48:51 +0200
Subject: [PATCH 08/13] add xDAI

---
 .../main/java/im/status/keycard/connect/data/Constants.kt  | 5 +++--
 .../java/im/status/keycard/connect/data/SettingsManager.kt | 7 +++++--
 .../java/im/status/keycard/connect/net/WalletConnect.kt    | 6 ++++--
 app/src/main/res/values/networks.xml                       | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/im/status/keycard/connect/data/Constants.kt b/app/src/main/java/im/status/keycard/connect/data/Constants.kt
index 5d0afd0..9b12e97 100644
--- a/app/src/main/java/im/status/keycard/connect/data/Constants.kt
+++ b/app/src/main/java/im/status/keycard/connect/data/Constants.kt
@@ -39,15 +39,16 @@ const val SETTINGS_BIP32_PATH = "bip32Path"
 
 const val INFURA_API_KEY = "27efcb33f94e4bd0866d1aadf8e1a12d"
 const val RPC_ENDPOINT_TEMPLATE = "https://%s.infura.io/v3/${INFURA_API_KEY}"
-
+const val XDAI_ENDPOINT = "https://rpc.xdaichain.com"
 const val CHAIN_ID_MAINNET = 1L
 const val CHAIN_ID_ROPSTEN = 3L
 const val CHAIN_ID_RINKEBY = 4L
 const val CHAIN_ID_GOERLI = 5L
 const val CHAIN_ID_KOVAN = 42L
+const val CHAIN_ID_XDAI = 100L
 
 val CHAIN_ID_TO_SHORTNAME = mapOf(CHAIN_ID_MAINNET to "mainnet", CHAIN_ID_ROPSTEN to "ropsten", CHAIN_ID_RINKEBY to "rinkeby", CHAIN_ID_GOERLI to "goerli", CHAIN_ID_KOVAN to "kovan")
-val CHAIN_IDS = listOf(CHAIN_ID_MAINNET, CHAIN_ID_ROPSTEN, CHAIN_ID_RINKEBY, CHAIN_ID_GOERLI, CHAIN_ID_KOVAN)
+val CHAIN_IDS = listOf(CHAIN_ID_MAINNET, CHAIN_ID_XDAI, CHAIN_ID_ROPSTEN, CHAIN_ID_RINKEBY, CHAIN_ID_GOERLI, CHAIN_ID_KOVAN)
 
 const val DEFAULT_CHAIN_ID = CHAIN_ID_MAINNET
 const val DEFAULT_BIP32_PATH = "m/44'/60'/0'/0/0"
\ No newline at end of file
diff --git a/app/src/main/java/im/status/keycard/connect/data/SettingsManager.kt b/app/src/main/java/im/status/keycard/connect/data/SettingsManager.kt
index 7a08ba0..cf2d2d1 100644
--- a/app/src/main/java/im/status/keycard/connect/data/SettingsManager.kt
+++ b/app/src/main/java/im/status/keycard/connect/data/SettingsManager.kt
@@ -14,8 +14,11 @@ class SettingsManager(context: Context) {
         sharedPreferences = EncryptedSharedPreferences.create(context,"settings", masterKey, EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM)
     }
 
-    val rpcEndpoint
-        get() = String.format(RPC_ENDPOINT_TEMPLATE, CHAIN_ID_TO_SHORTNAME.getValue(sharedPreferences.getLong(SETTINGS_CHAIN_ID, DEFAULT_CHAIN_ID)))
+    val rpcEndpoint : String
+        get() {
+            val chainID = sharedPreferences.getLong(SETTINGS_CHAIN_ID, DEFAULT_CHAIN_ID)
+            return if (chainID == CHAIN_ID_XDAI) XDAI_ENDPOINT else String.format(RPC_ENDPOINT_TEMPLATE, CHAIN_ID_TO_SHORTNAME.getValue(chainID))
+        }
 
     var chainID
         get() = sharedPreferences.getLong(SETTINGS_CHAIN_ID, DEFAULT_CHAIN_ID)
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index 3677f70..fd1922d 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -50,12 +50,14 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
     private val sessionStore = FileWCSessionStore(File(Registry.mainActivity.filesDir, "wcSessions.json").apply { createNewFile() }, moshi)
     private var session: WCSession? = null
     private var requestId: Long = 0
+    private var currentAccount: String? = null
     private var uiAction: (Intent?) -> Unit = this::nop
     private var signAction: (RecoverableSignature) -> Unit = this::nop
 
     override fun onStatus(status: Session.Status) {
         if (status == Session.Status.Closed) {
             session = null
+            currentAccount = null
         }
     }
 
@@ -235,8 +237,8 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
 
     override fun onResponse(keyPair: BIP32KeyPair) {
         scope.launch(Dispatchers.IO) {
-            val addr = keyPair.toEthereumAddress().toHexString()
-            session?.approve(listOf(addr), chainID)
+            currentAccount = keyPair.toEthereumAddress().toHexString()
+            session?.approve(listOf(currentAccount!!), chainID)
         }
     }
 
diff --git a/app/src/main/res/values/networks.xml b/app/src/main/res/values/networks.xml
index ed65521..ea7d784 100644
--- a/app/src/main/res/values/networks.xml
+++ b/app/src/main/res/values/networks.xml
@@ -2,6 +2,7 @@
 <resources>
     <string-array name="networks">
         <item>Ethereum Mainnet</item>
+        <item>xDAI Network</item>
         <item>Ropsten PoW Testnet</item>
         <item>Rinkeby PoA Testnet</item>
         <item>Görli PoA Testnet</item>

From a504397fecb7df2af35309e025eb7c0d626628ff Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 16:29:02 +0200
Subject: [PATCH 09/13] handle network/wallet change

---
 .../keycard/connect/net/WalletConnect.kt      |  34 ++++-
 .../status/keycard/connect/ui/InitActivity.kt |   5 +
 .../keycard/connect/ui/LoadKeyActivity.kt     |   5 +
 .../status/keycard/connect/ui/MainActivity.kt |  27 +++-
 .../status/keycard/connect/ui/PINActivity.kt  |   5 +
 .../status/keycard/connect/ui/PUKActivity.kt  |   5 +
 .../keycard/connect/ui/PairingActivity.kt     |   5 +
 .../keycard/connect/ui/SettingsActivity.kt    |   3 +-
 .../keycard/connect/ui/SignMessageActivity.kt |   5 +
 .../connect/ui/SignTransactionActivity.kt     |   5 +
 app/src/main/res/layout/activity_main.xml     | 135 +++++++++++-------
 11 files changed, 171 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index fd1922d..42f7646 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -43,16 +43,17 @@ import pm.gnosis.eip712.adapters.moshi.MoshiAdapter
 import pm.gnosis.eip712.typedDataHash
 import java.io.File
 
-class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path: String, var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
+class WalletConnect(private val sessionStatusListener : Session.Callback, private var bip32Path: String, private var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
     private val scope = MainScope()
     private val moshi = Moshi.Builder().build()
     private val okHttpClient = OkHttpClient()
     private val sessionStore = FileWCSessionStore(File(Registry.mainActivity.filesDir, "wcSessions.json").apply { createNewFile() }, moshi)
     private var session: WCSession? = null
     private var requestId: Long = 0
-    private var currentAccount: String? = null
     private var uiAction: (Intent?) -> Unit = this::nop
     private var signAction: (RecoverableSignature) -> Unit = this::nop
+    var currentAccount: String? = null
+        private set
 
     override fun onStatus(status: Session.Status) {
         if (status == Session.Status.Closed) {
@@ -64,7 +65,7 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
     override fun onMethodCall(call: Session.MethodCall) {
         scope.launch(Dispatchers.IO) {
             when (call) {
-                is Session.MethodCall.SessionRequest -> Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(ExportKeyCommand(Registry.walletConnect, bip32Path)))
+                is Session.MethodCall.SessionRequest -> getAccountKeys()
                 is Session.MethodCall.SignMessage -> signText(call.id, call.message)
                 is Session.MethodCall.SendTransaction -> signTransaction(call.id, toTransaction(call), true)
                 is Session.MethodCall.Custom -> onCustomCall(call)
@@ -73,6 +74,10 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
         }
     }
 
+    private fun getAccountKeys() {
+        Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(ExportKeyCommand(Registry.walletConnect, bip32Path)))
+    }
+
     private inline fun <reified T> runOnValidParam(call: Session.MethodCall.Custom, index: Int, body: (T) -> Unit) {
         val param = call.params?.getOrNull(index)
 
@@ -235,10 +240,31 @@ class WalletConnect(var sessionStatusListener : Session.Callback, var bip32Path:
         session?.kill()
     }
 
+    fun updateChainAndDerivation(newBip32Path: String, newChainID: Long) {
+        if (newBip32Path == bip32Path) {
+            if (newChainID != chainID) {
+                this.chainID = newChainID
+                if (session != null && currentAccount != null) {
+                    session?.update(listOf(currentAccount!!), this.chainID)
+                }
+            }
+        } else {
+            this.bip32Path = newBip32Path
+            this.chainID = newChainID
+            if (session != null && currentAccount != null) {
+                getAccountKeys()
+            }
+        }
+    }
+
     override fun onResponse(keyPair: BIP32KeyPair) {
         scope.launch(Dispatchers.IO) {
             currentAccount = keyPair.toEthereumAddress().toHexString()
-            session?.approve(listOf(currentAccount!!), chainID)
+            if (session?.approvedAccounts() != null) {
+                session?.update(listOf(currentAccount!!), chainID)
+            } else {
+                session?.approve(listOf(currentAccount!!), chainID)
+            }
         }
     }
 
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 aec81d7..88f959f 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
@@ -48,6 +48,11 @@ class InitActivity : AppCompatActivity() {
         finish()
     }
 
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
+
     private fun randomToken(length: Int): String {
         return Base64.encodeToString(Crypto.randomBytes(length), NO_PADDING or NO_WRAP)
     }
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 0c0dd61..40c5c1a 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
@@ -43,4 +43,9 @@ class LoadKeyActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
 }
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 09d84d5..e928eea 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
@@ -6,8 +6,7 @@ import android.nfc.NfcAdapter
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.Button
-import android.widget.ViewSwitcher
+import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import com.google.zxing.client.android.Intents
 import com.google.zxing.integration.android.IntentIntegrator
@@ -34,6 +33,22 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
         Registry.init(this, this, this)
         Registry.scriptExecutor.defaultScript = cardCheckupScript()
 
+        val networkSpinner = findViewById<Spinner>(R.id.networkSpinner)
+        ArrayAdapter.createFromResource(this, R.array.networks, android.R.layout.simple_spinner_item).also {
+            it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+            networkSpinner.adapter = it
+        }
+        networkSpinner.setSelection(CHAIN_IDS.indexOf(Registry.settingsManager.chainID))
+        networkSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener{
+            override fun onNothingSelected(parent: AdapterView<*>?) { }
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                val chainID = CHAIN_IDS[position]
+                Registry.settingsManager.chainID = chainID
+                Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)
+                Registry.walletConnect.updateChainAndDerivation(Registry.settingsManager.bip32Path, chainID)
+            }
+        }
+
         handleIntent(intent)
     }
 
@@ -59,7 +74,11 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
     }
 
     override fun onBackPressed() {
-        moveTaskToBack(false)
+        if (viewSwitcher.displayedChild == 0) {
+            moveTaskToBack(false)
+        } else {
+            Registry.scriptExecutor.cancelScript()
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -179,11 +198,13 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
         val button = findViewById<Button>(R.id.walletConnectButton)
         button.setOnClickListener(this::disconnectWallet)
         button.text = getString(R.string.disconnect_wallet)
+        findViewById<TextView>(R.id.walletAddress).text = Registry.walletConnect.currentAccount
     }
 
     private fun walletConnectDisconnected() {
         val button = findViewById<Button>(R.id.walletConnectButton)
         button.setOnClickListener(this::connectWallet)
         button.text = getString(R.string.connect_wallet)
+        findViewById<TextView>(R.id.walletAddress).text = ""
     }
 }
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 b700204..b872879 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
@@ -47,4 +47,9 @@ class PINActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
 }
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 f6f1361..8c799eb 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
@@ -48,6 +48,11 @@ class PUKActivity : AppCompatActivity() {
         finish()
     }
 
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
+
     private fun validateFields() {
         val pukText = findViewById<EditText>(R.id.pukText).text.toString()
         val pinText = findViewById<EditText>(R.id.newPINText).text.toString()
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 cf4f16a..858673e 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
@@ -31,4 +31,9 @@ class PairingActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
 }
diff --git a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
index 5bd2c15..b339b8f 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
@@ -34,12 +34,11 @@ class SettingsActivity : AppCompatActivity() {
         val chainID = CHAIN_IDS[networkSpinner.selectedItemPosition]
         Registry.settingsManager.chainID = chainID
         Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)
-        Registry.walletConnect.chainID = chainID
 
         val bip32Path = walletPath.text.toString()
         Registry.settingsManager.bip32Path = bip32Path
-        Registry.walletConnect.bip32Path = bip32Path
 
+        Registry.walletConnect.updateChainAndDerivation(bip32Path, chainID)
         finish()
     }
 
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 e23f158..3823ad5 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
@@ -26,4 +26,9 @@ class SignMessageActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
 }
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 8efbbb6..da15a11 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
@@ -32,4 +32,9 @@ class SignTransactionActivity : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED)
         finish()
     }
+
+    override fun onBackPressed() {
+        setResult(Activity.RESULT_CANCELED)
+        finish()
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fd574de..8727c50 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,74 +5,45 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="?attr/actionBarSize"
     tools:context=".ui.MainActivity">
 
-    <Button
-        android:id="@+id/changePINButton"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="changePIN"
-        android:text="@string/change_pin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/walletConnectButton" />
-
     <Button
         android:id="@+id/walletConnectButton"
         android:layout_width="236dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="144dp"
         android:onClick="connectWallet"
         android:text="@string/connect_wallet"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/changePUKButton"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="changePUK"
-        android:text="@string/change_puk"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:id="@+id/changePINButton"
+        android:layout_width="131dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="228dp"
+        android:onClick="changePIN"
+        android:text="@string/change_pin"
+        app:layout_constraintEnd_toStartOf="@+id/changePUKButton"
+        app:layout_constraintHorizontal_bias="0.104"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/changePINButton" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/changePairingPasswordButton"
         android:layout_width="236dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="28dp"
         android:onClick="changePairingPassword"
         android:text="@string/change_pairing_password"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/changePUKButton" />
 
-    <Button
-        android:id="@+id/unpairButton"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="unpair"
-        android:text="@string/unpair"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/changePairingPasswordButton" />
-
-    <Button
-        android:id="@+id/unpairOthers"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="unpairOthers"
-        android:text="@string/unpair_others"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/unpairButton" />
-
     <Button
         android:id="@+id/changeKeyButton"
         android:layout_width="236dp"
@@ -81,20 +52,10 @@
         android:onClick="changeKey"
         android:text="@string/change_key"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/unpairOthers" />
 
-    <Button
-        android:id="@+id/removeKey"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="removeKey"
-        android:text="@string/remove_key"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/changeKeyButton" />
-
     <Button
         android:id="@+id/reinstall"
         android:layout_width="236dp"
@@ -107,6 +68,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/removeKey" />
 
+    <Button
+        android:id="@+id/unpairButton"
+        android:layout_width="138dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="24dp"
+        android:onClick="unpair"
+        android:text="@string/unpair"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.131"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changePairingPasswordButton" />
+
     <Button
         android:id="@+id/settingsButton"
         android:layout_width="236dp"
@@ -115,6 +88,60 @@
         android:onClick="settings"
         android:text="@string/settings"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/reinstall" />
+
+    <Button
+        android:id="@+id/removeKey"
+        android:layout_width="236dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:onClick="removeKey"
+        android:text="@string/remove_key"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeKeyButton" />
+
+    <Button
+        android:id="@+id/unpairOthers"
+        android:layout_width="163dp"
+        android:layout_height="42dp"
+        android:layout_marginTop="24dp"
+        android:onClick="unpairOthers"
+        android:text="@string/unpair_others"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.806"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changePairingPasswordButton" />
+
+    <Button
+        android:id="@+id/changePUKButton"
+        android:layout_width="149dp"
+        android:layout_height="46dp"
+        android:layout_marginTop="220dp"
+        android:layout_marginEnd="48dp"
+        android:onClick="changePUK"
+        android:text="@string/change_puk"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Spinner
+        android:id="@+id/networkSpinner"
+        android:layout_width="407dp"
+        android:layout_height="42dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/walletAddress"
+        android:layout_width="375dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/networkSpinner" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From fa518176086844d02205ca148deaab817e9ac1f0 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 17:08:09 +0200
Subject: [PATCH 10/13] address is updated in real-time

---
 .../im/status/keycard/connect/Registry.kt     |  5 +++--
 .../keycard/connect/net/WalletConnect.kt      | 14 +++++++------
 .../connect/net/WalletConnectListener.kt      |  7 +++++++
 .../status/keycard/connect/ui/MainActivity.kt | 21 +++++++------------
 4 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/im/status/keycard/connect/net/WalletConnectListener.kt

diff --git a/app/src/main/java/im/status/keycard/connect/Registry.kt b/app/src/main/java/im/status/keycard/connect/Registry.kt
index 08dfaa3..50ae4e3 100644
--- a/app/src/main/java/im/status/keycard/connect/Registry.kt
+++ b/app/src/main/java/im/status/keycard/connect/Registry.kt
@@ -13,6 +13,7 @@ import im.status.keycard.connect.data.PairingManager
 import im.status.keycard.connect.data.SettingsManager
 import im.status.keycard.connect.net.EthereumRPC
 import im.status.keycard.connect.net.WalletConnect
+import im.status.keycard.connect.net.WalletConnectListener
 import org.walletconnect.Session
 
 @SuppressLint("StaticFieldLeak")
@@ -53,7 +54,7 @@ object Registry {
         value.add(0, KotlinJsonAdapterFactory())
     }
 
-    fun init(activity: Activity, listener: ScriptListener, sessionListener: Session.Callback) {
+    fun init(activity: Activity, listener: ScriptListener, wcListener: WalletConnectListener) {
         //TODO: remove this hack, it is needed  now because KEthereum does not add the KotlinJsonAdapterFactory
         moshiAddKotlin()
 
@@ -71,6 +72,6 @@ object Registry {
         cardManager.start()
 
         ethereumRPC = EthereumRPC(settingsManager.rpcEndpoint)
-        walletConnect = WalletConnect(sessionListener, settingsManager.bip32Path, settingsManager.chainID)
+        walletConnect = WalletConnect(wcListener, settingsManager.bip32Path, settingsManager.chainID)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
index 42f7646..29abc04 100644
--- a/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnect.kt
@@ -43,7 +43,7 @@ import pm.gnosis.eip712.adapters.moshi.MoshiAdapter
 import pm.gnosis.eip712.typedDataHash
 import java.io.File
 
-class WalletConnect(private val sessionStatusListener : Session.Callback, private var bip32Path: String, private var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
+class WalletConnect(private val wcListener : WalletConnectListener, private var bip32Path: String, private var chainID: Long) : ExportKeyCommand.Listener, SignCommand.Listener, Session.Callback {
     private val scope = MainScope()
     private val moshi = Moshi.Builder().build()
     private val okHttpClient = OkHttpClient()
@@ -53,12 +53,15 @@ class WalletConnect(private val sessionStatusListener : Session.Callback, privat
     private var uiAction: (Intent?) -> Unit = this::nop
     private var signAction: (RecoverableSignature) -> Unit = this::nop
     var currentAccount: String? = null
-        private set
+        private set(value) {
+            field = value
+            wcListener.onAccountChanged(value)
+        }
 
     override fun onStatus(status: Session.Status) {
-        if (status == Session.Status.Closed) {
-            session = null
-            currentAccount = null
+        when(status) {
+            Session.Status.Approved, Session.Status.Connected -> wcListener.onConnected()
+            is Session.Status.Error, Session.Status.Disconnected, Session.Status.Closed -> { wcListener.onDisconnected(); session = null; currentAccount = null }
         }
     }
 
@@ -230,7 +233,6 @@ class WalletConnect(private val sessionStatusListener : Session.Callback, privat
                 Session.PeerMeta(name = "Keycard Connect")
             )
 
-            session?.addCallback(Registry.walletConnect.sessionStatusListener)
             session?.addCallback(Registry.walletConnect)
             session?.init()
         }
diff --git a/app/src/main/java/im/status/keycard/connect/net/WalletConnectListener.kt b/app/src/main/java/im/status/keycard/connect/net/WalletConnectListener.kt
new file mode 100644
index 0000000..e84d0bc
--- /dev/null
+++ b/app/src/main/java/im/status/keycard/connect/net/WalletConnectListener.kt
@@ -0,0 +1,7 @@
+package im.status.keycard.connect.net
+
+interface WalletConnectListener {
+    fun onConnected()
+    fun onDisconnected()
+    fun onAccountChanged(account: String?)
+}
\ No newline at end of file
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 e928eea..9763885 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
@@ -14,11 +14,12 @@ import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
 import im.status.keycard.connect.data.*
+import im.status.keycard.connect.net.WalletConnectListener
 import org.walletconnect.Session
 import org.walletconnect.Session.Config.Companion.fromWCUri
 import kotlin.reflect.KClass
 
-class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
+class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener {
     private lateinit var viewSwitcher: ViewSwitcher
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -186,25 +187,19 @@ class MainActivity : AppCompatActivity(), ScriptListener, Session.Callback {
         }
     }
 
-    override fun onMethodCall(call: Session.MethodCall) {}
-    override fun onStatus(status: Session.Status) {
-        when (status) {
-            is Session.Status.Error, Session.Status.Closed, Session.Status.Disconnected -> walletConnectDisconnected()
-            is Session.Status.Connected, Session.Status.Approved -> walletConnectConnected()
-        }
-    }
-
-    private fun walletConnectConnected() {
+    override fun onConnected() {
         val button = findViewById<Button>(R.id.walletConnectButton)
         button.setOnClickListener(this::disconnectWallet)
         button.text = getString(R.string.disconnect_wallet)
-        findViewById<TextView>(R.id.walletAddress).text = Registry.walletConnect.currentAccount
     }
 
-    private fun walletConnectDisconnected() {
+    override fun onDisconnected() {
         val button = findViewById<Button>(R.id.walletConnectButton)
         button.setOnClickListener(this::connectWallet)
         button.text = getString(R.string.connect_wallet)
-        findViewById<TextView>(R.id.walletAddress).text = ""
+    }
+
+    override fun onAccountChanged(account: String?) {
+        findViewById<TextView>(R.id.walletAddress).text = account
     }
 }

From 40b77ad7fc377b82ab56385efc1f291b4b558528 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 17:46:57 +0200
Subject: [PATCH 11/13] move all walletconnect stuff on main window

---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../status/keycard/connect/ui/MainActivity.kt | 32 +++++----
 .../keycard/connect/ui/SettingsActivity.kt    | 48 -------------
 app/src/main/res/layout/activity_main.xml     | 72 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 60 insertions(+), 96 deletions(-)
 delete mode 100644 app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f93a22..75325fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.SettingsActivity" />
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity android:name=".ui.ChangePairingPasswordActivity" />
         <activity android:name=".ui.ChangePUKActivity" />
         <activity android:name=".ui.ShowMnemonicActivity" />
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 9763885..0d2000a 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
@@ -15,12 +15,13 @@ import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
 import im.status.keycard.connect.data.*
 import im.status.keycard.connect.net.WalletConnectListener
-import org.walletconnect.Session
 import org.walletconnect.Session.Config.Companion.fromWCUri
 import kotlin.reflect.KClass
 
 class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener {
     private lateinit var viewSwitcher: ViewSwitcher
+    private lateinit var networkSpinner: Spinner
+    private lateinit var walletPath: EditText
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,21 +35,15 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         Registry.init(this, this, this)
         Registry.scriptExecutor.defaultScript = cardCheckupScript()
 
-        val networkSpinner = findViewById<Spinner>(R.id.networkSpinner)
+        networkSpinner = findViewById(R.id.networkSpinner)
+        walletPath = findViewById(R.id.walletPathText)
+
         ArrayAdapter.createFromResource(this, R.array.networks, android.R.layout.simple_spinner_item).also {
             it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             networkSpinner.adapter = it
         }
         networkSpinner.setSelection(CHAIN_IDS.indexOf(Registry.settingsManager.chainID))
-        networkSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener{
-            override fun onNothingSelected(parent: AdapterView<*>?) { }
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                val chainID = CHAIN_IDS[position]
-                Registry.settingsManager.chainID = chainID
-                Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)
-                Registry.walletConnect.updateChainAndDerivation(Registry.settingsManager.bip32Path, chainID)
-            }
-        }
+        walletPath.setText(Registry.settingsManager.bip32Path)
 
         handleIntent(intent)
     }
@@ -106,6 +101,17 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         }
     }
 
+    fun updateConnection(view: View) {
+        val chainID = CHAIN_IDS[networkSpinner.selectedItemPosition]
+        Registry.settingsManager.chainID = chainID
+        Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)
+
+        val bip32Path = walletPath.text.toString()
+        Registry.settingsManager.bip32Path = bip32Path
+
+        Registry.walletConnect.updateChainAndDerivation(bip32Path, chainID)
+    }
+
     fun cancelNFC(@Suppress("UNUSED_PARAMETER") view: View) {
         Registry.scriptExecutor.cancelScript()
     }
@@ -154,10 +160,6 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         startCommand(ReinstallActivity::class)
     }
 
-    fun settings(@Suppress("UNUSED_PARAMETER") view: View) {
-        startCommand(SettingsActivity::class)
-    }
-
     private fun loadKeyHandler(resultCode: Int, data: Intent?) {
         if (resultCode != Activity.RESULT_OK || data == null) return
 
diff --git a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
deleted file mode 100644
index b339b8f..0000000
--- a/app/src/main/java/im/status/keycard/connect/ui/SettingsActivity.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package im.status.keycard.connect.ui
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.Spinner
-import androidx.appcompat.app.AppCompatActivity
-import im.status.keycard.connect.R
-import im.status.keycard.connect.Registry
-import im.status.keycard.connect.data.CHAIN_IDS
-
-class SettingsActivity : AppCompatActivity() {
-    lateinit var networkSpinner : Spinner
-    lateinit var walletPath : EditText
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_settings)
-
-        networkSpinner = findViewById(R.id.networkSpinner)
-        ArrayAdapter.createFromResource(this, R.array.networks, android.R.layout.simple_spinner_item).also {
-            it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            networkSpinner.adapter = it
-        }
-        networkSpinner.setSelection(CHAIN_IDS.indexOf(Registry.settingsManager.chainID))
-
-        walletPath = findViewById(R.id.walletPathText)
-        walletPath.setText(Registry.settingsManager.bip32Path)
-
-    }
-
-    fun ok(@Suppress("UNUSED_PARAMETER") view: View) {
-        val chainID = CHAIN_IDS[networkSpinner.selectedItemPosition]
-        Registry.settingsManager.chainID = chainID
-        Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)
-
-        val bip32Path = walletPath.text.toString()
-        Registry.settingsManager.bip32Path = bip32Path
-
-        Registry.walletConnect.updateChainAndDerivation(bip32Path, chainID)
-        finish()
-    }
-
-    fun cancel(@Suppress("UNUSED_PARAMETER") view: View) {
-        finish()
-    }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8727c50..e26f03c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,24 +11,11 @@
         android:id="@+id/walletConnectButton"
         android:layout_width="236dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="144dp"
+        android:layout_marginTop="188dp"
         android:onClick="connectWallet"
         android:text="@string/connect_wallet"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/changePINButton"
-        android:layout_width="131dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="228dp"
-        android:onClick="changePIN"
-        android:text="@string/change_pin"
-        app:layout_constraintEnd_toStartOf="@+id/changePUKButton"
-        app:layout_constraintHorizontal_bias="0.104"
+        app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -80,18 +67,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/changePairingPasswordButton" />
 
-    <Button
-        android:id="@+id/settingsButton"
-        android:layout_width="236dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:onClick="settings"
-        android:text="@string/settings"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/reinstall" />
-
     <Button
         android:id="@+id/removeKey"
         android:layout_width="236dp"
@@ -120,13 +95,26 @@
         android:id="@+id/changePUKButton"
         android:layout_width="149dp"
         android:layout_height="46dp"
-        android:layout_marginTop="220dp"
-        android:layout_marginEnd="48dp"
-        android:onClick="changePUK"
+        android:layout_marginTop="296dp"
+        android:layout_marginEnd="60dp"
+        android:onClick="updateConnection"
         android:text="@string/change_puk"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/changePINButton"
+        android:layout_width="131dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="296dp"
+        android:onClick="updateConnection"
+        android:text="@string/change_pin"
+        app:layout_constraintEnd_toStartOf="@+id/changePUKButton"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <Spinner
         android:id="@+id/networkSpinner"
         android:layout_width="407dp"
@@ -141,7 +129,29 @@
         android:layout_width="375dp"
         android:layout_height="36dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="80dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/networkSpinner" />
+
+    <EditText
+        android:id="@+id/walletPathText"
+        android:layout_width="249dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="20dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/networkSpinner" />
+
+    <Button
+        android:id="@+id/updateButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="32dp"
+        android:onClick="updateConnection"
+        android:text="@string/update_connection"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/networkSpinner" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc36504..f290828 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,4 +45,5 @@
     <string name="reinstall_ndef_checkbox">Install NDEF applet</string>
     <string name="reinstall_button">Select cap file and install</string>
     <string name="disconnect_wallet">Disconnect</string>
+    <string name="update_connection">Update</string>
 </resources>

From 4e233a57031a1548a73efb3dea4025acdf9f33a3 Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 17:50:07 +0200
Subject: [PATCH 12/13] restore change pin/puk buttons

---
 app/src/main/res/layout/activity_main.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e26f03c..4389fe1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -97,7 +97,7 @@
         android:layout_height="46dp"
         android:layout_marginTop="296dp"
         android:layout_marginEnd="60dp"
-        android:onClick="updateConnection"
+        android:onClick="changePUK"
         android:text="@string/change_puk"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -108,7 +108,7 @@
         android:layout_height="50dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="296dp"
-        android:onClick="updateConnection"
+        android:onClick="changePIN"
         android:text="@string/change_pin"
         app:layout_constraintEnd_toStartOf="@+id/changePUKButton"
         app:layout_constraintHorizontal_bias="0.0"

From ec514399b69847f4460bca81bec890e4b03c6b7c Mon Sep 17 00:00:00 2001
From: Michele Balistreri <michele@bitgamma.com>
Date: Tue, 13 Oct 2020 17:52:32 +0200
Subject: [PATCH 13/13] fix warning

---
 app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0d2000a..bb16d74 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
@@ -101,7 +101,7 @@ class MainActivity : AppCompatActivity(), ScriptListener, WalletConnectListener
         }
     }
 
-    fun updateConnection(view: View) {
+    fun updateConnection(@Suppress("UNUSED_PARAMETER") view: View) {
         val chainID = CHAIN_IDS[networkSpinner.selectedItemPosition]
         Registry.settingsManager.chainID = chainID
         Registry.ethereumRPC.changeEndpoint(Registry.settingsManager.rpcEndpoint)