diff --git a/android/src/main/java/com/reactnativehce/services/CardService.java b/android/src/main/java/com/reactnativehce/services/CardService.java index f666c0f..524c6ed 100644 --- a/android/src/main/java/com/reactnativehce/services/CardService.java +++ b/android/src/main/java/com/reactnativehce/services/CardService.java @@ -27,10 +27,6 @@ public class CardService extends HostApduService { @Override public byte[] processCommandApdu(byte[] command, Bundle extras) { - if (currentHCEApplication != null) { - return currentHCEApplication.processCommand(command); - } - if (ApduHelper.commandByRangeEquals(command, 0, 4, ApduHelper.C_APDU_SELECT_APP)) { for (IHCEApplication app : registeredHCEApplications) { if (app.assertSelectCommand(command)) { @@ -38,6 +34,8 @@ public byte[] processCommandApdu(byte[] command, Bundle extras) { return ApduHelper.R_APDU_OK; } } + } else if (currentHCEApplication != null) { + return currentHCEApplication.processCommand(command); } return ApduHelper.R_APDU_ERROR;