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

add getApplicationInfo(), add callbacks to start()

Browse Source
This commit is contained in:
Dmitry Novotochinov 2018-11-23 17:25:05 +03:00
parent 2ac837a4c8
commit b1777d592c
No known key found for this signature in database
GPG Key ID: 43D1DAF5AD39C927
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
android/src/main/java/im/status/ethereum/keycard/RNStatusKeycardModule.java
View File

@ -53,7 +53,6 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
@ReactMethod
public void nfcIsSupported(final Callback callback) {
Log.d("SC", " " + this.smartCard);
callback.invoke(smartCard.isNfcSupported());
}
@ -70,8 +69,12 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
}
@ReactMethod
public void start() {
smartCard.start();
public void start(Callback successCallback, Callback errorCallback) {
if (smartCard.start()) {
successCallback.invoke();
} else {
errorCallback.invoke();
};
}
@ReactMethod
@ -125,4 +128,14 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
}
}
@ReactMethod
public void getApplicationInfo(final Callback successCallback, Callback errorCallback) {
try {
successCallback.invoke(smartCard.getApplicationInfo());
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
}
}
}

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

@ -53,14 +53,16 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
Log.d(TAG, s);
}
public void start() {
public boolean start() {
this.cardManager.start();
if (this.nfcAdapter != null) {
IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
activity.registerReceiver(this, filter);
nfcAdapter.enableReaderMode(activity, this.cardManager, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
return true;
} else {
log("not support in this device");
return false;
}
}
@ -181,4 +183,31 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
log("seed loaded to card");
}
public WritableMap getApplicationInfo() throws IOException, APDUException {
WalletAppletCommandSet cmdSet = new WalletAppletCommandSet(this.cardChannel);
ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
Log.i(TAG, "Card initialized? " + info.isInitializedCard());
Log.i(TAG, "Instance UID: " + Hex.toHexString(info.getInstanceUID()));
Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey()));
Log.i(TAG, "Application version: " + info.getAppVersionString());
Log.i(TAG, "Free pairing slots: " + info.getFreePairingSlots());
if (info.hasMasterKey()) {
Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID()));
} else {
Log.i(TAG, "The card has no master key");
}
WritableMap cardInfo = Arguments.createMap();
cardInfo.putBoolean("initialized?", info.isInitializedCard());
cardInfo.putString("instance-uid", Hex.toHexString(info.getInstanceUID()));
cardInfo.putString("secure-channel-pub-key", Hex.toHexString(info.getSecureChannelPubKey()));
cardInfo.putString("app-version", info.getAppVersionString());
cardInfo.putInt("free-pairing-slots", info.getFreePairingSlots());
cardInfo.putBoolean("has-master-key?", info.hasMasterKey());
return cardInfo;
}
}