begin converting to multiple ops per request

[YkNeoCR.git] / src / org / average / nfcauthcr / Enroll.java

diff --git a/src/org/average/nfcauthcr/Enroll.java b/src/org/average/nfcauthcr/Enroll.java
index 6c104c4ad9513ad22574924fccd89f824a17d033..96fa3147b7ac79c8c8e44d0386a2c925959bd3fc 100644 (file)
--- a/src/org/average/nfcauthcr/Enroll.java
+++ b/src/org/average/nfcauthcr/Enroll.java
@@ -12,10 +12,9 @@ import android.content.SharedPreferences.Editor;
 import android.content.DialogInterface;
 import android.util.Log;
 import android.view.View;
 import android.content.DialogInterface;
 import android.util.Log;
 import android.view.View;

-import android.widget.TextView;

 import android.widget.RadioButton;
 
 import android.widget.RadioButton;
 

-import org.average.nfcauthcr.TagEvent;
+import org.average.nfcauthcr.QueryCrToken;

 
 public class Enroll extends Activity {
 
 
 public class Enroll extends Activity {
 


@@ -49,17 +48,6 @@ public class Enroll extends Activity {
                if (btn != null) btn.setChecked(true);
        }
 
                if (btn != null) btn.setChecked(true);
        }
 

-       @Override
-       protected void onPause() {
-               super.onPause();
-       }
-
-       @Override
-       protected void onStop() {
-               super.onStop();
-               Log.v(TAG, "Stop requested");
-       }
-

        public void onSlotSelectionClicked(View view) {
                Log.v(TAG, "Radio Button selected");
                if (! ((RadioButton) view).isChecked()) return;
        public void onSlotSelectionClicked(View view) {
                Log.v(TAG, "Radio Button selected");
                if (! ((RadioButton) view).isChecked()) return;


@@ -123,8 +111,7 @@ public class Enroll extends Activity {
                byte[] challenge = new byte[63];
                rng.nextBytes(challenge);
                Log.v(TAG, "Random challenge: " + hex(challenge));
                byte[] challenge = new byte[63];
                rng.nextBytes(challenge);
                Log.v(TAG, "Random challenge: " + hex(challenge));

-               Intent crIntent = new Intent(this, TagEvent.class);
-               crIntent.putExtra("yubikey_neo_slot", slot);
+               Intent crIntent = new Intent(this, QueryCrToken.class);

                crIntent.putExtra("challenge", challenge);
                waitingForResult = true;
                this.startActivityForResult(crIntent, 0);
                crIntent.putExtra("challenge", challenge);
                waitingForResult = true;
                this.startActivityForResult(crIntent, 0);