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

use Promise instead of Callback

Browse Source
This commit is contained in:
Dmitry Novotochinov 2018-11-25 00:35:08 +03:00
parent 74c3612260
commit 9792de8f0c
No known key found for this signature in database
GPG Key ID: 43D1DAF5AD39C927
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,12 @@ import android.provider.Settings;
import android.util.Log;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.WritableMap;
import java.io.IOException;
@ -52,33 +53,33 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
}
@ReactMethod
public void nfcIsSupported(final Callback callback) {
callback.invoke(smartCard.isNfcSupported());
public void nfcIsSupported(final Promise promise) {
promise.resolve(smartCard.isNfcSupported());
}
@ReactMethod
public void nfcIsEnabled(final Callback callback) {
callback.invoke(smartCard.isNfcEnabled());
public void nfcIsEnabled(final Promise promise) {
promise.resolve(smartCard.isNfcEnabled());
}
@ReactMethod
public void openNfcSettings(final Callback callback) {
public void openNfcSettings(final Promise promise) {
Activity currentActivity = getCurrentActivity();
currentActivity.startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
callback.invoke();
promise.resolve(true);
}
@ReactMethod
public void start(Callback successCallback, Callback errorCallback) {
public void start(final Promise promise) {
if (smartCard.start()) {
successCallback.invoke();
promise.resolve(true);
} else {
errorCallback.invoke();
};
promise.reject("Error", "Not supported on this device");
}
}
@ReactMethod
public void init(final Callback successCallback, final Callback errorCallback) {
public void init(final Promise promise) {
try {
SmartCardSecrets s = smartCard.init();
@ -87,54 +88,54 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
params.putString("puk", s.getPuk());
params.putString("password", s.getPairingPassword());
successCallback.invoke(params);
promise.resolve(params);
} catch (IOException | APDUException | NoSuchAlgorithmException | InvalidKeySpecException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
promise.reject(e.getClass().toString(), e.getMessage());
}
}
@ReactMethod
public void pair(final String password, final Callback successCallback, final Callback errorCallback) {
public void pair(final String password, final Promise promise) {
try {
String pairing = smartCard.pair(password);
Log.d(TAG, "pairing done");
successCallback.invoke(pairing);
promise.resolve(pairing);
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
promise.reject(e.getClass().toString(), e.getMessage());
}
}
@ReactMethod
public void generateMnemonic(final String password, Callback successCallback, Callback errorCallback) {
public void generateMnemonic(final String password, final Promise promise) {
try {
successCallback.invoke(smartCard.generateMnemonic(password));
promise.resolve(smartCard.generateMnemonic(password));
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
promise.reject(e.getClass().toString(), e.getMessage());
}
}
@ReactMethod
public void saveMnemonic(final String mnemonic, final String password, String pin, Callback successCallback, Callback errorCallback) {
public void saveMnemonic(final String mnemonic, final String password, final String pin, final Promise promise) {
try {
smartCard.saveMnemonic(mnemonic, password, pin);
successCallback.invoke();
promise.resolve(true);
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
promise.reject(e.getClass().toString(), e.getMessage());
}
}
@ReactMethod
public void getApplicationInfo(final Callback successCallback, Callback errorCallback) {
public void getApplicationInfo(final Promise promise) {
try {
successCallback.invoke(smartCard.getApplicationInfo());
promise.resolve(smartCard.getApplicationInfo());
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
errorCallback.invoke(e.getMessage());
promise.reject(e.getClass().toString(), e.getMessage());
}
}