commit b8d4622886695d60f30dbbbd7146321e2da0cb31
author Tom Taylor <tomtaylor@google.com> Tue Jan 25 14:29:19 2011 -0800
committer Tom Taylor <tomtaylor@google.com> Tue Jan 25 14:29:19 2011 -0800
tree 007476c55f8a944d3e3c08f2476b88d72aab732e
parent d3248f268cf8f4491bf35373123b7ba8af6ba221

Fix crash in WorkingMessage.saveAsMms

A set of steps will correctly cause the working message to get marked
as discarded. However, when restarting, the discarded working message
was not replaced with a good working message. Bug 1866477

Change-Id: I4b42402e3d539df2792b20fa5c3a2f4567085f08

src/com/android/mms/ui/ComposeMessageActivity.java

diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 44ca7f6..ee102ea 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -1888,6 +1888,10 @@
                 mWorkingMessage.unDiscard();    // it was discarded in onStop().
             } else if (isRecipientsEditorVisible()) {
                 goToConversationList();
+            } else {
+                loadDraft();
+                mWorkingMessage.setConversation(mConversation);
+                mAttachmentEditor.update(mWorkingMessage);
             }
         }
     }