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 20:10:28 +00:00
Code Issues Projects Releases Wiki Activity

added error argument to stopNFC, fixed bug

Browse Source
This commit is contained in:
Michele Balistreri 2020-12-10 16:58:10 +03:00
parent b3ea0b5bf3
commit 6c36a08ddb
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void stopNFC(final Promise promise) { public void stopNFC(String error, final Promise promise) {
promise.resolve(true) promise.resolve(true)
} }
} }

1
ios/SmartCard.swift
View File

@ -289,6 +289,7 @@ class SmartCard {
func securedCommandSet(channel: CardChannel, pairingBase64: String) throws -> KeycardCommandSet { func securedCommandSet(channel: CardChannel, pairingBase64: String) throws -> KeycardCommandSet {
let cmdSet = KeycardCommandSet(cardChannel: channel) let cmdSet = KeycardCommandSet(cardChannel: channel)
try cmdSet.select().checkOK()
try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64) try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64)
return cmdSet return cmdSet

2
ios/StatusKeycard.m
View File

@ -30,6 +30,6 @@ RCT_EXTERN_METHOD(removeKey:(NSString *)pairing pin:(NSString *)pin resolve:(RCT
RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(startNFC:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(startNFC:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(stopNFC:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(stopNFC:(NSString *)err resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
@end @end

8
ios/StatusKeycard.swift
View File

@ -167,9 +167,13 @@ class StatusKeycard: RCTEventEmitter {
} }
@objc @objc
func stopNFC(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void { func stopNFC(_ err: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {
self.keycardController?.stop(alertMessage: "Success") if (err.isEmpty) {
self.keycardController?.stop(alertMessage: "Success")
} else {
self.keycardController?.stop(errorMessage: err)
}
self.cardChannel = nil self.cardChannel = nil
self.keycardController = nil self.keycardController = nil
resolve(true) resolve(true)