import android.widget.TextView;
import android.widget.RadioButton;
-import org.average.nfcauthcr.Check;
+import org.average.nfcauthcr.TagEvent;
public class Enroll extends Activity {
@Override
protected void onPause() {
super.onPause();
- Log.v(TAG, "Going inactive, try to stop");
- if (!waitingForResult) { finish(); }
}
@Override
if (slot > 0) {
runEnrollment(slot);
} else {
- showEnrollResult("Must specify which slot to use");
+ showEnrollResult(R.string.need_slot);
}
}
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) {
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) {