Merge "Messaging notifications do not always come through" into jb-mr1-dev

2 files changed, 19 insertions, 3 deletions

diff --git a/src/com/android/mms/transaction/MessagingNotification.java b/src/com/android/mms/transaction/MessagingNotification.java
index 8812e2c4..0dd7a785 100644
--- a/src/com/android/mms/transaction/MessagingNotification.java
+++ b/src/com/android/mms/transaction/MessagingNotification.java
@@ -204,6 +204,9 @@ public class MessagingNotification {
     public static void setCurrentlyDisplayedThreadId(long threadId) {
         synchronized (sCurrentlyDisplayedThreadLock) {
             sCurrentlyDisplayedThreadId = threadId;
+            if (DEBUG) {
+                Log.d(TAG, "setCurrentlyDisplayedThreadId: " + sCurrentlyDisplayedThreadId);
+            }
         }
     }
 
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index d44015b2..2355a605 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -179,7 +179,7 @@ public class ComposeMessageActivity extends Activity
 
     private static final String TAG = "Mms/compose";
 
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
     private static final boolean TRACE = false;
     private static final boolean LOCAL_LOGV = false;
 
@@ -2176,6 +2176,12 @@ public class ComposeMessageActivity extends Activity
     protected void onPause() {
         super.onPause();
 
+        if (DEBUG) {
+            Log.v(TAG, "onPause: setCurrentlyDisplayedThreadId: " +
+                        MessagingNotification.THREAD_NONE);
+        }
+        MessagingNotification.setCurrentlyDisplayedThreadId(MessagingNotification.THREAD_NONE);
+
         // OLD: stop getting notified of presence updates to update the titlebar.
         // NEW: we are using ContactHeaderWidget which displays presence, but updating presence
         //      there is out of our control.
@@ -2188,8 +2194,6 @@ public class ComposeMessageActivity extends Activity
             mAsyncDialog.clearPendingProgressDialog();
         }
 
-        MessagingNotification.setCurrentlyDisplayedThreadId(MessagingNotification.THREAD_NONE);
-
         // Remember whether the list is scrolled to the end when we're paused so we can rescroll
         // to the end when resumed.
         if (mMsgListAdapter != null &&
@@ -4190,7 +4194,16 @@ public class ComposeMessageActivity extends Activity
 
     private void updateThreadIdIfRunning() {
         if (mIsRunning && mConversation != null) {
+            if (DEBUG) {
+                Log.v(TAG, "updateThreadIdIfRunning: threadId: " +
+                        mConversation.getThreadId());
+            }
             MessagingNotification.setCurrentlyDisplayedThreadId(mConversation.getThreadId());
+        } else {
+            if (DEBUG) {
+                Log.v(TAG, "updateThreadIdIfRunning: mIsRunning: " + mIsRunning +
+                        " mConversation: " + mConversation);
+            }
         }
         // If we're not running, but resume later, the current thread ID will be set in onResume()
     }