Merge "Fix message starring via overflow" into ub-gmail-ur14-dev

2 files changed, 16 insertions, 1 deletions

diff --git a/src/com/android/mail/browse/ConversationMessage.java b/src/com/android/mail/browse/ConversationMessage.java
index cabffc589..36ab441b2 100644
--- a/src/com/android/mail/browse/ConversationMessage.java
+++ b/src/com/android/mail/browse/ConversationMessage.java
@@ -94,6 +94,21 @@ public final class ConversationMessage extends Message {
         return c != null && c.isConversationStarred();
     }
 
+    /**
+     * Sets the starred state of this Message object and also updates the cached instance in
+     * {@link MessageCursor} (if not null)
+     *
+     * @param starred new starred state
+     */
+    public void setStarredInConversation(boolean starred) {
+        this.starred = starred;
+        final MessageCursor c = mController.getMessageCursor();
+        if (c != null) {
+            final ConversationMessage other = c.getMessageForId(id);
+            other.starred = starred;
+        }
+    }
+
     public void star(boolean newStarred) {
         final ConversationUpdater listController = mController.getListController();
         if (listController != null) {
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index f273006be..94ad2cb51 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -1983,7 +1983,7 @@ public abstract class AbstractActivityController implements ActivityController,
             return;
         }
 
-        msg.starred = starred;
+        msg.setStarredInConversation(starred);
 
         // locally propagate the change to the owning conversation
         // (figure the provider will properly propagate the change when it commits it)