reorg, separate roles

[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 190c08ff921c190b65754e5d3b01eb4ae9f5c331..6c104c4ad9513ad22574924fccd89f824a17d033 100644 (file)
--- a/src/org/average/nfcauthcr/Enroll.java
+++ b/src/org/average/nfcauthcr/Enroll.java
@@ -15,7 +15,7 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.RadioButton;
 
-import org.average.nfcauthcr.Check;
+import org.average.nfcauthcr.TagEvent;
 
 public class Enroll extends Activity {
 
@@ -52,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
@@ -125,12 +123,11 @@ public class Enroll extends Activity {
                byte[] challenge = new byte[63];
                rng.nextBytes(challenge);
                Log.v(TAG, "Random challenge: " + hex(challenge));
-               Log.v(TAG, "Launching challenging activity");
-               Intent crIntent = new Intent(this, Check.class);
-               crIntent.putExtra("slot", slot);
+               Intent crIntent = new Intent(this, TagEvent.class);
+               crIntent.putExtra("yubikey_neo_slot", slot);
                crIntent.putExtra("challenge", challenge);
-               this.startActivityForResult(crIntent, 0);
                waitingForResult = true;
+               this.startActivityForResult(crIntent, 0);
        }
 
        private String hex(byte[] a) {