move swipeDialog to activity

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

diff --git a/src/org/average/nfcauthcr/Check.java b/src/org/average/nfcauthcr/Check.java
index 27a3d7161acfc7fe444c10564acb6d16ebf9d736..6b6ec4f568f79e043ea47cef0888432bb38257b4 100644 (file)
--- a/src/org/average/nfcauthcr/Check.java
+++ b/src/org/average/nfcauthcr/Check.java
@@ -1,68 +1,49 @@
 package org.average.nfcauthcr;
 
-import android.app.Service;
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.PendingIntent;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.nfc.NfcAdapter;
 import android.nfc.Tag;
 import android.nfc.TagLostException;
 import android.nfc.tech.IsoDep;
-import android.os.Binder;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.average.nfcauthcr.CheckConnector;
 import org.average.nfcauthcr.YkNeo;
 import org.average.nfcauthcr.CRException;
 
-public class Check extends Service {
+public class Check extends Activity {
 
        private final String TAG = getClass().getName();
 
-       private final CheckConnector checkConnector = new CheckConnector();
-       private SharedPreferences prefs;
-       private int startId;
        private PendingIntent tagIntent;
 
        @Override
-       public void onCreate() {
-               Log.v(TAG, "Created");
-               prefs = PreferenceManager.getDefaultSharedPreferences(this);
-       }
+       protected void onResume() {
+               super.onResume();
+               Log.v(TAG, "Starting the work");
 
-       @Override
-       public int onStartCommand (Intent intent, int flags, int startId) {
-               Log.v(TAG, "Starting service");
-               this.startId = startId;
-               int slot = prefs.getInt("slot_number", -1);
+               Intent intent = getIntent();
+               setResult(RESULT_CANCELED);
+               int slot = intent.getIntExtra("slot", -1);
                if (slot > 0) {
                        enableDispatch(slot);
-               } else {
-                       stopSelf(startId);
                }
-               return START_NOT_STICKY;
        }
 
        @Override
-       public IBinder onBind(Intent intent) {
-               Log.v(TAG, "Binding");
-               checkConnector.setService(this);
-               return checkConnector;
-       }
+       protected void onPause() {
+               super.onPause();
+               Log.v(TAG, "Finished the work");
 
-       @Override
-       public void onDestroy() {
-               Log.v(TAG, "Finished the run");
                disableDispatch();
        }
 
-       @Override
-       protected void onNewIntent(Intent intent) {
+       public void onNewIntent(Intent intent) {
                Log.v(TAG, "NFC Intent arrived");
                int slot = intent.getIntExtra("slot", -1);
                byte[] challenge = intent.getByteArrayExtra("challenge");
@@ -84,19 +65,6 @@ public class Check extends Service {
                finish();
        }
 
-       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) {
-                               finish();
-                       }
-               });
-               return builder.create();
-       }
-
 /*
 <receiver android:name=".IsoDepReceiver"
           android:label="IsoDepReceiver">