From 6605115ec4bd02f9adf190e0b390ceed783bde5b Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Fri, 13 Jan 2012 15:02:45 -0800
Subject: [PATCH] Set notify uri for queries; trigger notify on message inserts

Change-Id: I9fdf2f83670ec72937deebe352e962632f37b519
---
 .../android/email/provider/EmailProvider.java | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 892b64e92..5eb8f5c86 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1612,6 +1612,9 @@ public class EmailProvider extends ContentProvider {
         }
     }
 
+    private static final Uri UIPROVIDER_NEW_MESSAGE_NOTIFIER =
+            Uri.parse("content://" + EmailContent.AUTHORITY + "/uimessages");
+
     @Override
     public Uri insert(Uri uri, ContentValues values) {
         int match = findMatch(uri, "insert");
@@ -1650,6 +1653,9 @@ public class EmailProvider extends ContentProvider {
                     longId = db.insert(TABLE_NAMES[table], "foo", values);
                     resultUri = ContentUris.withAppendedId(uri, longId);
                     switch(match) {
+                        case MESSAGE:
+                            resolver.notifyChange(UIPROVIDER_NEW_MESSAGE_NOTIFIER, null);
+                            break;
                         case MAILBOX:
                             if (values.containsKey(MailboxColumns.TYPE)) {
                                 // Only cache special mailbox types
@@ -2925,6 +2931,8 @@ outer:
     private Cursor uiQuery(int match, Uri uri, String[] uiProjection) {
         Context context = getContext();
         SQLiteDatabase db = getDatabase(context);
+        // Should we ever return null, or throw an exception??
+        Cursor c = null;
         switch(match) {
             case UI_FOLDERS:
                 // We are passed the email address (unique account identifier) in the uri; we
@@ -2932,17 +2940,23 @@ outer:
                 String accountName = uri.getPathSegments().get(1);
                 long acctId = findAccountIdByName(accountName);
                 if (acctId == Account.NO_ACCOUNT) return null;
-                return db.rawQuery(genQueryAccountMailboxes(uiProjection),
+                c = db.rawQuery(genQueryAccountMailboxes(uiProjection),
                         new String[] {Long.toString(acctId)});
+                break;
             case UI_MESSAGES:
                 String id = uri.getPathSegments().get(1);
-                return db.rawQuery(genQueryMailboxMessages(uiProjection), new String[] {id});
+                c = db.rawQuery(genQueryMailboxMessages(uiProjection), new String[] {id});
+                break;
             case UI_MESSAGE:
                 id = uri.getPathSegments().get(1);
-                return db.rawQuery(genQueryViewMessage(uiProjection), new String[] {id});
+                c = db.rawQuery(genQueryViewMessage(uiProjection), new String[] {id});
+                break;
         }
-        // Not sure whether to throw an exception here, but we return null for now
-        return null;
+        if (c != null) {
+            // Notify UIProvider on changes
+            c.setNotificationUri(context.getContentResolver(), uri);
+        }
+        return c;
     }
 
     private int uiSendmail(Uri uri, ContentValues values) {