X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FEnroll.java;h=6c104c4ad9513ad22574924fccd89f824a17d033;hp=12533e7bf8c469fb9bd719696d5215fa898b3826;hb=08b05b67a65e78e80fb0fffec8855a69a72ebff9;hpb=9194bb54ed7bfd3ccb2ee93151fb3b1467cdae35

diff --git a/src/org/average/nfcauthcr/Enroll.java b/src/org/average/nfcauthcr/Enroll.java
index 12533e7..6c104c4 100644
--- a/src/org/average/nfcauthcr/Enroll.java
+++ b/src/org/average/nfcauthcr/Enroll.java
@@ -24,7 +24,6 @@ public class Enroll extends Activity {
 	private static boolean waitingForResult = false;
 	private static SharedPreferences prefs;
 	private static int slot;
-	private AlertDialog swipeDialog;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -53,8 +52,6 @@ public class Enroll extends Activity {
 	@Override
 	protected void onPause() {
 		super.onPause();
-		Log.v(TAG, "Going inactive, try to stop");
-		if (!waitingForResult) { finish(); }
 	}
 
 	@Override
@@ -89,10 +86,6 @@ public class Enroll extends Activity {
 					Intent intent) {
 		Log.v(TAG, "Got activity result");
 		waitingForResult = false;
-		if(swipeDialog != null) {
-			swipeDialog.dismiss();
-			swipeDialog = null;
-		}
 
 		if (resultCode != RESULT_OK) {
 			Log.v(TAG, "Error result code " + resultCode);
@@ -131,26 +124,10 @@ public class Enroll extends Activity {
 		rng.nextBytes(challenge);
 		Log.v(TAG, "Random challenge: " + hex(challenge));
 		Intent crIntent = new Intent(this, TagEvent.class);
-		crIntent.putExtra("slot", slot);
+		crIntent.putExtra("yubikey_neo_slot", slot);
 		crIntent.putExtra("challenge", challenge);
-		this.startActivityForResult(crIntent, 0);
 		waitingForResult = true;
-		if (swipeDialog != null) swipeDialog.dismiss();
-		swipeDialog = makeDialog();
-		swipeDialog.show();
-	}
-
-	private AlertDialog makeDialog() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.challenging);
-		builder.setMessage(R.string.swipe);
-		builder.setOnCancelListener(
-				new DialogInterface.OnCancelListener() {
-			public void onCancel(DialogInterface dialog) {
-				Log.v(TAG, "unbind service FIXME");
-			}
-		});
-		return builder.create();
+		this.startActivityForResult(crIntent, 0);
 	}
 
 	private String hex(byte[] a) {