From 7323fe67fd3b643d29c0b294703c37d70960c106 Mon Sep 17 00:00:00 2001
From: Bao-Long Nguyen-Trong <baolongnt@gmail.com>
Date: Tue, 20 Oct 2009 04:59:02 +0000
Subject: [PATCH] Minor cleanup so that we only broadcast the message received
 intent once

---
 .../IntentBroadcastingMessagingListener.java  | 34 +++++++++++++++++++
 .../android/email/MessagingController.java    |  2 ++
 src/com/android/email/MessagingListener.java  | 23 +------------
 3 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 src/com/android/email/IntentBroadcastingMessagingListener.java

diff --git a/src/com/android/email/IntentBroadcastingMessagingListener.java b/src/com/android/email/IntentBroadcastingMessagingListener.java
new file mode 100644
index 000000000..97966043a
--- /dev/null
+++ b/src/com/android/email/IntentBroadcastingMessagingListener.java
@@ -0,0 +1,34 @@
+package com.android.email;
+
+import android.content.Context;
+import android.net.Uri;
+import android.util.Log;
+import com.android.email.mail.Address;
+import com.android.email.mail.Message;
+import com.android.email.mail.MessagingException;
+
+public class IntentBroadcastingMessagingListener
+    extends MessagingListener {
+
+    @Override
+    public void synchronizeMailboxNewMessage(Context context, Account account, String folder, Message message) {
+        try {
+            Uri uri = Uri.parse("email://messages/" + account.getAccountNumber() + "/" + Uri.encode(folder) + "/" + Uri.encode(message.getUid()));
+            android.content.Intent intent = new android.content.Intent(Intent.ACTION_EMAIL_RECEIVED, uri);
+            intent.putExtra(Intent.EXTRA_ACCOUNT, account.getDescription());
+            intent.putExtra(Intent.EXTRA_FOLDER, folder);
+            intent.putExtra(Intent.EXTRA_SENT_DATE, message.getSentDate());
+            intent.putExtra(Intent.EXTRA_FROM, Address.toString(message.getFrom()));
+            intent.putExtra(Intent.EXTRA_TO, Address.toString(message.getRecipients(Message.RecipientType.TO)));
+            intent.putExtra(Intent.EXTRA_CC, Address.toString(message.getRecipients(Message.RecipientType.CC)));
+            intent.putExtra(Intent.EXTRA_BCC, Address.toString(message.getRecipients(Message.RecipientType.BCC)));
+            intent.putExtra(Intent.EXTRA_SUBJECT, message.getSubject());
+            context.sendBroadcast(intent);
+            Log.d(Email.LOG_TAG, "Broadcasted intent: " + message.getSubject());
+        }
+        catch (MessagingException e) {
+            Log.w(Email.LOG_TAG, "Account=" + account.getName() + " folder=" + folder + "message uid=" + message.getUid(), e);
+        }
+    }
+
+}//IntentBroadcastingMessagingListener
diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index c64ce753c..12cf676b3 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -227,6 +227,8 @@ public class MessagingController implements Runnable {
         mApplication = application;
         mThread = new Thread(this);
         mThread.start();
+
+        addListener(new IntentBroadcastingMessagingListener());
     }
     
     public void log(String logmess) {
diff --git a/src/com/android/email/MessagingListener.java b/src/com/android/email/MessagingListener.java
index 13a0b78dc..c86002fb7 100644
--- a/src/com/android/email/MessagingListener.java
+++ b/src/com/android/email/MessagingListener.java
@@ -3,12 +3,8 @@ package com.android.email;
 
 import android.content.Context;
 
-import android.net.Uri;
-import android.util.Log;
-import com.android.email.mail.Address;
 import com.android.email.mail.Folder;
 import com.android.email.mail.Message;
-import com.android.email.mail.MessagingException;
 import com.android.email.mail.Part;
 
 /**
@@ -67,24 +63,7 @@ public class MessagingListener {
     public void synchronizeMailboxStarted(Account account, String folder) {
     }
 
-    public final void synchronizeMailboxNewMessage(Context context, Account account, String folder, Message message) {
-        try {
-            Uri uri = Uri.parse("email://messages/" + account.getAccountNumber() + "/" + Uri.encode(folder) + "/" + Uri.encode(message.getUid()));
-            android.content.Intent intent = new android.content.Intent(Intent.ACTION_EMAIL_RECEIVED, uri);
-            intent.putExtra(Intent.EXTRA_ACCOUNT, account.getDescription());
-            intent.putExtra(Intent.EXTRA_FOLDER, folder);
-            intent.putExtra(Intent.EXTRA_SENT_DATE, message.getSentDate());
-            intent.putExtra(Intent.EXTRA_FROM, Address.toString(message.getFrom()));
-            intent.putExtra(Intent.EXTRA_TO, Address.toString(message.getRecipients(Message.RecipientType.TO)));
-            intent.putExtra(Intent.EXTRA_CC, Address.toString(message.getRecipients(Message.RecipientType.CC)));
-            intent.putExtra(Intent.EXTRA_BCC, Address.toString(message.getRecipients(Message.RecipientType.BCC)));
-            intent.putExtra(Intent.EXTRA_SUBJECT, message.getSubject());
-            context.sendBroadcast(intent);
-            Log.d(Email.LOG_TAG, "Broadcasted intent: " + message.getSubject());
-        }
-        catch (MessagingException e) {
-            Log.w(Email.LOG_TAG, "Account=" + account.getName() + " folder=" + folder + "message uid=" + message.getUid(), e);
-        }
+    public void synchronizeMailboxNewMessage(Context context, Account account, String folder, Message message) {
     }
 
     public void synchronizeMailboxAddOrUpdateMessage(Account account, String folder, Message message) {