VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

don't disconnect from tag on reset or poweroff

Browse Source 
fixes #21
This commit is contained in:
Frank Morgner
2014-09-25 09:09:48 +02:00
parent 6b5b1a0c29
commit 2721cd3afb
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/screaders/NFCReader.java
View File

@@ -49,22 +49,30 @@ public class NFCReader implements SCReader {
private static int TIMEOUT = 10000; private static int TIMEOUT = 10000;
@Override @Override
public void powerOn() throws IOException { public void powerOn() throws IOException {
card.connect(); if (!card.isConnected()) {
card.setTimeout(TIMEOUT); card.connect();
card.setTimeout(TIMEOUT);
}
}
private static byte[] SELECT_MF = {(byte) 0x00, (byte) 0xa4, (byte) 0x00, (byte) 0x0C};
private void selectMFifConnected() throws IOException {
if (card != null && card.isConnected()) {
byte[] response = card.transceive(SELECT_MF);
if (response.length == 2 && response[0] == 0x90 && response[1] == 0x00) {
Log.d(this.getClass().getName(), "Resetting the card by selecting the MF results in " + Hex.getHexString(response));
}
}
} }
@Override @Override
public void powerOff() throws IOException { public void powerOff() throws IOException {
card.close(); selectMFifConnected();
} }
private static byte[] SELECT_MF = {(byte) 0x00, (byte) 0xa4, (byte) 0x00, (byte) 0x0C};
@Override @Override
public void reset() throws IOException { public void reset() throws IOException {
byte[] response = card.transceive(SELECT_MF); selectMFifConnected();
if (response.length == 2 && response[0] == 0x90 && response[1] == 0x00) {
Log.d(this.getClass().getName(), "Resetting the card by selecting the MF results in " + Hex.getHexString(response));
}
} }
/* calculation based on https://code.google.com/p/ifdnfc/source/browse/src/atr.c */ /* calculation based on https://code.google.com/p/ifdnfc/source/browse/src/atr.c */
@@ -77,10 +85,10 @@ public class NFCReader implements SCReader {
/* copy historical bytes if available */ /* copy historical bytes if available */
byte[] atr = new byte[4+historicalBytes.length+1]; byte[] atr = new byte[4+historicalBytes.length+1];
atr[0] = (byte)0x3b; atr[0] = (byte) 0x3b;
atr[1] = (byte) (0x80+historicalBytes.length); atr[1] = (byte) (0x80+historicalBytes.length);
atr[2] = (byte) 0x80; atr[2] = (byte) 0x80;
atr[3] = (byte)0x01; atr[3] = (byte) 0x01;
System.arraycopy(historicalBytes, 0, atr, 4, historicalBytes.length); System.arraycopy(historicalBytes, 0, atr, 4, historicalBytes.length);
/* calculate TCK */ /* calculate TCK */