commit e676b8223ffc6a77acd8b36125f200fa30424efe
author Tom Taylor <tomtaylor@google.com> Wed Nov 11 14:34:10 2009 -0800
committer Tom Taylor <tomtaylor@google.com> Wed Nov 11 14:34:10 2009 -0800
tree 853a6225d299d372becbe2f3ac505f01c3bc0fe5
parent 6595d80abc6ab706ae296e9e51351c8ef6299219

Fix a draft mix-up bug

There's a particular situation that'll cause ComposeMessageActivity
to choose an existing draft even though the new intent is for a totally
different contact. Fixes bug 2254833.

Change-Id: I1065806c7535a48e1c27140c4c76ccf9b9959c03

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 94a76e1..d550095 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -1781,7 +1781,8 @@
             log("     new conversation=" + conversation + ", mConversation=" + mConversation);
         }
 
-        if (sameThread || conversation.getThreadId() == mConversation.getThreadId()) {
+        long convThreadId = conversation.getThreadId();
+        if (sameThread || (convThreadId != 0 && convThreadId == mConversation.getThreadId())) {
             if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                 log("onNewIntent: same conversation");
             }