X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fnfcauthcr%2FQueryCrToken.java;h=68a8d0e9762e1a04d71a7e948c7d7f56cd5eb749;hp=903aefb4a39937d69a098f529f6ede80e0d28d87;hb=edfc8d9f2aad0bd7c0810d9f67a67e3db4b266c0;hpb=0c96e6ff75abc6adfa713c00963fd14f5de2f34c

diff --git a/src/org/average/nfcauthcr/QueryCrToken.java b/src/org/average/nfcauthcr/QueryCrToken.java
index 903aefb..68a8d0e 100644
--- a/src/org/average/nfcauthcr/QueryCrToken.java
+++ b/src/org/average/nfcauthcr/QueryCrToken.java
@@ -1,4 +1,4 @@
-package org.average.nfcauthcr;
+package org.average.ykneocr;
 
 import java.util.ArrayList;
 
@@ -18,7 +18,7 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.average.nfcauthcr.NfcCRdispatch;
+import org.average.ykneocr.NfcCRdispatch;
 
 public class QueryCrToken extends Activity {
 
@@ -39,6 +39,14 @@ public class QueryCrToken extends Activity {
 		super.onResume();
 		Log.v(TAG, "Starting the work");
 
+		setResult(RESULT_CANCELED);
+		int slot = prefs.getInt("slot_number", -1);
+		if (slot != 1 && slot != 2) {
+			Log.e(TAG, "Slot " + slot + " cannot be used");
+			Toast.makeText(this, R.string.need_slot,
+						Toast.LENGTH_LONG).show();
+			finish();
+		}
 		new AlertDialog.Builder(this)
 			.setTitle(R.string.challenging)
 			.setMessage(R.string.swipe)
@@ -54,9 +62,7 @@ public class QueryCrToken extends Activity {
 		Intent intent = getIntent();
 		ArrayList<String> challenge =
 				intent.getStringArrayListExtra("challenge");
-		int slot = prefs.getInt("slot_number", -1);
 		intent.putExtra("yubikey_neo_slot", slot);
-		setResult(RESULT_CANCELED);
 		if (challenge != null) {
 			dispatch.onResume(challenge);
 		} else {