Updated for Android 2.3.3 - no longer needs internal APIs!

codebutler · codebutler · commit 11263919949f · 2011-02-24T16:41:49.000-08:00
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -24,10 +24,10 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.codebutler.farebot"
-    android:versionCode="1"
-    android:versionName="0.1">
+    android:versionCode="2"
+    android:versionName="0.2">
 
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="10" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-feature android:name="android.hardware.nfc" />
     
diff --git a/FareBot.ipr b/FareBot.ipr
@@ -31,17 +31,7 @@
     <module2copyright />
     <LanguageOptions name="XML">
       <option name="fileTypeOverride" value="3" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="block" value="true" />
-      <option name="separateBefore" value="false" />
-      <option name="separateAfter" value="false" />
       <option name="prefixLines" value="false" />
-      <option name="lenBefore" value="80" />
-      <option name="lenAfter" value="80" />
-      <option name="box" value="false" />
-      <option name="filler" value=" " />
     </LanguageOptions>
   </component>
   <component name="DependencyValidationManager">
diff --git a/src/android/nfc/INfcTag.aidl b/src/android/nfc/INfcTag.aidl
diff --git a/src/com/codebutler/farebot/UnsupportedTagException.java b/src/com/codebutler/farebot/UnsupportedTagException.java
@@ -0,0 +1,54 @@
+/*
+ * UnsupportedTagException.java
+ *
+ * Copyright (C) 2011 Eric Butler
+ *
+ * Authors:
+ * Eric Butler <eric@codebutler.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.codebutler.farebot;
+
+public class UnsupportedTagException extends Exception
+{
+    private String[] mTechList;
+    private String   mTagId;
+
+    public UnsupportedTagException (String[] techList, String tagId)
+    {
+        mTechList = techList;
+        mTagId = tagId;
+    }
+
+    public String[] getTechList () {
+        return mTechList;
+    }
+
+    public String getTagId () {
+        return mTagId;
+    }
+
+    @Override
+    public String getMessage ()
+    {
+        StringBuilder builder = new StringBuilder();
+        for (String tech : mTechList) {
+            builder.append("\n  ");
+            builder.append(tech.replace("android.nfc.tech.", ""));
+        }
+        return String.format("Identifier: %s\n\nTechnologies:%s", mTagId, builder.toString());
+    }
+}
diff --git a/src/com/codebutler/farebot/activities/ReadingTagActivity.java b/src/com/codebutler/farebot/activities/ReadingTagActivity.java
@@ -23,21 +23,23 @@
 package com.codebutler.farebot.activities;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.ContentValues;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.nfc.NfcAdapter;
+import android.nfc.Tag;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.TextView;
 import com.codebutler.farebot.R;
+import com.codebutler.farebot.UnsupportedTagException;
 import com.codebutler.farebot.Utils;
 import com.codebutler.farebot.mifare.DesfireCard;
 import com.codebutler.farebot.mifare.MifareCard;
 import com.codebutler.farebot.provider.CardProvider;
 import com.codebutler.farebot.provider.CardsTableColumns;
-import com.codebutler.nfc.NfcInternal;
+import org.apache.commons.lang.ArrayUtils;
 
 public class ReadingTagActivity extends Activity
 {
@@ -63,24 +65,19 @@ private void resolveIntent (Intent intent)
         try {
             Bundle extras = intent.getExtras();
             
-            final byte[] id = extras.getByteArray(NfcAdapter.EXTRA_ID);
-            Log.d("MainActivity", "Found tag with id: " + Utils.getHexString(id));
-            
-            final Object tagObject = extras.getParcelable("android.nfc.extra.TAG");
+            final Tag      tag   = (Tag) extras.getParcelable("android.nfc.extra.TAG");;
+            final String[] techs = tag.getTechList();
 
-            new AsyncTask<Object, String, MifareCard>() {
+            new AsyncTask<Void, String, MifareCard>() {
                 Exception mException;
                 
                 @Override
-                protected MifareCard doInBackground (Object... params) {
+                protected MifareCard doInBackground (Void... params) {
                     try {
-                        Object tagObject = params[0];
-                        String cardType = NfcInternal.getCardType(tagObject);
-
-                        if (cardType.equals("Iso14443-4"))
-                            return DesfireCard.dumpTag(id, tagObject);
+                        if (ArrayUtils.contains(techs, "android.nfc.tech.IsoDep"))
+                            return DesfireCard.dumpTag(tag.getId(), tag);
                         else
-                            throw new Exception(String.format("Unsupported card type: %s\nSerial: %s", cardType, Utils.getHexString(id)));
+                            throw new UnsupportedTagException(techs, Utils.getHexString(tag.getId()));
                     } catch (Exception ex) {
                         mException = ex;
                         return null;
@@ -90,7 +87,21 @@ protected MifareCard doInBackground (Object... params) {
                 @Override
                 protected void onPostExecute (MifareCard card) {
                     if (mException != null) {
-                        Utils.showErrorAndFinish(ReadingTagActivity.this, mException);
+                        if (mException instanceof UnsupportedTagException) {
+                            UnsupportedTagException ex = (UnsupportedTagException) mException;
+                            new AlertDialog.Builder(ReadingTagActivity.this)
+                                .setTitle("Unsupported Tag")
+                                .setMessage(ex.getMessage())
+                                .setCancelable(false)
+                                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                    public void onClick (DialogInterface arg0, int arg1) {
+                                        finish();
+                                    }
+                                })
+                                .show();
+                        } else {
+                            Utils.showErrorAndFinish(ReadingTagActivity.this, mException);
+                        }
                         return;
                     }
 
@@ -115,7 +126,7 @@ protected void onProgressUpdate(String... values) {
                     textView.setText(values[0]);
                 }
                 
-            }.execute(tagObject);
+            }.execute();
             
         } catch (Exception ex) {
             Utils.showErrorAndFinish(this, ex);
diff --git a/src/com/codebutler/farebot/mifare/DesfireCard.java b/src/com/codebutler/farebot/mifare/DesfireCard.java
@@ -22,6 +22,8 @@
 
 package com.codebutler.farebot.mifare;
 
+import android.nfc.Tag;
+import android.nfc.tech.IsoDep;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Base64;
@@ -39,42 +41,54 @@ public class DesfireCard extends MifareCard
     private DesfireManufacturingData mManfData;
     private DesfireApplication[]     mApplications;
 
-    public static DesfireCard dumpTag (byte[] tagId, Object tagObject) throws Exception
+    public static DesfireCard dumpTag (byte[] tagId, Tag tag) throws Exception
     {
         List<DesfireApplication> apps = new ArrayList<DesfireApplication>();
 
-        DesfireProtocol desfireTag = new DesfireProtocol(tagObject);
+        IsoDep tech = IsoDep.get(tag);
 
-        DesfireManufacturingData manufData = desfireTag.getManufacturingData();
+        tech.connect();
 
-        for (int appId : desfireTag.getAppList()) {
-            desfireTag.selectApp(appId);
+        DesfireManufacturingData manufData;
+        DesfireApplication[]     appsArray;
+        
+        try {
+            DesfireProtocol desfireTag = new DesfireProtocol(tech);
+
+            manufData = desfireTag.getManufacturingData();
+
+            for (int appId : desfireTag.getAppList()) {
+                desfireTag.selectApp(appId);
+
+                List<DesfireFile> files = new ArrayList<DesfireFile>();
+
+                for (int fileId : desfireTag.getFileList()) {
+                    try {
+                        DesfireFileSettings settings = desfireTag.getFileSettings(fileId);
+                        byte[] data = null;
+                        if (settings instanceof DesfireFileSettings.StandardDesfireFileSettings)
+                            data = desfireTag.readFile(fileId);
+                        else
+                            data = desfireTag.readRecord(fileId);
+                        files.add(DesfireFile.create(fileId, settings, data));
+                    } catch (Exception ex) {
+                        files.add(new DesfireFile.InvalidDesfireFile(fileId, ex.toString()));
+                    }
+                }
 
-            List<DesfireFile> files = new ArrayList<DesfireFile>();
+                DesfireFile[] filesArray = new DesfireFile[files.size()];
+                files.toArray(filesArray);
 
-            for (int fileId : desfireTag.getFileList()) {
-                try {
-                    DesfireFileSettings settings = desfireTag.getFileSettings(fileId);
-                    byte[] data = null;
-                    if (settings instanceof DesfireFileSettings.StandardDesfireFileSettings)
-                        data = desfireTag.readFile(fileId);
-                    else
-                        data = desfireTag.readRecord(fileId);
-                    files.add(DesfireFile.create(fileId, settings, data));
-                } catch (Exception ex) {
-                    files.add(new DesfireFile.InvalidDesfireFile(fileId, ex.toString()));
-                }
+                apps.add(new DesfireApplication(appId, filesArray));
             }
 
-            DesfireFile[] filesArray = new DesfireFile[files.size()];
-            files.toArray(filesArray);
-            
-            apps.add(new DesfireApplication(appId, filesArray));
+            appsArray = new DesfireApplication[apps.size()];
+            apps.toArray(appsArray);
+        } finally {
+            if (tech.isConnected())
+                tech.close();
         }
 
-        DesfireApplication[] appsArray = new DesfireApplication[apps.size()];
-        apps.toArray(appsArray);
-
         return new DesfireCard(tagId, manufData, appsArray);
     }
 
diff --git a/src/com/codebutler/farebot/mifare/DesfireProtocol.java b/src/com/codebutler/farebot/mifare/DesfireProtocol.java
@@ -22,12 +22,10 @@
 
 package com.codebutler.farebot.mifare;
 
-import android.nfc.NfcAdapter;
+import android.nfc.tech.IsoDep;
 import com.codebutler.farebot.Utils;
-import com.codebutler.nfc.NfcInternal;
 
 import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
 
 public class DesfireProtocol
 {
@@ -46,11 +44,11 @@ public class DesfireProtocol
     static final byte PERMISSION_DENIED = (byte) 0x9D;
     static final byte ADDITIONAL_FRAME  = (byte) 0xAF;
 
-    private Object mTagObject;
+    private IsoDep mTagTech;
 
-    public DesfireProtocol(Object tagObject)
+    public DesfireProtocol(IsoDep tagTech)
     {
-        mTagObject = tagObject;
+        mTagTech = tagTech;
     }
 
     public DesfireManufacturingData getManufacturingData() throws Exception
@@ -132,7 +130,7 @@ private byte[] sendRequest (byte command, byte[] parameters) throws Exception
     {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-        byte[] recvBuffer = NfcInternal.transceive(mTagObject, wrapMessage(command, parameters));
+        byte[] recvBuffer = mTagTech.transceive(wrapMessage(command, parameters));
 
         while (true) {
             if (recvBuffer[recvBuffer.length - 2] != (byte) 0x91)
@@ -144,11 +142,11 @@ private byte[] sendRequest (byte command, byte[] parameters) throws Exception
             if (status == OPERATION_OK) {
                 break;
             } else if (status == ADDITIONAL_FRAME) {
-                recvBuffer = NfcInternal.transceive(mTagObject, wrapMessage(GET_ADDITIONAL_FRAME, null));
+                recvBuffer = mTagTech.transceive(wrapMessage(GET_ADDITIONAL_FRAME, null));
             } else if (status == PERMISSION_DENIED) {
                 throw new Exception("Permission denied");
             } else {
-                throw new Exception("Unknown status code: " + Integer.toHexString(status));
+                throw new Exception("Unknown status code: " + Integer.toHexString(status & 0xFF));
             }
         }
         
diff --git a/src/com/codebutler/nfc/NfcInternal.java b/src/com/codebutler/nfc/NfcInternal.java
