commit 91d0b86db3287f1702913177d347dd42b7d13764
author Marc Blank <mblank@google.com> Wed May 23 13:38:33 2012 -0700
committer Marc Blank <mblank@google.com> Wed May 23 13:43:24 2012 -0700
tree c2f95d91e9102bd17d31069718cc64fa0795cc14
parent b114841b6f2a91d92b8d0af4ec05ce81a5ba5599

Support widget notification per folder and utility method

* Needed by EmailProvider to make notifications more efficient

Change-Id: I13961cde8fb4919b7e942d42482eeb9a918c844d

src/com/android/mail/utils/Utils.java

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index 74d88da..b8e73cf 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -79,6 +79,7 @@
     public static final String EXTRA_ACCOUNT = "account";
     public static final String EXTRA_ACCOUNT_STRING = "accountString";
     public static final String EXTRA_ACCOUNT_URI = "accountUri";
+    public static final String EXTRA_FOLDER_URI = "folderUri";
     public static final String EXTRA_COMPOSE_URI = "composeUri";
     public static final String EXTRA_CONVERSATION = "conversationUri";
     public static final String EXTRA_FOLDER = "folder";

src/com/android/mail/widget/BaseWidgetProvider.java

diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java
index 760bbd3..cab13a0 100644
--- a/src/com/android/mail/widget/BaseWidgetProvider.java
+++ b/src/com/android/mail/widget/BaseWidgetProvider.java
@@ -101,6 +101,25 @@
     }
 
     /**
+     * Get an array of account/mailbox string pairs for currently configured widgets
+     * @return the account/mailbox string pairs
+     */
+    static public String[][] getWidgetInfo(Context context, int[] widgetIds) {
+        String[][] widgetInfo = new String[widgetIds.length][2];
+        for (int i = 0; i < widgetIds.length; i++) {
+            // Retrieve the persisted information for this widget from
+            // preferences.
+            final String accountFolder = Persistence.getPreferences(context).getString(
+                    WIDGET_ACCOUNT_PREFIX + widgetIds[i], null);
+            // If the account matched, update the widget.
+            if (accountFolder != null) {
+                widgetInfo[i] = TextUtils.split(accountFolder, ACCOUNT_FOLDER_PREFERENCE_SEPARATOR);
+            }
+        }
+        return widgetInfo;
+    }
+
+    /**
      * Catches ACTION_NOTIFY_DATASET_CHANGED intent and update the corresponding
      * widgets.
      */
@@ -113,9 +132,10 @@
         if (Utils.ACTION_NOTIFY_DATASET_CHANGED.equals(intent.getAction())) {
             final Bundle extras = intent.getExtras();
             final Uri accountUri = (Uri)extras.getParcelable(Utils.EXTRA_ACCOUNT_URI);
+            final Uri folderUri = (Uri)extras.getParcelable(Utils.EXTRA_FOLDER_URI);
             final boolean updateAllWidgets = extras.getBoolean(EXTRA_UPDATE_ALL_WIDGETS, false);
 
-            if (accountUri == null && !updateAllWidgets) {
+            if (accountUri == null && folderUri == null && !updateAllWidgets) {
                 return;
             }
             final Set<Integer> widgetsToUpdate = Sets.newHashSet();
@@ -129,12 +149,20 @@
                 if (accountFolder != null) {
                     final String[] parsedInfo = TextUtils.split(accountFolder,
                             ACCOUNT_FOLDER_PREFERENCE_SEPARATOR);
-                    if (updateAllWidgets ||
-                            TextUtils.equals(accountUri.toString(), parsedInfo[0])) {
+                    boolean updateThis = updateAllWidgets;
+                    if (!updateThis) {
+                        if (accountUri != null &&
+                                TextUtils.equals(accountUri.toString(), parsedInfo[0])) {
+                            updateThis = true;
+                        } else if (folderUri != null &&
+                                TextUtils.equals(folderUri.toString(), parsedInfo[1])) {
+                            updateThis = true;
+                        }
+                    }
+                    if (updateThis) {
                         widgetsToUpdate.add(id);
                     }
                 }
-
             }
             if (widgetsToUpdate.size() > 0) {
                 final int[] widgets = Ints.toArray(widgetsToUpdate);