commit f09f185e9bc14d02c5f2d5f028480f2bd78867d2
author Marc Blank <mblank@google.com> Tue Jun 22 23:51:19 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 22 23:51:19 2010 -0700
tree 3539eb9802c232298f9fc4a436659c9a2d891431
parent e8e051210cef4051aab3e25e1a7e8ba694652466
parent 808e6cfb9f53bff350570a2d77c5477a9c212f15

Merge "Handle empty sync responses in EAS 12.1"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e982ec6..c19863d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -191,6 +191,12 @@
         <activity
             android:name=".activity.MessageView"
             android:theme="@android:style/Theme.NoTitleBar" >
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <data android:mimeType="application/eml" />
+                <data android:mimeType="message/rfc822" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".activity.MessageCompose"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e209501..c7167c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -308,6 +308,8 @@
     <string name="message_saved_toast">Message saved as draft.</string>
     <!-- String that is displayed when the attachment could not be displayed. -->
     <string name="message_view_display_attachment_toast">This attachment cannot be displayed.</string>
+    <!-- String that is displayed when a long message is being parsed. -->
+    <string name="message_view_parse_message_toast">Opening message\u2026</string>
 
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 651cf63..8c15fbf 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1737,7 +1737,6 @@
     public void onCreate() {
         synchronized (sSyncLock) {
             alwaysLog("!!! EAS SyncManager, onCreate");
-            // If we're in the process of shutting down, try again in 5 seconds
             if (sStop) {
                 return;
             }
@@ -2187,15 +2186,24 @@
         serviceRequest(mailboxId, 5*SECONDS, reason);
     }
 
+    /**
+     * Return a boolean indicating whether the mailbox can be synced
+     * @param m the mailbox
+     * @return whether or not the mailbox can be synced
+     */
+    static /*package*/ boolean isSyncable(Mailbox m) {
+        if (m == null || m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_OUTBOX ||
+                m.mType >= Mailbox.TYPE_NOT_SYNCABLE) {
+            return false;
+        }
+        return true;
+    }
+
     static public void serviceRequest(long mailboxId, long ms, int reason) {
         SyncManager syncManager = INSTANCE;
         if (syncManager == null) return;
         Mailbox m = Mailbox.restoreMailboxWithId(syncManager, mailboxId);
-        // Never allow manual start of Drafts or Outbox via serviceRequest
-        if (m == null || m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_OUTBOX) {
-            log("Ignoring serviceRequest for drafts/outbox/null mailbox");
-            return;
-        }
+        if (!isSyncable(m)) return;
         try {
             AbstractSyncService service = syncManager.mServiceMap.get(mailboxId);
             if (service != null) {

tests/src/com/android/exchange/SyncManagerAccountTests.java

diff --git a/tests/src/com/android/exchange/SyncManagerAccountTests.java b/tests/src/com/android/exchange/SyncManagerAccountTests.java
index 3b67dc1..6a325b5 100644
--- a/tests/src/com/android/exchange/SyncManagerAccountTests.java
+++ b/tests/src/com/android/exchange/SyncManagerAccountTests.java
@@ -211,4 +211,24 @@
         assertEquals(0, errorMap.keySet().size());
     }
 
+    public void testIsSyncable() {
+        Context context = mMockContext;
+        Account acct1 = ProviderTestUtils.setupAccount("acct1", true, context);
+        Mailbox box1 = ProviderTestUtils.setupMailbox("box1", acct1.mId, true, context,
+                Mailbox.TYPE_DRAFTS);
+        Mailbox box2 = ProviderTestUtils.setupMailbox("box2", acct1.mId, true, context,
+                Mailbox.TYPE_OUTBOX);
+        Mailbox box3 = ProviderTestUtils.setupMailbox("box2", acct1.mId, true, context,
+                Mailbox.TYPE_ATTACHMENT);
+        Mailbox box4 = ProviderTestUtils.setupMailbox("box2", acct1.mId, true, context,
+                Mailbox.TYPE_NOT_SYNCABLE + 64);
+        Mailbox box5 = ProviderTestUtils.setupMailbox("box2", acct1.mId, true, context,
+                Mailbox.TYPE_MAIL);
+        assertFalse(SyncManager.isSyncable(null));
+        assertFalse(SyncManager.isSyncable(box1));
+        assertFalse(SyncManager.isSyncable(box2));
+        assertFalse(SyncManager.isSyncable(box3));
+        assertFalse(SyncManager.isSyncable(box4));
+        assertTrue(SyncManager.isSyncable(box5));
+    }
 }