intents work

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

diff --git a/src/org/average/nfcauthcr/NFCAuthCREnroll.java b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
index 6aae6f1970e4e38b30d10285ed3b1ab904abeafc..bb6b4f0357118db644ce4e7aace211823aa5be34 100644 (file)
--- a/src/org/average/nfcauthcr/NFCAuthCREnroll.java
+++ b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.preference.PreferenceManager;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.DialogInterface;
@@ -12,8 +13,10 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.RadioButton;
 
-public class NFCAuthCREnroll extends Activity
-{
+import org.average.nfcauthcr.NFCAuthCRCheck;
+
+public class NFCAuthCREnroll extends Activity {
+
        private final String TAG = getClass().getName();
 
        private static boolean waitingForResult = false;
@@ -73,12 +76,24 @@ public class NFCAuthCREnroll extends Activity
        public void onEnrollClicked(View view) {
                Log.v(TAG, "Enroll clicked");
                if (slot > 0) {
-                       showEnrollResult("<FIXME> using slot" + slot);
+                       runChallenge(slot);
                } else {
                        showEnrollResult("Must specify which slot to use");
                }
        }
 
+       public void onActivityResult(int requestCode, int resultCode,
+                                       Intent intent) {
+               Log.v(TAG, "Got activity result");
+               waitingForResult = false;
+               if (resultCode == RESULT_OK) {
+                       String res = intent.getStringExtra("response");
+                       Log.v(TAG, "Response is \"" + res + "\"");
+               } else {
+                       Log.v(TAG, "Error result code " + resultCode);
+               }
+       }
+
        private void showEnrollResult(final String msg) {
                Log.v(TAG, "Show result: \"" + msg + "\"");
 
@@ -95,4 +110,12 @@ public class NFCAuthCREnroll extends Activity
                AlertDialog dialog = builder.create();
                dialog.show();
        }
+
+       private void runChallenge(int slot) {
+               Log.v(TAG, "Launching challenging activity");
+               Intent crIntent = new Intent(this, NFCAuthCRCheck.class);
+               crIntent.putExtra("slot", slot);
+               this.startActivityForResult(crIntent, 0);
+               waitingForResult = true;
+       }
 }