status-im/react-native-status-keycard
2
0
Fork 0
mirror of https://github.com/status-im/react-native-status-keycard.git synced 2025-02-28 12:00:36 +00:00
Code Issues Projects Releases Wiki Activity

upgrade to SDK 3.0.2, handle IO errors separately from APDU errors

Browse Source
This commit is contained in:
Michele Balistreri 2020-06-04 08:04:57 +03:00
parent 26db8dfd25
commit 29b3a3c578
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -44,7 +44,7 @@ repositories {
dependencies {
implementation 'com.facebook.react:react-native:+'
implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
implementation 'org.apache.commons:commons-lang3:3.9'
implementation 'com.github.status-im.status-keycard-java:android:3.0.1'
implementation 'com.github.status-im.status-keycard-java:android:3.0.2'
}

12
android/src/main/java/im/status/ethereum/keycard/SmartCard.java
View File

@ -233,14 +233,18 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
Boolean isPaired = false;
if (pairingBase64.length() > 0) {
try {
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
try {
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
isPaired = true;
} catch(APDUException e) {
Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
}
if (isPaired) {
ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
Log.i(TAG, "PIN retry counter: " + status.getPINRetryCount());
@ -248,8 +252,6 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
cardInfo.putInt("pin-retry-counter", status.getPINRetryCount());
cardInfo.putInt("puk-retry-counter", status.getPUKRetryCount());
} catch (IOException | IllegalArgumentException e) {
Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
}
}