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

only capture tag by reader mode if possible

Browse Source
This commit is contained in:
Frank Morgner
2014-11-03 23:35:07 +01:00
parent dc2e53634e
commit 478353832a
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java
View File

@@ -184,13 +184,14 @@ public class MainActivity extends Activity implements NfcAdapter.ReaderCallback
}
private void enableReaderMode() {
//mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, mFilters, mTechLists);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Bundle bundle = new Bundle();
bundle.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 2000);
NfcAdapter.getDefaultAdapter(this).enableReaderMode(this, this,
NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_NFC_B | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,
bundle);
} else {
//NfcAdapter.enableForegroundDispatch(this, mPendingIntent, mFilters, mTechLists);
}
}
@@ -321,7 +322,6 @@ public class MainActivity extends Activity implements NfcAdapter.ReaderCallback
if (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction())) {
NFCReader nfcReader = NFCReader.get(intent);
if (nfcReader != null) {
textViewVPCDStatus.append(getResources().getString(R.string.status_tag_discovered)+"\n");
forceConnect(nfcReader);
} else {
super.onNewIntent(intent);
@@ -357,4 +357,4 @@ public class MainActivity extends Activity implements NfcAdapter.ReaderCallback
// onResume gets called after this to handle the intent
setIntent(intent);
}
}
}

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

@@ -44,7 +44,7 @@ public class NFCReader implements SCReader {
card.close();
}
private static int TIMEOUT = 10000;
private static int TIMEOUT = 2500;
@Override
public void powerOn() {
/* should already be connected... */
@@ -105,7 +105,16 @@ public class NFCReader implements SCReader {
if (intent.getExtras() != null) {
Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
if (tag != null) {
nfcReader = NFCReader.get(tag);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
/* Disconnect from the tag here. The reader mode will capture the tag again */
try {
IsoDep.get(tag).close();
} catch (IOException e) {
e.printStackTrace();
}
} else {
nfcReader = NFCReader.get(tag);
}
intent.removeExtra(NfcAdapter.EXTRA_TAG);
}
}