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 9f9d53593da811965c43d9c4ef4167826f35da07..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.widget.TextView;
 import android.widget.RadioButton;
 
-import org.average.nfcauthcr.Check;
+import org.average.nfcauthcr.QueryCrToken;
 
 public class Enroll extends Activity {
 
@@ -49,19 +48,6 @@ public class Enroll extends Activity {
                if (btn != null) btn.setChecked(true);
        }
 
-       @Override
-       protected void onPause() {
-               super.onPause();
-               Log.v(TAG, "Going inactive, try to stop");
-               if (!waitingForResult) { finish(); }
-       }
-
-       @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;
@@ -80,7 +66,7 @@ public class Enroll extends Activity {
                if (slot > 0) {
                        runEnrollment(slot);
                } else {
-                       showEnrollResult("Must specify which slot to use");
+                       showEnrollResult(R.string.need_slot);
                }
        }
 
@@ -101,15 +87,14 @@ public class Enroll extends Activity {
                editor.putString("challenge", hex(challenge));
                editor.putString("response", hex(response));
                editor.commit();
+               showEnrollResult(R.string.enroll_success);
                Log.v(TAG, "stored new challenge and response");
        }
 
-       private void showEnrollResult(final String msg) {
-               Log.v(TAG, "Show result: \"" + msg + "\"");
-
+       private void showEnrollResult(int messageid) {
                AlertDialog.Builder builder = new AlertDialog.Builder(this);
                builder.setTitle(R.string.enrollresult);
-               builder.setMessage(msg);
+               builder.setMessage(messageid);
                builder.setPositiveButton(android.R.string.ok,
                                new DialogInterface.OnClickListener() {
                        public void onClick(DialogInterface dialog, int which) {
@@ -126,12 +111,10 @@ 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, NFCAuthCRCheck.class);
-               crIntent.putExtra("slot", slot);
+               Intent crIntent = new Intent(this, QueryCrToken.class);
                crIntent.putExtra("challenge", challenge);
-               this.startActivityForResult(crIntent, 0);
                waitingForResult = true;
+               this.startActivityForResult(crIntent, 0);
        }
 
        private String hex(byte[] a) {