bump version

android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="im.status.ethereum.keycard">
+          package="com.reactlibrary">
 
 </manifest>
-  
+  

android/src/main/java/im/status/ethereum/keycard/RNStatusKeycardModule.java

@@ -176,20 +176,6 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
-    @ReactMethod
-    public void factoryReset(final Promise promise) {
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    promise.resolve(smartCard.factoryReset());
-                } catch (IOException | APDUException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
-    }
-
     @ReactMethod
     public void deriveKey(final String path, final String pin, final Promise promise) {
         new Thread(new Runnable() {
@@ -355,36 +341,6 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
         }).start();
     }
 
-    @ReactMethod
-    public void changePairingPassword(final String pin, final String pairingPassword, final Promise promise) {
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    smartCard.changePairingPassword(pin, pairingPassword);
-                    promise.resolve(true);
-                } catch (IOException | APDUException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
-    }
-
-    @ReactMethod
-    public void changePUK(final String pin, final String puk, final Promise promise) {
-        new Thread(new Runnable() {
-            public void run() {
-                try {
-                    smartCard.changePUK(pin, puk);
-                    promise.resolve(true);
-                } catch (IOException | APDUException e) {
-                    Log.d(TAG, e.getMessage());
-                    promise.reject(e);
-                }
-            }
-        }).start();
-    }
-
     @ReactMethod
     public void changePin(final String currentPin, final String newPin, final Promise promise) {
         new Thread(new Runnable() {

android/src/main/java/im/status/ethereum/keycard/SmartCard.java

@@ -28,7 +28,6 @@ import java.util.Iterator;
 import im.status.keycard.applet.RecoverableSignature;
 import im.status.keycard.globalplatform.GlobalPlatformCommandSet;
 import im.status.keycard.io.APDUException;
-import im.status.keycard.io.APDUResponse;
 import im.status.keycard.io.CardChannel;
 import im.status.keycard.io.CardListener;
 import im.status.keycard.android.NFCCardManager;
@@ -258,29 +257,6 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return cardInfo;
     }
 
-    public WritableMap factoryReset() throws IOException, APDUException {
-        GlobalPlatformCommandSet cmdSet = new GlobalPlatformCommandSet(this.cardChannel);
-        cmdSet.select().checkOK();
-        Log.i(TAG, "ISD selected");
-
-        cmdSet.openSecureChannel();
-        Log.i(TAG, "SecureChannel opened");
-
-        cmdSet.deleteKeycardInstance().checkSW(APDUResponse.SW_OK, APDUResponse.SW_REFERENCED_DATA_NOT_FOUND);
-        Log.i(TAG, "Keycard applet instance deleted");
-
-        cmdSet.installKeycardApplet().checkOK();
-        Log.i(TAG, "Keycard applet instance re-installed");
-
-        ApplicationInfo info = new ApplicationInfo(new KeycardCommandSet(this.cardChannel).select().checkOK().getData());
-        Log.i(TAG, "Selecting the newly installed Keycard applet succeeded");
-
-        WritableMap cardInfo = Arguments.createMap();
-        cardInfo.putBoolean("initialized?", info.isInitializedCard());
-
-        return cardInfo;
-    }
-
     public void deriveKey(final String path, final String pin) throws IOException, APDUException {
         KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
 
@@ -429,24 +405,10 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
         return 3;
     }
 
-    public void changePairingPassword(final String pin, final String pairingPassword) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
-
-        cmdSet.changePairingPassword(pairingPassword);
-        Log.i(TAG, "pairing password changed");
-    }
-
-    public void changePUK(final String pin, final String puk) throws IOException, APDUException {
-        KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
-
-        cmdSet.changePUK(puk);
-        Log.i(TAG, "puk changed");
-    }
-
     public void changePin(final String currentPin, final String newPin) throws IOException, APDUException {
         KeycardCommandSet cmdSet = authenticatedCommandSet(currentPin);
 
-        cmdSet.changePIN(newPin);
+        cmdSet.changePIN(0, newPin);
         Log.i(TAG, "pin changed");
     }
 

ios/SmartCard.swift

@@ -89,29 +89,6 @@ class SmartCard {
       resolve(true)
     }
 
-    func factoryReset(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet: GlobalPlatformCommandSet = GlobalPlatformCommandSet(cardChannel: channel);
-      try cmdSet.select().checkOK()
-      os_log("ISD selected")
-
-      try cmdSet.openSecureChannel()
-      os_log("SecureChannel opened")
-
-      try cmdSet.deleteKeycardInstance().checkSW(StatusWord.ok, StatusWord.referencedDataNotFound)
-      os_log("Keycard applet instance deleted")
-
-      try cmdSet.installKeycardInstance().checkOK()
-      os_log("Keycard applet instance re-installed")
-
-      let info = try ApplicationInfo(KeycardCommandSet(cardChannel: channel).select().checkOK().data)
-      os_log("Selecting the newly installed Keycard applet succeeded")
-
-      var cardInfo = [String: Any]()
-      cardInfo["initialized?"] = info.initializedCard
-
-      resolve(cardInfo)
-    }
-
     func getApplicationInfo(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
       let cmdSet = KeycardCommandSet(cardChannel: channel)
       let info = try ApplicationInfo(cmdSet.select().checkOK().data)
@@ -266,20 +243,6 @@ class SmartCard {
       resolve(3)
     }
 
-    func changePairingPassword(channel: CardChannel, pin: String, pairingPassword: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
-      try cmdSet.changePairingPassword(pairingPassword: pairingPassword).checkOK()
-      os_log("pairing password changed")
-      resolve(true)
-    }
-
-    func changePUK(channel: CardChannel, pin: String, puk: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
-      let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
-      try cmdSet.changePUK(puk: puk).checkOK()
-      os_log("puk changed")
-      resolve(true)
-    }
-
     func changePin(channel: CardChannel, currentPin: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
       let cmdSet = try authenticatedCommandSet(channel: channel, pin: currentPin)
       try cmdSet.changePIN(pin: newPin).checkOK()

ios/StatusKeycard.m

@@ -12,7 +12,6 @@ RCT_EXTERN_METHOD(generateMnemonic:(NSString *)words resolve:(RCTPromiseResolveB
 RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getApplicationInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(factoryReset:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(deriveKey:(NSString *)path pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(exportKey:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
@@ -24,8 +23,6 @@ RCT_EXTERN_METHOD(signPinless:(NSString *)hash resolve:(RCTPromiseResolveBlock)r
 RCT_EXTERN_METHOD(installApplet:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(installAppletAndInitCard:(String *)pin resolve: (RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(verifyPin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(changePairingPassword:(NSString *)pin pairingPassword:(NSString *)pairingPassword resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(changePUK:(NSString *)pin puk:(NSString *)puk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(changePin:(NSString *)currentPin newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(unblockPin:(NSString *)puk newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(unpair:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)

ios/StatusKeycard.swift

@@ -58,11 +58,6 @@ class StatusKeycard: RCTEventEmitter {
       keycardInvokation(reject) { [unowned self] channel in try self.smartCard.saveMnemonic(channel: channel, mnemonic: mnemonic, pin: pin, resolve: resolve, reject: reject) }
     }
 
-    @objc
-    func factoryReset(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.factoryReset(channel: channel, resolve: resolve, reject: reject) }
-    }
-
     @objc
     func getApplicationInfo(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getApplicationInfo(channel: channel, resolve: resolve, reject: reject) }
@@ -123,16 +118,6 @@ class StatusKeycard: RCTEventEmitter {
       keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyPin(channel: channel, pin: pin, resolve: resolve, reject: reject) }
     }
 
-    @objc
-    func changePairingPassword(_ pin: String, pairingPassword: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePairingPassword(channel: channel, pin: pin, pairingPassword: pairingPassword, resolve: resolve, reject: reject) }
-    }
-
-    @objc
-    func changePUK(_ pin: String, puk: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePUK(channel: channel, pin: pin, puk: puk, resolve: resolve, reject: reject) }
-    }
-
     @objc
     func changePin(_ currentPin: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePin(channel: channel, currentPin: currentPin, newPin: newPin, resolve: resolve, reject: reject) }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "react-native-status-keycard",
   "homepage": "https://keycard.status.im/",
-  "version": "2.5.35",
-  "description": "React Native library to interact with Status Keycard using NFC connection",
+  "version": "2.5.33",
+  "description": "React Native library to interact with Status Keycard using NFC connection (Android only)",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"