improve wrong pairing password handling

keycard-tech · Oct 22, 2020 · 5650f44 · 5650f44
1 parent c575779
commit 5650f44
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 14 deletions.
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
@@ -7,6 +7,7 @@ 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 java.lang.Exception
 
 class OpenSecureChannelCommand : CardCommand {
     private var pairingPassword: String? = null
@@ -19,10 +20,13 @@ class OpenSecureChannelCommand : CardCommand {
 
     private fun pair(activity: Activity, cmdSet: KeycardCommandSet): CardCommand.Result {
         if (pairingPassword != null) {
-            val res = runOnCard {
+            val res = try {
                 cmdSet.autoPair(pairingPassword)
                 Registry.pairingManager.putPairing(cmdSet.applicationInfo.instanceUID, cmdSet.pairing)
                 cmdSet.autoOpenSecureChannel()
+                CardCommand.Result.OK
+            } catch(e: Exception) {
+                CardCommand.Result.RETRY
             }
 
             pairingPassword = null

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
@@ -5,7 +5,6 @@ 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

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
@@ -5,7 +5,6 @@ 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

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
@@ -5,13 +5,11 @@ 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 : NoNFCActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

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
@@ -9,7 +9,6 @@ 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

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
@@ -6,7 +6,6 @@ import android.content.pm.ActivityInfo
 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/PINActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/PINActivity.kt
@@ -7,7 +7,6 @@ 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

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
@@ -7,7 +7,6 @@ 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

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
@@ -7,7 +7,6 @@ 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

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
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo
 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/ShowMnemonicActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ShowMnemonicActivity.kt
@@ -4,7 +4,6 @@ import android.content.pm.ActivityInfo
 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
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo
 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
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo
 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