commit bd8acad098abbf074184aa1273d269f7f7a54b37
author Scott Kennedy <skennedy@google.com> Wed May 29 10:22:25 2013 -0700
committer Scott Kennedy <skennedy@google.com> Wed May 29 10:22:25 2013 -0700
tree 9838698fd12061fd616bb7e264b24603ad87a442
parent 1b30609b36dc7388307e3a0b3652153b4ead8499

Only create one intent per notification

Change-Id: I0046017e6da2941b40ebd2762b5188a62fadef34

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

diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 102f58c..1e2ffaf 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -555,14 +555,15 @@
             if (unreadCount > 0) {
                 // How can I order this properly?
                 if (cursor.moveToNext()) {
-                    Intent notificationIntent = createViewConversationIntent(context, account,
-                            folder, null);
+                    final Intent notificationIntent;
 
-                    // Launch directly to the conversation, if the
-                    // number of unseen conversations == 1
+                    // Launch directly to the conversation, if there is only 1 unseen conversation
                     if (unseenCount == 1) {
                         notificationIntent = createViewConversationIntent(context, account, folder,
                                 cursor);
+                    } else {
+                        notificationIntent = createViewConversationIntent(context, account, folder,
+                                null);
                     }
 
                     if (notificationIntent == null) {