X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FEnroll.java;h=d8e623df72135802f896d7f8a2a797e79663df15;hp=96fa3147b7ac79c8c8e44d0386a2c925959bd3fc;hb=3930ad3656ed5ef6a86c9da684733449a591bbc2;hpb=0c96e6ff75abc6adfa713c00963fd14f5de2f34c

diff --git a/src/org/average/nfcauthcr/Enroll.java b/src/org/average/nfcauthcr/Enroll.java
index 96fa314..d8e623d 100644
--- a/src/org/average/nfcauthcr/Enroll.java
+++ b/src/org/average/nfcauthcr/Enroll.java
@@ -1,4 +1,4 @@
-package org.average.nfcauthcr;
+package org.average.ykneocr;
 
 import java.util.Random;
 
@@ -14,7 +14,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.RadioButton;
 
-import org.average.nfcauthcr.QueryCrToken;
+import org.average.ykneocr.QueryCrToken;
 
 public class Enroll extends Activity {
 
@@ -60,67 +60,4 @@ public class Enroll extends Activity {
 		editor.commit();
 		Log.v(TAG, "stored slot number " + slot);
 	}
-
-	public void onEnrollClicked(View view) {
-		Log.v(TAG, "Enroll clicked");
-		if (slot > 0) {
-			runEnrollment(slot);
-		} else {
-			showEnrollResult(R.string.need_slot);
-		}
-	}
-
-	public void onActivityResult(int requestCode, int resultCode,
-					Intent intent) {
-		Log.v(TAG, "Got activity result");
-		waitingForResult = false;
-
-		if (resultCode != RESULT_OK) {
-			Log.v(TAG, "Error result code " + resultCode);
-			return;
-		}
-		byte[] challenge = intent.getByteArrayExtra("challenge");
-		Log.v(TAG, "Challenge is \"" + hex(challenge) + "\"");
-		byte[] response = intent.getByteArrayExtra("response");
-		Log.v(TAG, "Response is  \"" + hex(response) + "\"");
-		Editor editor = prefs.edit();
-		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(int messageid) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.enrollresult);
-		builder.setMessage(messageid);
-		builder.setPositiveButton(android.R.string.ok,
-				new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int which) {
-				dialog.dismiss();
-				if (!waitingForResult) { finish(); }
-			}
-		});
-		AlertDialog dialog = builder.create();
-		dialog.show();
-	}
-
-	private void runEnrollment(int slot) {
-		Random rng = new Random();
-		byte[] challenge = new byte[63];
-		rng.nextBytes(challenge);
-		Log.v(TAG, "Random challenge: " + hex(challenge));
-		Intent crIntent = new Intent(this, QueryCrToken.class);
-		crIntent.putExtra("challenge", challenge);
-		waitingForResult = true;
-		this.startActivityForResult(crIntent, 0);
-	}
-
-	private String hex(byte[] a) {
-		StringBuilder sb = new StringBuilder();
-		if (a == null) return "<null>";
-		for (byte b: a) sb.append(String.format("%02x", b&0xff));
-		return sb.toString();
-	}
 }