Merge Matthew's changes.

MyTracks/src/com/google/android/apps/mytracks/content/ContentTypeIds.java

@@ -27,6 +27,7 @@ public class ContentTypeIds {
   public static final byte FLOAT_TYPE_ID = 3;
   public static final byte DOUBLE_TYPE_ID = 4;
   public static final byte STRING_TYPE_ID = 5;
+  public static final byte BLOB_TYPE_ID = 6;
 
   private ContentTypeIds() { /* Not instantiable */ }
 }

MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupColumns.java

@@ -25,10 +25,11 @@ public class BackupColumns {
   public static final String[] POINTS_BACKUP_COLUMNS =
       { TrackPointsColumns._ID, TrackPointsColumns.TRACKID, TrackPointsColumns.LATITUDE,
         TrackPointsColumns.LONGITUDE, TrackPointsColumns.ALTITUDE, TrackPointsColumns.BEARING,
-        TrackPointsColumns.TIME, TrackPointsColumns.ACCURACY, TrackPointsColumns.SPEED };
+        TrackPointsColumns.TIME, TrackPointsColumns.ACCURACY, TrackPointsColumns.SPEED,
+        TrackPointsColumns.SENSOR };
   public static final byte[] POINTS_BACKUP_COLUMN_TYPES =
       { LONG_TYPE_ID, LONG_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID, FLOAT_TYPE_ID,
-        FLOAT_TYPE_ID, LONG_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID };
+        FLOAT_TYPE_ID, LONG_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, BLOB_TYPE_ID };
 
   public static final String[] TRACKS_BACKUP_COLUMNS = {
       TracksColumns._ID, TracksColumns.NAME, TracksColumns.DESCRIPTION, TracksColumns.CATEGORY,

MyTracks/src/com/google/android/apps/mytracks/io/backup/DatabaseDumper.java

@@ -169,7 +169,7 @@ class DatabaseDumper {
    * Writes a single cell of the database to the output.
    *
    * @param columnIdx the column index to read from
-   * @param columnType the type of the column to be read
+   * @param columnTypeId the type of the column to be read
    * @param cursor the cursor to read from
    * @throws IOException if there are any errors while writing
    */
@@ -195,6 +195,12 @@ class DatabaseDumper {
       case ContentTypeIds.STRING_TYPE_ID:
         writer.writeUTF(cursor.getString(columnIdx));
         return;
+      case ContentTypeIds.BLOB_TYPE_ID: {
+        byte[] blob = cursor.getBlob(columnIdx);
+        writer.writeInt(blob.length);
+        writer.write(blob);
+        return;
+      }
       default:
         throw new IllegalArgumentException(
             "Type " + columnTypeId + " not supported");
@@ -204,7 +210,7 @@ class DatabaseDumper {
   /**
    * Writes a dummy cell value to the output.
    *
-   * @param columnType the type of the value to write
+   * @param columnTypeId the type of the value to write
    * @throws IOException if there are any errors while writing
    */
   private void writeDummyCell(byte columnTypeId, DataOutputStream writer)
@@ -228,6 +234,9 @@ class DatabaseDumper {
       case ContentTypeIds.STRING_TYPE_ID:
         writer.writeUTF("");
         return;
+      case ContentTypeIds.BLOB_TYPE_ID:
+        writer.writeInt(0);
+        return;
       default:
         throw new IllegalArgumentException(
             "Type " + columnTypeId + " not supported");

MyTracks/src/com/google/android/apps/mytracks/io/backup/DatabaseImporter.java

@@ -173,6 +173,23 @@ public class DatabaseImporter {
         if (values != null) { values.put(name, value); }
         return;
       }
+      case ContentTypeIds.BLOB_TYPE_ID: {
+        int blobLength = reader.readInt();
+        if (blobLength != 0) {
+          byte[] blob = new byte[blobLength];
+          int readBytes = reader.read(blob, 0, blobLength);
+          if (readBytes != blobLength) {
+            throw new IOException(String.format(
+                "Short read on column %s; expected %d bytes, read %d",
+                name, blobLength, readBytes));
+          }
+          
+          if (values != null) {
+            values.put(name, blob);
+          }
+        }
+        return;
+      }
       default:
         throw new IOException("Read unknown type " + typeId);
     }

MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java

@@ -34,6 +34,11 @@ public class ApiFeatures {
   public static final int ANDROID_API_LEVEL = Integer.parseInt(
       Build.VERSION.SDK);
   
+  private static final String PLATFORM_ADAPTER_GINGERBREAD =
+    "com.google.android.apps.mytracks.util.GingerbreadPlatformAdapter";
+  private static final String PLATFORM_ADAPTER_ECLAIR =
+    "com.google.android.apps.mytracks.util.EclairPlatformAdapter";
+  
   private static ApiFeatures instance;
   
   /**
@@ -63,15 +68,28 @@ public class ApiFeatures {
    */
   protected ApiFeatures() {
     if (getApiLevel() >= 9) {
-      apiPlatformAdapter = new GingerbreadPlatformAdapter();
+      apiPlatformAdapter = createPlatformAdapter(PLATFORM_ADAPTER_GINGERBREAD);
     } else if (getApiLevel() >= 5) {
-      apiPlatformAdapter = new EclairPlatformAdapter();
+      apiPlatformAdapter = createPlatformAdapter(PLATFORM_ADAPTER_ECLAIR);
     } else {
-      Log.i(MyTracksConstants.TAG,
-          "ApiFeatures: Using default platform adapter");
       // Cupcake adapter is always supported, so it's safe to do static linkage.
       apiPlatformAdapter = new CupcakePlatformAdapter();
     }
+    
+    Log.i(MyTracksConstants.TAG, "Using platform adapter " + apiPlatformAdapter.getClass());
+  }
+  
+  private static ApiPlatformAdapter createPlatformAdapter(String className) {
+    try {
+      Class<?> clazz = Class.forName(className);
+      return (ApiPlatformAdapter) clazz.newInstance();
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException("ApiFeatures: Unable to find " + className, e);
+    } catch (InstantiationException e) {
+      throw new RuntimeException("ApiFeatures: Unable to instantiate " + className, e);
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException("ApiFeatures: Unable to access " + className, e);
+    }
   }
 
   public ApiPlatformAdapter getApiPlatformAdapter() {