status-im
/
react-native-status-keycard
mirror of https://github.com/status-im/react-native-status-keycard.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

handle 0x prefix for hex strings

This commit is contained in:
Michele Balistreri 2020-12-11 14:28:31 +03:00
parent 805aaf956c
commit b6498e3a7d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ios/SmartCard.swift
View File

@ -57,7 +57,7 @@ class SmartCard {
let rootKeyPair = try exportKey(cmdSet: cmdSet, path: .rootPath, makeCurrent: false, publicOnly: true)
let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: true, publicOnly: true)
let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
let info = try ApplicationInfo(cmdSet.select().checkOK().data)
@ -163,7 +163,7 @@ class SmartCard {
let masterPair = try exportKey(cmdSet: cmdSet, path: .masterPath, makeCurrent: false, publicOnly: true)
let rootKeyPair = try exportKey(cmdSet: cmdSet, path: .rootPath, makeCurrent: false, publicOnly: true)
let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: true, publicOnly: true)
let walletKeyPair = try exportKey(cmdSet: cmdSet, path: .walletPath, makeCurrent: false, publicOnly: true)
let info = try ApplicationInfo(cmdSet.select().checkOK().data)
@ -351,8 +351,10 @@ class SmartCard {
}
func hexToBytes(_ hex: String) -> [UInt8] {
var last = hex.first
return hex.dropFirst().compactMap {
let h = hex.starts(with: "0x") ? String(hex.dropFirst(2)) : hex
var last = h.first
return h.dropFirst().compactMap {
guard
let lastHexDigitValue = last?.hexDigitValue,
let hexDigitValue = $0.hexDigitValue

1
ios/StatusKeycard.swift
View File

@ -152,6 +152,7 @@ class StatusKeycard: RCTEventEmitter {
self.keycardController = KeycardController(onConnect: { [unowned self] channel in
self.cardChannel = channel
self.sendEvent(withName: "keyCardOnConnected", body: nil)
self.keycardController?.setAlert("Connected. Don't move your card until this message disappears.")
}, onFailure: { [unowned self] _ in
self.cardChannel = nil
self.sendEvent(withName: "keyCardOnDisconnected", body: nil)