commit 1367d09b1cb2ea08f2e105672262ade08e1f5895
author Paul Westbrook <pwestbro@google.com> Wed Oct 02 01:42:32 2013 -0700
committer Paul Westbrook <pwestbro@google.com> Wed Oct 02 01:42:32 2013 -0700
tree d50dea8159f4cecbffa17d763c05824091324acc
parent 5cb7180c32b279660db86012aa68e80f5bcf5bc7

Don't populate the request bundles lazily

If two threads attempt to construct Conversation objects at the same time,
there is a race condition when the bundle request is populated, and when
it is used.

Now, populate the request bundles at static initialization time

Bug: 11009982
Change-Id: I1811bedaad25acd9a3031cc996950ab656e18444

src/com/android/mail/providers/Conversation.java

diff --git a/src/com/android/mail/providers/Conversation.java b/src/com/android/mail/providers/Conversation.java
index 639cbe2..82bf1b9 100644
--- a/src/com/android/mail/providers/Conversation.java
+++ b/src/com/android/mail/providers/Conversation.java
@@ -30,6 +30,7 @@
 import com.android.mail.browse.ConversationCursor;
 import com.android.mail.content.CursorCreator;
 import com.android.mail.providers.UIProvider.ConversationColumns;
+import com.android.mail.providers.UIProvider.ConversationCursorCommand;
 import com.android.mail.ui.ConversationCursorLoader;
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
@@ -460,8 +461,24 @@
         return conversation;
     }
 
-    private static final Bundle sConversationInfoRequest = new Bundle(1);
-    private static final Bundle sRawFoldersRequest = new Bundle(1);
+    private static final Bundle CONVERSATION_INFO_REQUEST;
+    private static final Bundle RAW_FOLDERS_REQUEST;
+
+    static {
+        RAW_FOLDERS_REQUEST = new Bundle(2);
+        RAW_FOLDERS_REQUEST.putBoolean(
+                ConversationCursorCommand.COMMAND_GET_RAW_FOLDERS, true);
+        RAW_FOLDERS_REQUEST.putInt(
+                ConversationCursorCommand.COMMAND_KEY_OPTIONS,
+                ConversationCursorCommand.OPTION_MOVE_POSITION);
+
+        CONVERSATION_INFO_REQUEST = new Bundle(2);
+        CONVERSATION_INFO_REQUEST.putBoolean(
+                ConversationCursorCommand.COMMAND_GET_CONVERSATION_INFO, true);
+        CONVERSATION_INFO_REQUEST.putInt(
+                ConversationCursorCommand.COMMAND_KEY_OPTIONS,
+                ConversationCursorCommand.OPTION_MOVE_POSITION);
+    }
 
     private static ConversationInfo readConversationInfo(Cursor cursor) {
         final ConversationInfo ci;
@@ -474,16 +491,9 @@
             }
         }
 
-        final String key = UIProvider.ConversationCursorCommand.COMMAND_GET_CONVERSATION_INFO;
-        if (sConversationInfoRequest.isEmpty()) {
-            sConversationInfoRequest.putBoolean(key, true);
-            sConversationInfoRequest.putInt(
-                    UIProvider.ConversationCursorCommand.COMMAND_KEY_OPTIONS,
-                    UIProvider.ConversationCursorCommand.OPTION_MOVE_POSITION);
-        }
-        final Bundle response = cursor.respond(sConversationInfoRequest);
-        if (response.containsKey(key)) {
-            ci = response.getParcelable(key);
+        final Bundle response = cursor.respond(CONVERSATION_INFO_REQUEST);
+        if (response.containsKey(ConversationCursorCommand.COMMAND_GET_CONVERSATION_INFO)) {
+            ci = response.getParcelable(ConversationCursorCommand.COMMAND_GET_CONVERSATION_INFO);
         } else {
             // legacy fallback
             ci = ConversationInfo.fromBlob(cursor.getBlob(UIProvider.CONVERSATION_INFO_COLUMN));
@@ -502,16 +512,9 @@
             }
         }
 
-        final String key = UIProvider.ConversationCursorCommand.COMMAND_GET_RAW_FOLDERS;
-        if (sRawFoldersRequest.isEmpty()) {
-            sRawFoldersRequest.putBoolean(key, true);
-            sRawFoldersRequest.putInt(
-                    UIProvider.ConversationCursorCommand.COMMAND_KEY_OPTIONS,
-                    UIProvider.ConversationCursorCommand.OPTION_MOVE_POSITION);
-        }
-        final Bundle response = cursor.respond(sRawFoldersRequest);
-        if (response.containsKey(key)) {
-            fl = response.getParcelable(key);
+        final Bundle response = cursor.respond(RAW_FOLDERS_REQUEST);
+        if (response.containsKey(ConversationCursorCommand.COMMAND_GET_RAW_FOLDERS)) {
+            fl = response.getParcelable(ConversationCursorCommand.COMMAND_GET_RAW_FOLDERS);
         } else {
             // legacy fallback
             // TODO: delete this once Email supports the respond call