X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FEnroll.java;h=8d90488dbc41e34e665aea4e9c84a76b71b93211;hp=190c08ff921c190b65754e5d3b01eb4ae9f5c331;hb=bb4b51c880cf9a1942151bf1dd8977e3a8e0ccf6;hpb=8a70d0c43bdcbcd7d26901cfcb1740a74c1a1199

diff --git a/src/org/average/nfcauthcr/Enroll.java b/src/org/average/nfcauthcr/Enroll.java
index 190c08f..8d90488 100644
--- a/src/org/average/nfcauthcr/Enroll.java
+++ b/src/org/average/nfcauthcr/Enroll.java
@@ -24,6 +24,7 @@ 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)
@@ -88,6 +89,10 @@ 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);
@@ -125,12 +130,27 @@ 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);
 		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();
 	}
 
 	private String hex(byte[] a) {