X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FNFCAuthCRCheck.java;h=dc59b69e4391ebec2552a9a96915579b3150617f;hp=6637c00164221415b39f0a8c99624c23ef6341bd;hb=d68162938933f84fdde11f7a4ae5b919ccc469a1;hpb=16a341cff772b8d413af1d95a21e181a5b4879ff

diff --git a/src/org/average/nfcauthcr/NFCAuthCRCheck.java b/src/org/average/nfcauthcr/NFCAuthCRCheck.java
index 6637c00..dc59b69 100644
--- a/src/org/average/nfcauthcr/NFCAuthCRCheck.java
+++ b/src/org/average/nfcauthcr/NFCAuthCRCheck.java
@@ -2,7 +2,6 @@ package org.average.nfcauthcr;
 
 import java.io.IOException;
 
-import android.os.Bundle;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
@@ -16,6 +15,8 @@ import android.nfc.tech.IsoDep;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.average.nfcauthcr.NFCAuthCRYubiNeo;
+
 public class NFCAuthCRCheck extends Activity {
 
 	private final String TAG = getClass().getName();
@@ -33,19 +34,16 @@ public class NFCAuthCRCheck extends Activity {
 		Log.v(TAG, "Starting the work");
 
 		Intent intent = getIntent();
-		Bundle extras = intent.getExtras();
 		setResult(RESULT_CANCELED);
-		if(swipeDialog != null) {
+		if (swipeDialog != null) {
 			swipeDialog.dismiss();
 			swipeDialog = null;
 		}
-		if(extras != null) {
-			int slot = extras.getInt("slot");
-			if (slot > 0) {
-				swipeDialog = makeDialog();
-				swipeDialog.show();
-				enableDispatch(slot);
-			}
+		int slot = intent.getIntExtra("slot", -1);
+		if (slot > 0) {
+			swipeDialog = makeDialog();
+			swipeDialog.show();
+			enableDispatch(slot);
 		}
 	}
 
@@ -64,29 +62,16 @@ public class NFCAuthCRCheck extends Activity {
 	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 {
-			isoTag.connect();
-			byte[] resp = isoTag.transceive(selectCommand);
-			int length = resp.length;
-			if (resp[length - 2] == (byte)0x90 &&
-			    resp[length - 1] == 0x00) {
-				doChallengeYubiKey(isoTag, slot);
-			} else {
-				Toast.makeText(this, R.string.tag_error,
-						Toast.LENGTH_LONG).show();
-			}
-		} catch (TagLostException e) {
-			Toast.makeText(this,
-				R.string.tag_lost, Toast.LENGTH_LONG).show();
-		} catch (IOException e) {
-			Toast.makeText(this,
-				getText(R.string.tag_error) +
-				e.getMessage(),
-				Toast.LENGTH_LONG).show();
+		byte[] response = doChallengeYubiKey(isoTag, slot, challenge);
+		if (response != null) {
+			Intent data = getIntent();
+			data.putExtra("response", response);
+			setResult(RESULT_OK, data);
 		}
 		finish();
 	}
@@ -140,10 +125,28 @@ public class NFCAuthCRCheck extends Activity {
 		}
 	}
 
-	private void doChallengeYubiKey(IsoDep isoTag, int slot)
-						throws IOException {
-		Intent data = getIntent();
-		data.putExtra("response","<FIXME>real data here");
-		setResult(RESULT_OK, data);
+	private byte[] doChallengeYubiKey(IsoDep isoTag, int slot,
+						byte[] challenge) {
+		try {
+			isoTag.connect();
+			byte[] resp = isoTag.transceive(selectCommand);
+			int length = resp.length;
+			if (resp[length - 2] == (byte)0x90 &&
+			    resp[length - 1] == 0x00) {
+				return challenge;
+			} else {
+				Toast.makeText(this, R.string.tag_error,
+						Toast.LENGTH_LONG).show();
+			}
+		} catch (TagLostException e) {
+			Toast.makeText(this,
+				R.string.tag_lost, Toast.LENGTH_LONG).show();
+		} catch (IOException e) {
+			Toast.makeText(this,
+				getText(R.string.tag_error) +
+				e.getMessage(),
+				Toast.LENGTH_LONG).show();
+		}
+		return null;
 	}
 }