some minute work on the service provider

JeroenDeDauw · Nov 27, 2010 · eeecfac · eeecfac
1 parent 01f4f53
commit eeecfac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/bin/Pamela-for-Android.apk b/bin/Pamela-for-Android.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/src/pamela/client/PamelaColumns.java b/src/pamela/client/PamelaColumns.java
@@ -16,9 +16,14 @@ public final class PamelaColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/notes");
 
     /**
-     * The MIME type of {@link #CONTENT_URI} providing a directory of notes.
+     * The MIME type of {@link #CONTENT_URI} providing a directory of services.
      */
-    public static final String CONTENT_TYPE = "pamela.client";
+    public static final String CONTENT_TYPE = "pamela.client.dit";
+
+    /**
+     * The MIME type of {@link #CONTENT_URI} providing a single service.
+     */
+    public static final String CONTENT_ITEM_TYPE = "pamela.client.item";    
 
     /**
      * The timestamp for when the note was created

diff --git a/src/pamela/client/PamelaServiceProvider.java b/src/pamela/client/PamelaServiceProvider.java
@@ -79,31 +79,19 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
         qb.setTables(DEVICES_TABLE_NAME);
 
         switch (uriMatcher.match(uri)) {
-	        case NOTES:
+	        case SERVICES:
 	            qb.setProjectionMap(sNotesProjectionMap);
 	            break;
 
-	        case NOTE_ID:
+	        case SERVICE_ID:
 	            qb.setProjectionMap(sNotesProjectionMap);
 	            qb.appendWhere(NoteColumns._ID + "=" + uri.getPathSegments().get(1));
 	            break;
 
-	        case LIVE_FOLDER_NOTES:
-	            qb.setProjectionMap(sLiveFolderProjectionMap);
-	            break;
-
 	        default:
 	            throw new IllegalArgumentException("Unknown URI " + uri);
         }
 
-        // If no sort order is specified use the default
-        String orderBy;
-        if (TextUtils.isEmpty(sortOrder)) {
-            orderBy = NoteColumns.DEFAULT_SORT_ORDER;
-        } else {
-            orderBy = sortOrder;
-        }
-
         // Get the database and run the query
         SQLiteDatabase db = mOpenHelper.getReadableDatabase();
         Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy);