X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FCheck.java;fp=src%2Forg%2Faverage%2Fnfcauthcr%2FCheck.java;h=0000000000000000000000000000000000000000;hp=6b6ec4f568f79e043ea47cef0888432bb38257b4;hb=9194bb54ed7bfd3ccb2ee93151fb3b1467cdae35;hpb=bb4b51c880cf9a1942151bf1dd8977e3a8e0ccf6 diff --git a/src/org/average/nfcauthcr/Check.java b/src/org/average/nfcauthcr/Check.java deleted file mode 100644 index 6b6ec4f..0000000 --- a/src/org/average/nfcauthcr/Check.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.average.nfcauthcr; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.PendingIntent; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.IntentFilter; -import android.nfc.NfcAdapter; -import android.nfc.Tag; -import android.nfc.TagLostException; -import android.nfc.tech.IsoDep; -import android.util.Log; -import android.widget.Toast; - -import org.average.nfcauthcr.YkNeo; -import org.average.nfcauthcr.CRException; - -public class Check extends Activity { - - private final String TAG = getClass().getName(); - - private PendingIntent tagIntent; - - @Override - protected void onResume() { - super.onResume(); - Log.v(TAG, "Starting the work"); - - Intent intent = getIntent(); - setResult(RESULT_CANCELED); - int slot = intent.getIntExtra("slot", -1); - if (slot > 0) { - enableDispatch(slot); - } - } - - @Override - protected void onPause() { - super.onPause(); - Log.v(TAG, "Finished the work"); - - disableDispatch(); - } - - public void onNewIntent(Intent intent) { - Log.v(TAG, "NFC Intent arrived"); - int slot = intent.getIntExtra("slot", -1); - byte[] challenge = intent.getByteArrayExtra("challenge"); - if (slot <= 0) return; - Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); - if (tag == null) return; - IsoDep isoTag = IsoDep.get(tag); - try { - byte[] response = YkNeo.doChallengeYubiKey( - isoTag, slot, challenge); - Intent data = getIntent(); - data.putExtra("response", response); - setResult(RESULT_OK, data); - } catch (CRException e) { - Log.v(TAG, e.getMessage()); - Toast.makeText(this, e.getMessage(), - Toast.LENGTH_LONG).show(); - } - finish(); - } - -/* - - - - - - - - - - - - android.nfc.tech.IsoDep - - - -*/ - - private void enableDispatch(int slot) { - Intent intent = getIntent(); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - intent.putExtra("slot", slot); - tagIntent = PendingIntent.getActivity(this, 0, intent, 0); - IntentFilter iso = - new IntentFilter(NfcAdapter.ACTION_TECH_DISCOVERED); - NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this); - if (adapter == null) { - Toast.makeText(this, R.string.no_nfc, - Toast.LENGTH_LONG).show(); - finish(); - } - if (! adapter.isEnabled()) { - Toast.makeText(this, R.string.nfc_disabled, - Toast.LENGTH_LONG).show(); - finish(); - } - adapter.enableForegroundDispatch( - this, tagIntent, new IntentFilter[] {iso}, - new String[][] {new String[] {IsoDep.class.getName()}}); - } - - private void disableDispatch() { - if (tagIntent != null) { - tagIntent.cancel(); - tagIntent = null; - } - NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this); - if (adapter != null) { - adapter.disableForegroundDispatch(this); - } - } -}