keep history after reset to jb-ub-mail-ur10

commit: f00b054bd43093b19925a6beda8585cc4b7a6144 [log] [tgz]
author: Paul Westbrook <pwestbro@google.com> Thu Aug 15 14:40:44 2013 -0700
committer: Paul Westbrook <pwestbro@google.com> Thu Aug 15 14:40:44 2013 -0700
tree: 50fb00197ad190335af535aba04e4306119ece59
parent: ff7e02603bc8196f411c0c491d74a42e747b7dc5 [diff]
parent: a46072fa81fb2a4be3666b838256a5bd7bee7519 [diff]
diff --git a/Android.mk b/Android.mk
index 41865d2..0551fe8 100644
--- a/Android.mk
+++ b/Android.mk

@@ -13,30 +13,37 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-
-ifeq (0,1)
 include $(CLEAR_VARS)
 
 #
-# Exchange
+# Exchange2
 #
-
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon
+# Include res dir from emailcommon
+emailcommon_dir := ../Email/emailcommon
+res_dir := res $(emailcommon_dir)/res
+
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.android.emailcommon
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES += $(call all-java-files-under, build/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync
 LOCAL_STATIC_JAVA_LIBRARIES += calendar-common
 
-LOCAL_PACKAGE_NAME := Exchange
+LOCAL_PACKAGE_NAME := Exchange2
+LOCAL_OVERRIDES_PACKAGES := Exchange
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_SDK_VERSION := 18
 
 LOCAL_EMMA_COVERAGE_FILTER += +com.android.exchange.*
 
-#include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)
 
-endif
-
-##################################################
-# Build all sub-directories
-
+# additionally, build unit tests in a separate .apk
 include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/exchange2/AndroidManifest.xml b/AndroidManifest.xml
similarity index 75%
rename from exchange2/AndroidManifest.xml
rename to AndroidManifest.xml
index 140c96f..b55d2c5 100644
--- a/exchange2/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -17,9 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.exchange"
-    android:versionCode="500000"
-    android:versionName="5.0"
-     >
+    android:versionCode="500043" >
 
     <uses-permission
         android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -64,8 +62,7 @@
     <uses-permission
         android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
-    <!-- Required for sending images from Gallery -->
-    <uses-permission android:name="com.google.android.gallery3d.permission.GALLERY_PROVIDER" />
+    <uses-sdk android:targetSdkVersion="18" android:minSdkVersion="14" />
 
     <application
         android:icon="@mipmap/icon"
@@ -75,35 +72,19 @@
         >
 
         <receiver
-            android:name="com.android.exchange.EmailSyncAlarmReceiver"/>
+            android:name="com.android.emailsync.EmailSyncAlarmReceiver"/>
         <receiver
-            android:name="com.android.exchange.MailboxAlarmReceiver"/>
-
-        <receiver
-            android:name=".service.ExchangeBroadcastReceiver"
-            android:enabled="true">
-            <intent-filter>
-                <action
-                    android:name="android.intent.action.BOOT_COMPLETED" />
-                <action
-                    android:name="android.intent.action.DEVICE_STORAGE_LOW" />
-                <action
-                    android:name="android.intent.action.DEVICE_STORAGE_OK" />
-                <action
-                    android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".service.ExchangeBroadcastProcessorService" />
+            android:name="com.android.emailsync.MailboxAlarmReceiver"/>
 
         <!--Required stanza to register the EAS EmailSyncAdapterService with SyncManager -->
         <service
-            android:name="com.android.exchange.EmailSyncAdapterService"
+            android:name="com.android.exchange.service.EmailSyncAdapterService"
             android:exported="true">
             <intent-filter>
                 <action
                     android:name="android.content.SyncAdapter" />
+                <action
+                    android:name="com.android.email.EXCHANGE_INTENT" />
             </intent-filter>
             <meta-data android:name="android.content.SyncAdapter"
                        android:resource="@xml/syncadapter_email" />
@@ -111,7 +92,7 @@
 
         <!--Required stanza to register the EAS ContactsSyncAdapterService with SyncManager -->
         <service
-            android:name="com.android.exchange.ContactsSyncAdapterService"
+            android:name="com.android.exchange.service.ContactsSyncAdapterService"
             android:exported="true">
             <intent-filter>
                 <action
@@ -123,7 +104,7 @@
 
         <!--Required stanza to register the EAS CalendarSyncAdapterService with SyncManager -->
         <service
-            android:name="com.android.exchange.CalendarSyncAdapterService"
+            android:name="com.android.exchange.service.CalendarSyncAdapterService"
             android:exported="true">
             <intent-filter>
                 <action
@@ -133,18 +114,6 @@
                        android:resource="@xml/syncadapter_calendar" />
         </service>
 
-        <!-- Add android:process=":remote" below to enable ExchangeService as a separate process -->
-        <service
-            android:name="com.android.exchange.ExchangeService"
-            android:enabled="true"
-            android:permission="com.android.email.permission.ACCESS_PROVIDER"
-            >
-            <intent-filter>
-                <action
-                    android:name="com.android.email.EXCHANGE_INTENT" />
-            </intent-filter>
-        </service>
-
         <provider
             android:name="com.android.exchange.provider.ExchangeDirectoryProvider"
             android:authorities="com.android.exchange.directory.provider"

diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index 2e1a88c..0000000
--- a/CleanSpec.mk
+++ /dev/null

@@ -1,50 +0,0 @@
-# Copyright (C) 2007 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************

diff --git a/assets/FolderSyncParserTest.txt b/assets/FolderSyncParserTest.txt
index 805e98c..aa7f65b 100644
--- a/assets/FolderSyncParserTest.txt
+++ b/assets/FolderSyncParserTest.txt

@@ -23,7 +23,7 @@
 [14:02:28] EAS Parser| </FolderSyncKey>
 [14:02:28] EAS Parser| <Changes>
 [14:02:28] EAS Parser| <Count>
-[14:02:28] EAS Parser| Count: 60
+[14:02:28] EAS Parser| Count: 279
 [14:02:28] EAS Parser| </Count>
 [14:02:29] EAS Parser| <FolderAdd>
 [14:02:29] EAS Parser| <FolderServerId>

diff --git a/assets/FolderSyncParserTest3.txt b/assets/FolderSyncParserTest3.txt
new file mode 100644
index 0000000..b50f005
--- /dev/null
+++ b/assets/FolderSyncParserTest3.txt

@@ -0,0 +1,3935 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+[14:02:28] EAS Parser| <FolderSync>
+[14:02:28] EAS Parser| <FolderStatus>
+[14:02:28] EAS Parser| FolderStatus: 1
+[14:02:28] EAS Parser| </FolderStatus>
+[14:02:28] EAS Parser| <FolderSyncKey>
+[14:02:28] EAS Parser| FolderSyncKey: 1
+[14:02:28] EAS Parser| </FolderSyncKey>
+[14:02:28] EAS Parser| <Changes>
+[14:02:28] EAS Parser| <Count>
+[14:02:28] EAS Parser| Count: 279
+[14:02:28] EAS Parser| </Count>
+[14:49:57] EAS Parser| <FolderAdd>
+[14:49:57] EAS Parser| <FolderServerId>
+[14:49:57] EAS Parser| FolderServerId: 1
+[14:49:57] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 0
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: Calendar
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 8
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 2
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 1
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: Calendar - DNA
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 13
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 3
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 1
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: Calendar - Reschedule
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 13
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 4
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 133
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: Comedy
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 1
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 5
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 4
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: _Archives - Comedy
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 1
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 6
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 5
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: _Misc - Comedy Archive
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 1
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 7
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:58] EAS Parser| <FolderParentId>
+[14:49:58] EAS Parser| FolderParentId: 5
+[14:49:58] EAS Parser| </FolderParentId>
+[14:49:58] EAS Parser| <FolderDisplayName>
+[14:49:58] EAS Parser| FolderDisplayName: Show Correspondence
+[14:49:58] EAS Parser| </FolderDisplayName>
+[14:49:58] EAS Parser| <Type>
+[14:49:58] EAS Parser| Type: 1
+[14:49:58] EAS Parser| </Type>
+[14:49:58] EAS Parser| </FolderAdd>
+[14:49:58] EAS Parser| <FolderAdd>
+[14:49:58] EAS Parser| <FolderServerId>
+[14:49:58] EAS Parser| FolderServerId: 8
+[14:49:58] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: 2000
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 9
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: 2001
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 10
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: 2002
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 11
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: 2003
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 12
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: 2004
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 13
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 7
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Pending Booking
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 14
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 4
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: _Misc - Comedy
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 15
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 4
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Mailers
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 16
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 4
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Mailers - Bounces
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 17
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 4
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Mailers - Reponses
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 18
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 4
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Writing
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 19
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 133
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Consulting
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 20
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 19
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: _Archives - Consulting
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 21
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: _Misc - Consulting
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 22
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Absolute Court Reporting
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 23
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Absolute Mock Trials
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 24
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Aspen
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 25
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Athenaeum Fund
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 26
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Bochco Media
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 12
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 27
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Carter
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 28
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: CMG
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 29
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Coleman
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 30
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: CoolUniverse
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 31
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Forte Management
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 32
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Fortis Partners
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 33
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Haley
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 34
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Halford & Meaney
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 35
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Hodgson Law Group
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 36
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: IdentityWeb
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 37
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: InternetStudios
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 38
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: ISA
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 39
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Joe Blake Casting
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 40
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Jordan
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 41
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Kellison
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 42
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Kornblut
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 43
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Krane
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 44
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Krane Incoming
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 45
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Leve
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 46
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Meyers-Taber-Meyers
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 47
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Mind Pointe
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 48
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: MizMo
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 49
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Mosaic
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 50
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Netter Marketing Group
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 51
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Pasadena Symphony
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 52
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Peterson
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 53
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Powell
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 54
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Power
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 55
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Prieboy & Markoe
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 56
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Rath Welker
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 57
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Reitzen
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 58
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Sanger
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 59
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: SGV Media
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 60
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Sherbert
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 61
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Stern
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 62
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:49:59] EAS Parser| FolderDisplayName: Sunseri
+[14:49:59] EAS Parser| </FolderDisplayName>
+[14:49:59] EAS Parser| <Type>
+[14:49:59] EAS Parser| Type: 1
+[14:49:59] EAS Parser| </Type>
+[14:49:59] EAS Parser| </FolderAdd>
+[14:49:59] EAS Parser| <FolderAdd>
+[14:49:59] EAS Parser| <FolderServerId>
+[14:49:59] EAS Parser| FolderServerId: 63
+[14:49:59] EAS Parser| </FolderServerId>
+[14:49:59] EAS Parser| <FolderParentId>
+[14:49:59] EAS Parser| FolderParentId: 20
+[14:49:59] EAS Parser| </FolderParentId>
+[14:49:59] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Treciokas
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 64
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 20
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: WideOrbit
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 65
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 20
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Wilshire Escrow
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 66
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 20
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: WorldShowbiz
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 67
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 20
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Xeno Design
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 68
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 20
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: ZentAmerica
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 69
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Backup Reports
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 70
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _For Sale
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 286
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Kickstarter
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 71
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Leads
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 72
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Mailing Lists
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 73
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Misc - Consulting
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 74
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Peers
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 75
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Pending - Consulting
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 76
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Services - Consulting
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 77
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Addis
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 78
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Aldaron
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 79
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Anderson Group PR
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 80
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Aqua
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 82
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Berchtold Harris
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 83
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Berke
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 84
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Blood Company
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 85
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Boy Toy & Illusion
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 86
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Bride's Night Out
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 87
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Cameron
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 88
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: CCS
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 89
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Chow
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 90
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Cohen Gardner
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 91
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Conroy
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 92
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Dorff
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 93
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Eichenstein
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 94
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Feldman
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 95
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Gold
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 96
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Greenburg
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 97
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Greene
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 98
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Guy Oseary
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 99
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Hoffman, Craig & Betsy
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 100
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Home Wiring Specialists
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 101
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Jason & Matlin
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 285
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Kirkland
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 102
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Kova & T
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 103
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Kroeber
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 104
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Leanse Mere et Fils
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 105
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Levity & Improv
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 106
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: McDermott
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 107
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Messina Baker
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 108
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Metro
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 109
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Montandon Mere et Fils
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 110
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Nathalie Hoffman & Associates
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 111
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Nemzo
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 112
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: NV Investments
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 113
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: O'Day & Saint Anne School
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 114
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Omnipop & Pacific Comedy
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 115
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Oswalt
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 116
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Peacock
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 117
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Pierce Law Group
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 118
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Piven
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 119
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Principato Young
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 120
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Rediger
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 81
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Savesta
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 121
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Scholer
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 122
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: SMGSB
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 123
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Suma Financial
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 124
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Taper Family Enterprises
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 125
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Trattner & Talentwave
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 126
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: van Straaten Pere
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 127
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Weston
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 128
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 19
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Wetherly Fashion Group
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 129
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 0
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Contacts
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 9
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 130
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 133
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Conversation Action Settings
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 18
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 131
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 0
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Deleted Items
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 4
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 132
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 0
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Drafts
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 3
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 133
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 0
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Inbox
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 2
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 283
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 0
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Jobs
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 12
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 135
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 283
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: _Misc - Jobs
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 136
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 283
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Dice
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 137
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 283
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Metron
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 138
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 137
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Bill-Andrew-Stuff
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 139
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 137
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:00] EAS Parser| FolderDisplayName: Filed
+[14:50:00] EAS Parser| </FolderDisplayName>
+[14:50:00] EAS Parser| <Type>
+[14:50:00] EAS Parser| Type: 1
+[14:50:00] EAS Parser| </Type>
+[14:50:00] EAS Parser| </FolderAdd>
+[14:50:00] EAS Parser| <FolderAdd>
+[14:50:00] EAS Parser| <FolderServerId>
+[14:50:00] EAS Parser| FolderServerId: 140
+[14:50:00] EAS Parser| </FolderServerId>
+[14:50:00] EAS Parser| <FolderParentId>
+[14:50:00] EAS Parser| FolderParentId: 137
+[14:50:00] EAS Parser| </FolderParentId>
+[14:50:00] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Pending
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 141
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 137
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Sent-Mail
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 142
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 283
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Synerdyne
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 143
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Bodil
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 144
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Completed
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 145
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Fax
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 146
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Internet
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 147
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Licensing
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 148
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Misc
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 149
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Pending
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 150
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Purchasing
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 151
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: SDRC
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 152
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 142
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Virus
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 153
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 283
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: TechieGold
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 154
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Journal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 11
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 155
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Junk E-Mail
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 12
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 156
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: LinkedIn
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 14
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 157
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: News Feed
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 12
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 158
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Newsletters
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 12
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 159
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Notes
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 10
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 160
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 0
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Outbox
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 6
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 161
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 133
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Personal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 162
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: _Archives - Personal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 163
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Alice
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 164
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Andy
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 165
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Ann
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 166
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Athena
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 167
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Blair
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 168
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Carol
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 169
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Cherise
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 170
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Darlene
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 171
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Darrick
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 172
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Doreen
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 173
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Elena
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 174
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Felix
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 175
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Fred
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 176
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Giselle
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 177
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Greg
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 178
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Hamilton
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 179
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Harriet
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 180
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Heather
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 181
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Hirst
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 182
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: James
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 183
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Judith
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 184
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Jules
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 185
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Ken
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 186
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Leslie
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 187
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Lorrie
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 188
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Martha
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 189
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Rylee
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 190
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Sabrina
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 191
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Samantha
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 192
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Susan NYC
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 193
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 162
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Ziony
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 194
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: _Misc - Personal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 195
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: _Pending - Personal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 12
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 196
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: _Services - Personal
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 197
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Alex
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 198
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Cathryn
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 199
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Chris
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 200
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Holly
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 12
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 201
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Jackie
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 202
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Jamie
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 203
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:01] EAS Parser| FolderDisplayName: Jeremy
+[14:50:01] EAS Parser| </FolderDisplayName>
+[14:50:01] EAS Parser| <Type>
+[14:50:01] EAS Parser| Type: 1
+[14:50:01] EAS Parser| </Type>
+[14:50:01] EAS Parser| </FolderAdd>
+[14:50:01] EAS Parser| <FolderAdd>
+[14:50:01] EAS Parser| <FolderServerId>
+[14:50:01] EAS Parser| FolderServerId: 204
+[14:50:01] EAS Parser| </FolderServerId>
+[14:50:01] EAS Parser| <FolderParentId>
+[14:50:01] EAS Parser| FolderParentId: 161
+[14:50:01] EAS Parser| </FolderParentId>
+[14:50:01] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Joe
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 205
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: John
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 206
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Karen
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 207
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Keith
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 208
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Livia
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 209
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Mama
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 210
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Marcia
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 211
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Matt
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 212
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Mike
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 213
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Papa
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 214
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Peter
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 215
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Robin
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 216
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Sharon
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 217
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Solmssens
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 218
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Steph
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 219
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Steve
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 220
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Susan
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 221
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 161
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Zach
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 222
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Quick Step Settings
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 18
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 223
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 133
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Reference
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 224
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: _Archives - Reference
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 225
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 224
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Experts
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 226
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 224
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: JazzCrowd
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 227
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 224
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Netatalk
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 228
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 224
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: OmniSky
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 229
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 224
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Sandbaggers
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 230
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: _Misc - Reference
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 231
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Action Plans
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 232
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Apartment & Neighborhood
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 233
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Attack
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 234
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Car
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 235
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Cat
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 236
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Charitable Donations
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 237
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Coupons
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 238
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: eBay-PayPal-Craigslist-Freecycle
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 239
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: eFax
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 240
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Events
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 241
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Health
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 242
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Internet
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 243
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Linux
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 244
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: List & Website Info
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 245
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Macintosh
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 246
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Mobile Devices
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 247
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Networking
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 248
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: PCs
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 249
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Politics
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 250
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Samsa Files
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 251
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Social Networking
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 252
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: TiVo & ReplayTV
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 253
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Trade Shows
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 254
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 223
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Volunteer
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 277
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: RSS Feeds
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 255
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Sent Items
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 5
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 256
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 133
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Sent Items Archive
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 257
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 1998
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 258
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 1999
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 259
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2000
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 260
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2001
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 261
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2002
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 262
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2003
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 263
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2004
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 264
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2005
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 265
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2006
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 266
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2007
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 267
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2008
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 268
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2009
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 1
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 269
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2010
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 270
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 256
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: 2011
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 271
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Suggested Contacts
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 14
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 272
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Sync Issues
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 273
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 272
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Conflicts
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 274
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 272
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Local Failures
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 275
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 272
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Server Failures
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 12
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| <FolderAdd>
+[14:50:02] EAS Parser| <FolderServerId>
+[14:50:02] EAS Parser| FolderServerId: 276
+[14:50:02] EAS Parser| </FolderServerId>
+[14:50:02] EAS Parser| <FolderParentId>
+[14:50:02] EAS Parser| FolderParentId: 0
+[14:50:02] EAS Parser| </FolderParentId>
+[14:50:02] EAS Parser| <FolderDisplayName>
+[14:50:02] EAS Parser| FolderDisplayName: Tasks
+[14:50:02] EAS Parser| </FolderDisplayName>
+[14:50:02] EAS Parser| <Type>
+[14:50:02] EAS Parser| Type: 7
+[14:50:02] EAS Parser| </Type>
+[14:50:02] EAS Parser| </FolderAdd>
+[14:50:02] EAS Parser| </Changes>
+[14:50:02] EAS Parser| </FolderSync>

diff --git a/build/src/com/android/exchange/Configuration.java b/build/src/com/android/exchange/Configuration.java
new file mode 100644
index 0000000..ad93cb2
--- /dev/null
+++ b/build/src/com/android/exchange/Configuration.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange;
+
+public class Configuration {
+    public static final String EXCHANGE_ACCOUNT_MANAGER_TYPE = "com.android.exchange";
+    public static final String EXCHANGE_SERVICE_INTENT_ACTION =
+            "com.android.email.EXCHANGE_INTENT";
+    public static final String EXCHANGE_GAL_AUTHORITY = "com.android.exchange.directory.provider";
+    public static final String EXCHANGE_PROTOCOL = "eas";
+}

diff --git a/exchange2/Android.mk b/exchange2/Android.mk
deleted file mode 100644
index a434b8c..0000000
--- a/exchange2/Android.mk
+++ /dev/null

@@ -1,38 +0,0 @@
-# Copyright 2008, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-#
-# Exchange2
-#
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon
-LOCAL_STATIC_JAVA_LIBRARIES += calendar-common
-
-LOCAL_PACKAGE_NAME := Exchange2
-LOCAL_OVERRIDES_PACKAGES := Exchange
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_EMMA_COVERAGE_FILTER += +com.android.exchange.*
-
-include $(BUILD_PACKAGE)
-
-# additionally, build unit tests in a separate .apk
- include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/exchange2/res/drawable-hdpi/stat_notify_calendar.png b/exchange2/res/drawable-hdpi/stat_notify_calendar.png
deleted file mode 100644
index 5c8329d..0000000
--- a/exchange2/res/drawable-hdpi/stat_notify_calendar.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/drawable-mdpi/stat_notify_calendar.png b/exchange2/res/drawable-mdpi/stat_notify_calendar.png
deleted file mode 100644
index 5758d04..0000000
--- a/exchange2/res/drawable-mdpi/stat_notify_calendar.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/drawable-xhdpi/stat_notify_calendar.png b/exchange2/res/drawable-xhdpi/stat_notify_calendar.png
deleted file mode 100644
index 34fc22b..0000000
--- a/exchange2/res/drawable-xhdpi/stat_notify_calendar.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/mipmap-hdpi/icon.png b/exchange2/res/mipmap-hdpi/icon.png
deleted file mode 100644
index 4b508ed..0000000
--- a/exchange2/res/mipmap-hdpi/icon.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/mipmap-mdpi/icon.png b/exchange2/res/mipmap-mdpi/icon.png
deleted file mode 100644
index bf2ed0a..0000000
--- a/exchange2/res/mipmap-mdpi/icon.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/mipmap-xhdpi/icon.png b/exchange2/res/mipmap-xhdpi/icon.png
deleted file mode 100644
index 82c8185..0000000
--- a/exchange2/res/mipmap-xhdpi/icon.png
+++ /dev/null
Binary files differ

diff --git a/exchange2/res/values-af/strings.xml b/exchange2/res/values-af/strings.xml
deleted file mode 100644
index f2c0748..0000000
--- a/exchange2/res/values-af/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Aanvaar: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Afgewys: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Voorlopig: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Gekanselleer: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Opgedateer: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Wanneer: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Waar: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (herhalend)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dag)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (die hele dag, herhalend)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalender bygevoeg"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange-dienste"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Hierdie gebeurtenis is gekanselleer vir: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Die details van hierdie gebeurtenis het verander vir: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Moenie geheuekaarte toelaat nie"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Moenie ongetekende programme toelaat nie"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Moenie ongetekende programinstalleerders toelaat nie"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Moenie Wi-Fi toelaat nie"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Moenie teksboodskappe toelaat nie"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Moenie POP3- of IMAP-rekeninge toelaat nie"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Moenie infrarooi kommunikasie toelaat nie"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Moenie HTML-e-pos toelaat nie"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Moenie blaaiers toelaat nie"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Moenie verbruiker-e-pos toelaat nie"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Moenie internetdeling toelaat nie"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Vereis SMIME-boodskappe"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Beperk Bluetooth-gebruik"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Weier gespesifiseerde programme"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Laat net gespesifiseerde programme toe"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Beperk grootte van teks-e-pos"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Beperk grootte van HTML-e-pos"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Vereis SD-kaart-enkripsie"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Moenie aanhegsels toelaat nie"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Beperk aanhegselgrootte"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Laat net handmatige sinkronisasie toe tydens swerwing"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Vereis toestelenkripsie"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Outomaties"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Een dag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Drie dae"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Een week"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Twee weke"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Een maand"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
-</resources>

diff --git a/exchange2/res/values-am/strings.xml b/exchange2/res/values-am/strings.xml
deleted file mode 100644
index 86d9563..0000000
--- a/exchange2/res/values-am/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"የማይክሮሶፍት Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"ተቀብሏል፡ <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"ሳይቀበል ቀረ: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"ጊዜያዊ፡<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"ቀርቷል: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"የዘመነ፡<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"መቼ:<xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"የት: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"መቼ፡ <xliff:g id="EVENTDATE">%s</xliff:g>(ድግግሞሽ)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"የሚከተለው ሲሆን፤ <xliff:g id="EVENTDATE">%s</xliff:g> (ሁሉም ቀን)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"የሚከተለው ሲሆን፤ <xliff:g id="EVENTDATE">%s</xliff:g> (ሁሉም ቀን፣ ተደጋጋሚ)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"የቀን መቁጠሪያ ልውውጥ ታክሏል"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange አገልግሎቶች"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"ይህ ከስተት ለ<xliff:g id="DATE">%s</xliff:g> ተሰርዟል።"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"የዚህ ክስተት ዝርዝሮች ለ፡<xliff:g id="DATE">%s</xliff:g> ተለውጠዋል"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"የማከማቻ ካርዶችን አትፍቀድ"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"ያልተረጋገጡ የትግበራ  አትፍቀድ"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"ያልተረጋገጡ የትግበራ ጫኞችን አትፍቀድ"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fi አትፍቀድ"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"የፅሁፍ መልዕክት አትፍቀድ"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3 ወይም IMAP መለያዎች አትፍቀድ"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"የታህተቀይ ግኑኙነት አትፍቀድ"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"የHTML ኢሜይል አትፍቀድ"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"አሳሾች አትፍቀድ"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"የሸማች ኢሜይል አትፍቀድ"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"የበይነ መረብ ማጋራት አትፍቀድ"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"የSMIME መልዕክቶች ጠይቅ"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"የብሉቱዝ አገልግሎትን ገድብ"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"የተወሰኑ ትግበራዎችን አትፍቀድ"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"የተወሰኑ ትግበራዎችን ብቻ ፍቀድ"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"የፅሁፍ ኢሜይል መጠንን ገድብ"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"የHTML ኢሜይል መጠን ገድብ"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"የsd ካርድ ምስጠራ ጠይቅ"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"አባሪዎች አትፍቀድ"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"የአባሪ መጠንን ገድብ"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"በእንቅስቃሴ ላይ በእጅ አመሳስል ብቻ ፍቀድ"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"የመሳሪያ ምስጠራ ጠይቅ"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ራስ ሰር"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"አንድ ቀን"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"ሦስት ቀን"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"አንድ ሳምንት"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"ሁለት ሳምንቶች"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"አንድ ወር"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ሁሉም"</string>
-</resources>

diff --git a/exchange2/res/values-ar/strings.xml b/exchange2/res/values-ar/strings.xml
deleted file mode 100644
index 395fa1f..0000000
--- a/exchange2/res/values-ar/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"مقبول: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"مرفوض: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"موافقة مبدئية: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"تم الإلغاء: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"تم التحديث: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"متى: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"المكان: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"الموعد: <xliff:g id="EVENTDATE">%s</xliff:g> (متكرر)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"الموعد: <xliff:g id="EVENTDATE">%s</xliff:g> (اليوم كله)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"الموعد: <xliff:g id="EVENTDATE">%s</xliff:g> (اليوم كله، بشكل متكرر)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"تمت إضافة تقويم Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"خدمات Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"تم إلغاء هذا الحدث لـ: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"تم تغيير التفاصيل لهذا الحدث لـ: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"عدم السماح ببطاقات التخزين"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"عدم السماح بالتطبيقات غير الموقعة"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"عدم السماح بمثبتات التطبيقات غير الموقعة"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"عدم السماح باتصالات Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"عدم السماح بالرسائل النصية"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"عدم السماح بحسابات POP3 أو IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"عدم السماح باتصالات الأشعة تحت الحمراء"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"عدم السماح برسائل HTML الإلكترونية"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"عدم السماح للمتصفحات"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"عدم السماح برسائل المستهلكين الإلكترونية"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"عدم السماح بالمشاركة عبر الإنترنت"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"يلزم توفر الرسائل بتنسيق SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"تقييد استخدام البلوتوث"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"عدم السماح بتطبيقات محددة"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"السماح بتطبيقات محددة فقط"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"تقييد حجم الرسالة الإلكترونية النصية"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"تقييد حجم رسائل HTML الإلكترونية"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"يلزم تشفير بطاقة SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"عدم السماح بالمرفقات"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"تقييد حجم المرفق"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"السماح بالمزامنة اليدوية فقط أثناء التجوال"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"يلزم تشفير الجهاز"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"تلقائي"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"يوم واحد"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"ثلاثة أيام"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"أسبوع"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"أسبوعان"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"شهر واحد"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"الكل"</string>
-</resources>

diff --git a/exchange2/res/values-be/strings.xml b/exchange2/res/values-be/strings.xml
deleted file mode 100644
index 72a5396..0000000
--- a/exchange2/res/values-be/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Прынята: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Адхілена: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Папярэдне: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Адменена: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Абноўлена: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Калі: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Дзе: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Калі: <xliff:g id="EVENTDATE">%s</xliff:g> (перыядычна)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Калі: <xliff:g id="EVENTDATE">%s</xliff:g> (на цэлы дзень)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Калі: <xliff:g id="EVENTDATE">%s</xliff:g> (на цэлы дзень, перыядычная)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Каляндар Exchange дададзены"</string>
-    <string name="app_name" msgid="5316597712787122829">"Службы Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Гэтае мерапрыемства было адмененае: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Параметры гэтай падзеі былі былі змененыя: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Забараніць карты памяці"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Забараніць непадпісаныя прыкладанні"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Забараніць усталяванне непадпісаных прыкладанняў"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Забараніць выкарыстанне Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Забараніць абмен тэкстав. паведамленнямі"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Забаранiць улiковыя запiсы з выкарыстаннем POP3 і IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Забараніць ІЧ-сувязь"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Забаранiць фармат HTML для электр. пошты"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Забаранiць для браўзэраў"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Забаранiць электр. пошту карыстальнiкаў"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Забараніць агульны доступ у Інтэрнэт"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Патрабаваць паведамленні SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Абмежаваць выкарыстанне Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Забараніць пэўныя прыкладанні"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Дазваляць толькі пэўныя прыкладанні"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Абмежаваць памер тэкста электр. лістоў"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Абмежаваць памер электронных лістоў HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Патрабаваць шыфраванне SD-карты"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Забараніць далучэннi"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Абмежаваць памер далучэнняў"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Дазваляць ручную сiнхранiзацыю ў роўмiнгу"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Патрабаваць шыфраванне прылады"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Аўтаматычна"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"1 дзень"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Тры дні"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 тыдзень"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Два тыдні"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Адзін месяц"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Усе"</string>
-</resources>

diff --git a/exchange2/res/values-bg/strings.xml b/exchange2/res/values-bg/strings.xml
deleted file mode 100644
index afe5d62..0000000
--- a/exchange2/res/values-bg/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Прието: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Отклонено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Колебливо: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Анулирано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Актуализация:<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Кога: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Къде: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Кога: <xliff:g id="EVENTDATE">%s</xliff:g> (с повторения)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Кога: <xliff:g id="EVENTDATE">%s</xliff:g> (цял ден)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Кога: <xliff:g id="EVENTDATE">%s</xliff:g> (цял ден, периодично)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Добавен е календар от Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Услуги на Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Това събитие от <xliff:g id="DATE">%s</xliff:g> е анулирано"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Подробностите за това събитие са променени за: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Забраняване на карти за съхранение"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Без неподписани приложения"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Без неподп. инсталатори на приложения"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Без разрешаване на Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Забраняване на текстови съобщения"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Забраняване на POP3 или IMAP профили"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Забраняване на инфрачервени комуникации"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Забраняване на HTML имейли"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Забраняване на браузъри"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Забраняване на маркетингови имейли"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Без споделяне на интернет"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Изискване на SMIME съобщения"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ограничаване на ползването на Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Забраняване на посочените приложения"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Разрешаване само на посочени приложения"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ограничаване на размера на текст. имейли"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ограничаване на размера на HTML имейлите"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Изискване за шифроване на SD картата"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Забраняване на прикачени файлове"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Огранич. на размера на прикач. файлове"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Само ръчно синхронизиране при роуминг"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Изискване за шифроване на устройството"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматично"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Един ден"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дни"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Една седмица"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две седмици"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Един месец"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Всички"</string>
-</resources>

diff --git a/exchange2/res/values-ca/strings.xml b/exchange2/res/values-ca/strings.xml
deleted file mode 100644
index 9763ac6..0000000
--- a/exchange2/res/values-ca/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Acceptada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Rebutjada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Provisional: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancel·lada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualitzada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Quan: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"On: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Quan: <xliff:g id="EVENTDATE">%s</xliff:g> (periòdica)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Quan: <xliff:g id="EVENTDATE">%s</xliff:g> (tot el dia)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Quan: <xliff:g id="EVENTDATE">%s</xliff:g> (tot el dia, periòdic)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"S\'ha afegit el calendari d\'Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Serveis d\'Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Aquest esdeveniment s\'ha cancel·lat per a: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Els detalls d\'aquest esdeveniment han canviat per a: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"No permetis targetes d\'emmagatzematge"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"No permetis aplicacions no signades"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"No permetis instal. d\'aplic. no sign."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"No permetis la Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"No permetis els missatges de text"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"No permetis els comptes POP3 ni IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"No permetis comunicacions per infraroigs"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"No permetis el correu electrònic HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"No permetis els navegadors"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"No permetis correus electr. de consum."</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"No permetis la compartició per Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Requereix missatges SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Restringeix l\'ús de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"No permetis aplicacions especificades"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permet només les aplicacions especif."</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Restring. mida de correu electr. de text"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Restringeix mida del correu electr. HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Requereix l\'encriptació de targetes SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"No permetis fitxers adjunts"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Restringeix la mida del fitxer adjunt"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Permet només sincr. manual en itineràn."</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Requereix l\'encriptació del dispositiu"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automàtic"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un dia"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tres dies"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una setmana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dues setmanes"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tots"</string>
-</resources>

diff --git a/exchange2/res/values-cs/strings.xml b/exchange2/res/values-cs/strings.xml
deleted file mode 100644
index 93b712f..0000000
--- a/exchange2/res/values-cs/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Potvrzeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Odmítnuto: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Možná: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Zrušeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Aktualizováno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kdy: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kdy: <xliff:g id="EVENTDATE">%s</xliff:g> (pravidelně)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kdy: <xliff:g id="EVENTDATE">%s</xliff:g> (celý den)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kdy: <xliff:g id="EVENTDATE">%s</xliff:g> (celý den, opakující se)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Kalendář Exchange byl přidán"</string>
-    <string name="app_name" msgid="5316597712787122829">"Služby Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Tato událost byla zrušena pro datum: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Podrobnosti této události byly změněny pro datum: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Nepovolit paměťové karty"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Nepovolit nepodepsané aplikace"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Nepovolit nepodepsané instalátory"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Nepovolit připojení Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Nepovolit textové zprávy"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Nepovolovat účty POP3 a IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Nepovolit komunikaci IR"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Nepovolit e-maily ve formátu HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Nepovolit prohlížeče"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Nepovolit marketingové e-maily"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Nepovolit sdílení internetu"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Požadovat zprávy ve formátu SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Omezit použití připojení Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Blokovat zadané aplikace"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Povolit pouze zadané aplikace"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Omezit velikost textových e-mailů"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Omezit velikost e-mailů ve formátu HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Požadovat šifrování karty SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Nepovolit přílohy"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Omezit velikost příloh"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Při roamingu povolit jen ruční synch."</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Požadovat šifrování zařízení"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatické"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden den"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tři dny"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jeden týden"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden měsíc"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vše"</string>
-</resources>

diff --git a/exchange2/res/values-da/strings.xml b/exchange2/res/values-da/strings.xml
deleted file mode 100644
index 7a4425b..0000000
--- a/exchange2/res/values-da/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Accepteret: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Afvist: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Foreløbig: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Annulleret: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Opdateret: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Hvornår: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Hvor: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Hvornår: <xliff:g id="EVENTDATE">%s</xliff:g> (flere gange)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Hvornår: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dagen)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Hvornår: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dagen, tilbagevendende)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalender er tilføjet"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange-tjenester"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Denne begivenhed er annulleret for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Oplysningerne om denne begivenhed er ændret for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Tillad ikke hukommelseskort"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Tillad ikke usignerede apps"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Tillad ikke usignerede app-installationsprogrammer"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Tillad ikke Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Tillad ikke sms-beskeder"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Tillad ikke POP3- eller IMAP-konti"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Tillad ikke infrarød kommunikation"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Tillad ikke e-mail i HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Tillad ikke browsere"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Tillad ikke e-mail fra tredjepart"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Tillad ikke internetdeling"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Kræv SMIME-beskeder"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Begræns brugen af bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Tillad ikke angivne apps"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Tillad kun angivne apps"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Begræns tekststørrelsen for e-mail"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Begræns størrelsen på e-mail i HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Kræv kryptering af SD-kort"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Tillad ikke vedhæftede filer"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Begræns størrelsen på vedhæftede filer"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Tillad kun manuel synkron. under roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Kræv kryptering af enhed"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dage"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En uge"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uger"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En måned"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
-</resources>

diff --git a/exchange2/res/values-de/strings.xml b/exchange2/res/values-de/strings.xml
deleted file mode 100644
index 3c0ea8d..0000000
--- a/exchange2/res/values-de/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Akzeptiert: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Abgelehnt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Mit Vorbehalt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Abgebrochen: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Aktualisiert: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Wann: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Wo: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Wann: <xliff:g id="EVENTDATE">%s</xliff:g> (wiederkehrend)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Wann: <xliff:g id="EVENTDATE">%s</xliff:g> (ganztägig)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Wann: <xliff:g id="EVENTDATE">%s</xliff:g> (ganztägig, wiederkehrend)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-Kalender hinzugefügt"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange-Dienste"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Dieser Termin wurde storniert für: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Die Details dieses Termins wurden geändert für: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Speicherkarten nicht zulassen"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Keine unsignierten Apps"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Keine unsignierten App-Installer"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"WLAN nicht zulassen"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"SMS/MMS nicht zulassen"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3- oder IMAP-Konten nicht zulassen"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Infrarotkommunikation nicht zulassen"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML-E-Mails nicht zulassen"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Browser nicht zulassen"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Verbraucher-E-Mails nicht zulassen"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Teilen über das Internet nicht zulassen"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME-Nachrichten erforderlich"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Bluetooth-Nutzung beschränken"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Angegebene Apps nicht zulassen"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Nur angegebene Apps zulassen"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"E-Mail-Text beschränken"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Größe von HTML-E-Mails beschränken"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SD-Kartenverschlüsselung erforderlich"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Anhänge nicht zulassen"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Größe von Anhängen beschränken"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Bei Roaming nur manuelle Synchronis."</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Geräteverschlüsselung erforderlich"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Ein Tag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Drei Tage"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Eine Woche"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Zwei Wochen"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ein Monat"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
-</resources>

diff --git a/exchange2/res/values-el/strings.xml b/exchange2/res/values-el/strings.xml
deleted file mode 100644
index 79b27cf..0000000
--- a/exchange2/res/values-el/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Έγινε αποδοχή: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Απορρίφθηκε: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Αβέβαιη παρουσία: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Ακυρώθηκε: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Ενημερώθηκε: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Πότε: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Που: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Πότε: <xliff:g id="EVENTDATE">%s</xliff:g> (επαναλαμβανόμενο)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Πότε: <xliff:g id="EVENTDATE">%s</xliff:g> (όλη την ημέρα)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Πότε: <xliff:g id="EVENTDATE">%s</xliff:g> (όλη την ημέρα, επαναλαμβανόμενα)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Προστέθηκε ημερολόγιο Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Υπηρεσίες Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Αυτό το συμβάν ακυρώθηκε για: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Οι λεπτομέρειες αυτού του συμβάντος άλλαξαν για: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Δεν επιτρέπονται κάρτες αποθήκευσης"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Απαγόρευση μη υπογεγραμμένων εφαρμογών"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Απαγόρ. μη υπογεγρ. προγ. εγκατ. εφαρμ."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Απαγόρευση σύνδεσης Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Δεν επιτρέπ. ανταλλαγή μηνυμ. κειμένου"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Δεν επιτρέπονται λογαρ. POP3 ή IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Δεν επιτρέπoνται υπέρυθρες επικοινωνίες"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Δεν επιτρέπεται ηλ. ταχ. HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Δεν επιτρέπονται προγρ. περιήγησης"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Δεν επιτρέπεται ηλ. ταχ. καταναλωτών"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Απαγόρευση κοινής χρήσης διαδικτύου"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Απαιτούνται μηνύματα SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Περιορισμός χρήσης bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Απαγόρευση συγκεκριμένων εφαρμογών"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Επιτρέπονται μόνο συγκεκριμ. εφαρμογές"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Περιορισμός μεγέθους κειμένου ηλ. ταχ."</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Περιορισμός μεγέθους ηλ. ταχ. HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Απαιτείται κρυπτογράφηση κάρτας SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Δεν επιτρέπονται συνημμένα"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Περιορισμός μεγέθους συνημμένων"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Σε περιαγωγή μόνο μη αυτ. συγχρονισμός"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Απαιτείται κρυπτογράφηση συσκευής"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Αυτόματη"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Μία ημέρα"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Τρεις ημέρες"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Μία εβδομάδα"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Δύο εβδομάδες"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ένας μήνας"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Όλες"</string>
-</resources>

diff --git a/exchange2/res/values-en-rGB/strings.xml b/exchange2/res/values-en-rGB/strings.xml
deleted file mode 100644
index a4725d9..0000000
--- a/exchange2/res/values-en-rGB/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Accepted: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Declined: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentative: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelled: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Updated: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"When: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Where: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"When: <xliff:g id="EVENTDATE">%s</xliff:g> (recurring)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"When: <xliff:g id="EVENTDATE">%s</xliff:g> (all day)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"When: <xliff:g id="EVENTDATE">%s</xliff:g> (all day, recurring)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange calendar added"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"This event has been cancelled for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"The details of this event have been changed for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Don\'t allow storage cards"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Don\'t allow unsigned apps"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Don\'t allow unsigned app installers"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Don\'t allow Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Don\'t allow text messaging"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Don\'t allow POP3 or IMAP accounts"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Don\'t allow infrared communications"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Don\'t allow HTML email"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Don\'t allow browsers"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Don\'t allow consumer email"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Don\'t allow Internet sharing"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Require SMIME messages"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Restrict Bluetooth usage"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Disallow specified apps"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Allow only specified apps"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Restrict text email size"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Restrict HTML email size"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Require SD card encryption"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Don\'t allow attachments"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Restrict attachment size"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Only allow manual sync while roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Require device encryption"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatic"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"One day"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Three days"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"One week"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Two weeks"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"One month"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"All"</string>
-</resources>

diff --git a/exchange2/res/values-es-rUS/strings.xml b/exchange2/res/values-es-rUS/strings.xml
deleted file mode 100644
index 5753aba..0000000
--- a/exchange2/res/values-es-rUS/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Aceptado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Rechazada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentativo: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualizado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Cuándo: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Dónde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Cuando: <xliff:g id="EVENTDATE">%s</xliff:g> (recurrente)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Cuándo: <xliff:g id="EVENTDATE">%s</xliff:g> (todo el día)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Cuándo: <xliff:g id="EVENTDATE">%s</xliff:g> (todo el día, se repite)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendario de Exchange agregado"</string>
-    <string name="app_name" msgid="5316597712787122829">"Servicios de Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Este evento ha sido cancelado para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Los detalles de este evento se han modificado para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"No permitir tarjetas de memoria"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"No instalar aplicaciones sin firmar"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"No permitir instaladores sin firmar"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"No permitir Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"No permitir envío de mensajes de texto"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"No permitir cuentas POP3 ni IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"No permitir comunicación por infrarrojos"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"No recibir correos electrónicos HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"No permitir el uso de navegadores"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"No recibir correos comerciales"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"No permitir uso compartido de Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Recibir solo mensajes SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Restringir el uso de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Bloquear determinadas aplicaciones"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permitir determinadas aplicaciones"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Restringir el tamaño de correos de texto"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Restringir el tamaño de los correos HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Requerir la encriptación de tarjetas SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"No descargar archivos adjuntos"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Restringir tamaño de archivos adjuntos"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Sincro. manual solo en itinerancia"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Requerir la encriptación del dispositivo"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un día"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una semana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
-</resources>

diff --git a/exchange2/res/values-es/strings.xml b/exchange2/res/values-es/strings.xml
deleted file mode 100644
index 1e7f3fe..0000000
--- a/exchange2/res/values-es/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Aceptada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Rechazada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Provisional: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualizado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Cuándo: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Dónde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Cuándo: <xliff:g id="EVENTDATE">%s</xliff:g> (periódico)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Cuando: <xliff:g id="EVENTDATE">%s</xliff:g> (todo el día)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Cuando: <xliff:g id="EVENTDATE">%s</xliff:g> (todo el día, periódico)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Se ha añadido un calendario de Exchange."</string>
-    <string name="app_name" msgid="5316597712787122829">"Servicios de Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Este evento se ha cancelado el día: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Los detalles de este evento se han cambiado al día: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"No permitir tarjetas de almacenamiento"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"No permitir aplicaciones sin firmar"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"No permitir instaladores sin firmar"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"No permitir Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"No permitir mensajes de texto"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"No permitir cuentas POP3 ni IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"No permitir comunicación por infrarrojos"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"No permitir correos HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"No permitir navegadores"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"No permitir correos comerciales"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"No permitir compartir conexión a Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Solicitar mensajes SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Restringir uso de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"No permitir aplicaciones especificadas"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permitir solo aplicaciones especificadas"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Restringir tamaño de letra del correo"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Restringir el tamaño del correo HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Solicitar encriptación de tarjeta SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"No permitir archivos adjuntos"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Restringir tamaño de archivos adjuntos"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Sincronización manual solo en itinerancia"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Solicitar encriptación de dispositivo"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automática"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un día"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una semana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
-</resources>

diff --git a/exchange2/res/values-et/strings.xml b/exchange2/res/values-et/strings.xml
deleted file mode 100644
index 64ce265..0000000
--- a/exchange2/res/values-et/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Vastu võetud: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Keeldutud: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Katseline: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Tühistatud: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Värskendatud: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Millal: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kus: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Millal: <xliff:g id="EVENTDATE">%s</xliff:g> (korduv)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Toimumisaeg: <xliff:g id="EVENTDATE">%s</xliff:g> (terve päev)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Toimumisaeg: <xliff:g id="EVENTDATE">%s</xliff:g> (terve päev, korduv)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange\'i kalender lisatud"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange\'i teenused"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"See sündmus on tühistatud: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Selle sündmuse andmed on muutunud: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Keela mälukaardid"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Keela allkirjastamata rakendused"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Keela allkirjata rakenduste installerid"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Keela WiFi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Keela tekstsõnumside"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Keela POP3- või IMAP-kontod"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Keela infrapunaside"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Keela HTML-meilid"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Keela brauserid"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Keela tarbijate meilid"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Keela Interneti jagamine"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Nõua SMIME-sõnumeid"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Piira Bluetoothi kasutamist"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Keela määratud rakendused"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Luba ainult määratud rakendused"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Piira tekstmeilide suurust"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Piira HTML-meili suurust"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Nõua SD-kaardi krüpteerimist"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Keela manused"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Piira manuse suurust"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Luba käsitsi sünkr. ainult rändlusel"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Nõua seadme krüpteerimist"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaatne"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Üks päev"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Kolm päeva"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Üks nädal"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Kaks nädalat"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Üks kuu"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Kõik"</string>
-</resources>

diff --git a/exchange2/res/values-fa/strings.xml b/exchange2/res/values-fa/strings.xml
deleted file mode 100644
index 9edb1bc..0000000
--- a/exchange2/res/values-fa/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"پذیرفته شده: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"پذیرفته نشد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"احتمالی: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"لغو شد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"به‌روزرسانی شد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"زمان: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"مکان: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"زمان: <xliff:g id="EVENTDATE">%s</xliff:g> (تکرار)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"زمان: <xliff:g id="EVENTDATE">%s</xliff:g> (در تمام طول روز)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"زمان: <xliff:g id="EVENTDATE">%s</xliff:g> (در تمام طول روز، به‌صورت تکراری)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"تقویم Exchange اضافه شد"</string>
-    <string name="app_name" msgid="5316597712787122829">"سرویس‌های Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"این رویداد لغو شده است به مدت: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"جزئیات این رویداد تغییر کرده‌اند به مدت: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"کارت‌های حافظه مجاز نیست"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"برنامه‌های امضا نشده مجاز نیستند"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"نصب کننده‌های برنامه امضا نشده مجاز نیستند"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fi مجاز نیست"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"پیام‌رسانی نوشتاری مجاز نیست"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"حساب‌های POP3 یا IMAP مجاز نیست"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"ارتباطات مادون قرمز مجاز نیست"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"ایمیل HTML مجاز نیست"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"مرورگرها مجاز نیستند"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"ایمیل مصرف‌کننده مجاز نیست"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"اشتراک‌گذاری اینترنتی مجاز نیست"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"پیام‌های SMIME لازم است"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"استفاده از بلوتوث محدود است"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"برنامه‌های خاص مجاز نیستند"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"فقط برنامه‌های خاص مجاز هستند"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"اندازه نوشتار ایمیل محدود است"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"اندازه ایمیل HTML محدود است"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"کارت sd باید رمزگذاری شود"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"پیوست‌ها مجاز نیستند"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"اندازه پیوست محدود است"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"در حالت رومینگ فقط همگام‌سازی دستی مجاز است"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"دستگاه باید رمزگذاری شود"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"خودکار"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"یک روز"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"سه روز"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"یک هفته"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"دو هفته"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"یک ماه"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"همه"</string>
-</resources>

diff --git a/exchange2/res/values-fi/strings.xml b/exchange2/res/values-fi/strings.xml
deleted file mode 100644
index 3fbc7eb..0000000
--- a/exchange2/res/values-fi/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Hyväksytty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Hylätty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Alustava: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Peruutettu: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Päivitetty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Milloin: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Missä: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Milloin: <xliff:g id="EVENTDATE">%s</xliff:g> (toistuva)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Milloin: <xliff:g id="EVENTDATE">%s</xliff:g> (koko päivän)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Milloin: <xliff:g id="EVENTDATE">%s</xliff:g> (koko päivän, toistuva)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalenteri lisätty"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Poikkeus toistuvassa tapahtumassa, peruutettu <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Poikkeus toistuvassa tapahtumassa, muutettu <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Älä salli tallennuskortteja"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Älä salli allekirjoittamatt. sovelluksia"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Älä salli allekirjoittamatt. sov. asent."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Älä salli wifi-yhteyttä"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Älä salli tekstiviestejä"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Älä salli POP3- tai IMAP-tilejä"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Älä salli infrapunaviestintää"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Älä salli HTML-sähköpostia"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Älä salli selaimia"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Älä salli kuluttajasähköpostia"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Älä salli internet-jakamista"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Vaadi SMIME-viestit"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Rajoita bluetoothin käyttöä"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Älä salli määritettyjä sovelluksia"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Salli vain määritetyt sovellukset"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Rajoita tekstimuot. sähköpostien kokoa"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Rajoita HTML-muot. sähköpostien kokoa"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Vaatii SD-kortin salauksen"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Älä salli liitetiedostoja"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Rajoita liitetiedostojen kokoa"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Salli vain man. synkr. roaming-tilassa"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Vaatii laitteen salauksen"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaattinen"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Yksi päivä"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Kolme päivää"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Yksi viikko"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Kaksi viikkoa"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Yksi kuukausi"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Kaikki"</string>
-</resources>

diff --git a/exchange2/res/values-fr/strings.xml b/exchange2/res/values-fr/strings.xml
deleted file mode 100644
index 6f89dc7..0000000
--- a/exchange2/res/values-fr/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Réunion acceptée : <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Réunion refusée : <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Projet de réunion : <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Réunion annulée : <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Mise à jour : <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Date : <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Lieu : <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Date : <xliff:g id="EVENTDATE">%s</xliff:g> (périodique)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Quand : <xliff:g id="EVENTDATE">%s</xliff:g> (toute la journée)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Quand : <xliff:g id="EVENTDATE">%s</xliff:g> (toute la journée, récurrent)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Agenda Exchange ajouté"</string>
-    <string name="app_name" msgid="5316597712787122829">"Services Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Cet événement a été annulé pour : <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Les détails de cet événement ont été modifiés pour : <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Ne pas autoriser les cartes de stockage"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Ne pas autoriser programmes d\'installation non signés"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ne pas autoriser programmes d\'installation non signés"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Ne pas autoriser les communications Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Ne pas autoriser les SMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Ne pas autoriser les comptes POP3 ni IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Ne pas autoriser communication infrarouge"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Ne pas autoriser e-mails au format HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Ne pas autoriser les navigateurs"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Ne pas autoriser e-mails publicitaires"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Ne pas autoriser partage connexion Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Exiger le format SMIME pour les messages"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Limiter l\'utilisation de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Interdire les applications spécifiées"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Autoriser applications spécifiées uniq."</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Autoriser e-mails texte selon taille"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Autoriser e-mails HTML selon taille"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Exiger le chiffrement de la carte SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Ne pas autoriser les pièces jointes"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Autoriser pièces jointes selon taille"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Interdire synchro auto en itinérance"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Exiger le chiffrement de l\'appareil"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatique"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un jour"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trois jours"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Une semaine"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Deux semaines"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mois"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tous"</string>
-</resources>

diff --git a/exchange2/res/values-hi/strings.xml b/exchange2/res/values-hi/strings.xml
deleted file mode 100644
index 15c7b80..0000000
--- a/exchange2/res/values-hi/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"स्‍वीकृत: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"अस्‍वीकृत: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"अस्थायी: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"रद्द हो गई: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"अपडेट किया गया: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"कब: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"कहां: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"कब: <xliff:g id="EVENTDATE">%s</xliff:g> (पुनरावर्ती)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"कब: <xliff:g id="EVENTDATE">%s</xliff:g> (पूरा दिन)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"कब: <xliff:g id="EVENTDATE">%s</xliff:g> (पूरा दिन, पुनरावृत्ति)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange कैलेंडर जोड़ा गया"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"यह ईवेंट इसके लिए रद्द कर दिया गया है: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"इस ईवेंट का विवरण इसके लिए ‍बदल दिया गया है: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"संग्रहण कार्ड को अनुमति न दें"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"अहस्ताक्षरित एप्लिकेशन की अनुमति न दें"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"अहस्ता. एप्लि. इंस्‍टॉलर को अनुमति न दें"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fi की अनुमति न दें"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"पाठ संदेश सेवा की अनुमति न दें"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3 या IMAP खातों को अनुमति न दें"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"अवरक्त संचारों को अनुमति न दें"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML ईमेल को अनुमति न दें"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"ब्राउज़र को अनुमति न दें"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"उपभोक्ता ईमेल की अनुमति न दें"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"इंटरनेट साझाकरण की अनुमति न दें"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME संदेश आवश्‍यक"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Bluetooth का उपयोग प्रतिबंधित करें"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"निर्दिष्ट एप्लिकेशन की अनुमति न दें"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"केवल निर्दिष्ट एप्लिकेशन की अनुमति दें"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"पाठ ईमेल का आकार प्रतिबंधित करें"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"HTML ईमेल का आकार प्रतिबंधित करें"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SD कार्ड एन्‍क्रिप्शन आवश्‍यक"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"अनुलग्नकों की अनुमति न दें"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"अनुलग्‍नक का आकार प्रतिबंधित करें"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"रोमिंग पर मैन्‍युअल समन्वयन ही करने दें"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"उपकरण एन्‍क्रिप्शन आवश्‍यक"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"स्वचालित"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"एक दिन"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"तीन दिन"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"एक सप्‍ताह"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"दो सप्‍ताह"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"एक माह"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"सभी"</string>
-</resources>

diff --git a/exchange2/res/values-hr/strings.xml b/exchange2/res/values-hr/strings.xml
deleted file mode 100644
index 6eab0f4..0000000
--- a/exchange2/res/values-hr/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Prihvaćeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Odbijeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Probno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Otkazano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Ažurirano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kad: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Gdje: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (ponavljanje)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (cijeli dan)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (cijeli dan, ponavlja se)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Dodan je Exchange kalendar"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Ovaj je događaj otkazan za: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Pojedinosti ovog događaja promijenjene su za: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Ne dopusti memorijske kartice"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Ne dopusti nepotpisane aplikacije"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ne dopusti instal. prog. nepotpis. apl."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Ne dopusti Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Ne dopusti slanje SMS poruka"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Ne dopusti POP3 ili IMAP račune"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Ne dopusti infracrvenu komunikaciju"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Ne dopusti e-poštu u HTML-u"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Ne dopusti preglednike"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Ne dopusti potrošačku e-poštu"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Ne dopusti dijeljenje na internetu"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Zahtijevaj SMIME poruke"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ograniči upotrebu Bluetootha"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Odbaci navedene aplikacije"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Dopusti samo navedene aplikacije"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ograniči veličinu tekstualne e-pošte"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ograniči veličinu e-pošte u HTML-u"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Zahtijevaj enkripciju SD kartice"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Ne dopusti privitke"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ograniči veličinu privitka"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Dopusti samo ručnu sinkr. u roamingu"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Zahtijevaj enkripciju uređaja"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatski"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jedan dan"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dana"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jedan tjedan"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tjedna"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jedan mjesec"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Sve"</string>
-</resources>

diff --git a/exchange2/res/values-hu/strings.xml b/exchange2/res/values-hu/strings.xml
deleted file mode 100644
index 0f20934..0000000
--- a/exchange2/res/values-hu/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Elfogadva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Elutasítva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Feltételes: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Lemondva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Frissítve: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Időpont: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Helyszín: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Időpont: <xliff:g id="EVENTDATE">%s</xliff:g> (ismétlődő)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Időpont: <xliff:g id="EVENTDATE">%s</xliff:g> (egész nap)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Időpont: <xliff:g id="EVENTDATE">%s</xliff:g> (egész nap, ismétlődő)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-naptár hozzáadva"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange szolgáltatások"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Ezt az eseményt törölték: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Az esemény részletei a következőre módosultak: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Memóriakártyák nem engedélyezettek"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Csak hiteles alkalmazások engedélyezése"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Csak hiteles alkalmazásokat telepítsen"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fi tiltása"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Szöveges üzenetküldés nem engedélyezett"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3/IMAP-fiókok nem engedélyezettek"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Infra kommunikáció nem engedélyezett"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML e-mailek nem engedélyezettek"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"A böngészők nem engedélyezettek"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Fogyasztói e-mailek nem engedélyezettek"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Internetmegosztás tiltása"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME-üzenetek szükségesek"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Bluetooth használatának korlátozása"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Meghatározott alkalmazások tiltása"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Csak megadott alkalmazások engedélyezése"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Szöveges e-mailek méretének korlátozása"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"HTML e-mailek méretének korlátozása"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SD-kártya titkosítása szükséges"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Mellékletek nem engedélyezettek"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Mellékletek méretének korlátozása"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Csak kézi szinkronizálás barangoláskor"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Eszköztitkosítás szükséges"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatikus"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Egy nap"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Három nap"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Egy hét"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Két hét"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Egy hónap"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Összes"</string>
-</resources>

diff --git a/exchange2/res/values-in/strings.xml b/exchange2/res/values-in/strings.xml
deleted file mode 100644
index 61ba13e..0000000
--- a/exchange2/res/values-in/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Diterima: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Ditolak: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentatif: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Dibatalkan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Diperbarui: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kapan: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Di mana: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Waktu: <xliff:g id="EVENTDATE">%s</xliff:g> (terjadi berulang)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kapan: <xliff:g id="EVENTDATE">%s</xliff:g> (sepanjang hari)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kapan: <xliff:g id="EVENTDATE">%s</xliff:g> (sepanjang hari, berulang)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Tukar kalender yang ditambahkan"</string>
-    <string name="app_name" msgid="5316597712787122829">"Layanan Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Acara ini telah dibatalkan untuk: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Detail acara ini telah diubah untuk: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Jangan izinkan kartu penyimpanan"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Jangan izinkan apl tak bertanda tangan"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Jgn izinkan pmasang apl tak bertanda tgn"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Jangan izinkan Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Jangan izinkan pesan teks"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Jangan izinkan akun POP3 atau IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Jangan izinkan komunikasi inframerah"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Jangan izinkan email HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Jangan izinkan browser"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Jangan izinkan email pelanggan"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Jangan izinkan berbagi internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Memerlukan pesan SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Batasi penggunaan Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Tolak apl yang disebutkan"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Izinkan apl yang disebutkan saja"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Batasi ukuran email teks"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Batasi ukuran email HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Membutuhkan enkripsi kartu SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Jangan izinkan lampiran"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Batasi ukuran lampiran"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Hanya izinkan sinkr. manual saat roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Memerlukan enkripsi perangkat"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Otomatis"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Satu hari"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tiga hari"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Satu minggu"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dua minggu"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Semua"</string>
-</resources>

diff --git a/exchange2/res/values-it/strings.xml b/exchange2/res/values-it/strings.xml
deleted file mode 100644
index 406d1a0..0000000
--- a/exchange2/res/values-it/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Accettato: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Rifiutato: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentativo: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Annullato: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Aggiornamento riuscito: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Quando: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Dove: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (ricorrente)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (tutto il giorno)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (tutto il giorno, ricorrente)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendario Exchange aggiunto"</string>
-    <string name="app_name" msgid="5316597712787122829">"Servizi Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Questo evento è stato annullato per la data: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"I dettagli di questo evento sono cambiati per la data: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Non consentire schede di memoria"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Non consentire applicazioni non firmate"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Non consentire installer app. non firmate"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Non consentire Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Non consentire messaggi di testo"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Non consentire account POP3 o IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Non consentire comunicazione a infrarossi"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Non consentire email HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Non consentire browser"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Non consentire email di livello consumer"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Non consentire condivisione Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Richiedi messaggi SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Limita utilizzo Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Non consentire applicazioni specificate"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Consenti solo applicazioni specificate"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Limita dimensioni testo email"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Limita dimensioni email HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Richiedi crittografia scheda SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Non consentire allegati"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Limita dimensioni allegati"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Consenti solo sincr. manuale in roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Richiedi crittografia dispositivo"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatico"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un giorno"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre giorni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una settimana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Due settimane"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mese"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tutto"</string>
-</resources>

diff --git a/exchange2/res/values-iw/strings.xml b/exchange2/res/values-iw/strings.xml
deleted file mode 100644
index af25116..0000000
--- a/exchange2/res/values-iw/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"התקבלה: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"נדחה: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"לא סופי: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"בוטל: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"עודכן: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"מתי: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"היכן: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"מתי: <xliff:g id="EVENTDATE">%s</xliff:g> (אירוע חוזר)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"מתי: <xliff:g id="EVENTDATE">%s</xliff:g> (כל יום)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"מתי: <xliff:g id="EVENTDATE">%s</xliff:g> (כל היום, חוזר)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"נוסף יומן של Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"שירותי Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"אירוע זה בוטל לתאריך: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"הפרטים של אירוע זה השתנו בתאריך: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"אל תאפשר כרטיסי אחסון"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"אל תאפשר יישומים לא חתומים"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"אל תאפשר תוכנות התקנה לא חתומות של יישום."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"אל תאפשר Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"אל תאפשר העברת הודעות טקסט"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"אל תאפשר חשבונות מסוג POP3 או IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"אל תאפשר תקשורת אינפרא-אדום"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"אל תאפשר דוא\"ל בפורמט HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"אל תאפשר דפדפנים"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"אל תאפשר דוא\"ל צרכן"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"אל תאפשר שיתוף באינטרנט"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"נדרשת העברת הודעות SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"הגבל את השימוש ב-Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"אל תאפשר יישומים שצוינו"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"אפשר רק יישומים שצוינו"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"הגבל את גודל הטקסט בדוא\"ל"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"הגבל גודל דוא\"ל בפורמט HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"נדרשת הצפנת כרטיס SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"אל תאפשר קבצים מצורפים"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"הגבל את גודל הקובץ המצורף"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"אפשר רק סינכרון ידני בעת נדידה"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"נדרשת הצפנת מכשיר"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"אוטומטי"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"יום אחד"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"שלושה ימים"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"שבוע אחד"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"שבועיים"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"חודש אחד"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"הכל"</string>
-</resources>

diff --git a/exchange2/res/values-ja/strings.xml b/exchange2/res/values-ja/strings.xml
deleted file mode 100644
index 7cdfafe..0000000
--- a/exchange2/res/values-ja/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"承諾しました: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"辞退しました: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"仮承諾: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"辞退しました: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"更新されました: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"日時: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"場所: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"日時: <xliff:g id="EVENTDATE">%s</xliff:g>（定期的）"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"日付: <xliff:g id="EVENTDATE">%s</xliff:g>（終日）"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"日付: <xliff:g id="EVENTDATE">%s</xliff:g>（終日、定期的）"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchangeカレンダーを追加しました"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchangeサービス"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"この予定はキャンセルされました: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"この予定の詳細が変更されました: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"SDカードを許可しない"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"無署名のアプリを許可しない"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"無署名のアプリインストーラを許可しない"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fiを許可しない"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"テキストメッセージを許可しない"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3/IMAPアカウントを許可しない"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"赤外線通信を許可しない"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTMLメールを許可しない"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"ブラウザを許可しない"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"ダイレクトメールを許可しない"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"インターネット共有を許可しない"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME形式のメッセージを必須とする"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Bluetoothの使用を制限する"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"指定したアプリを許可しない"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"指定したアプリのみ許可する"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"テキストメールのサイズを制限する"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"HTMLメールのサイズを制限する"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SDカードの暗号化を必須とする"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"添付ファイルを許可しない"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"添付ファイルのサイズを制限する"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"ローミング中は手動での同期のみを許可する"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"端末の暗号化を必須とする"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自動"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"1日"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3日間"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1週間"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2週間"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1か月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"すべて"</string>
-</resources>

diff --git a/exchange2/res/values-ko/strings.xml b/exchange2/res/values-ko/strings.xml
deleted file mode 100644
index 516705f..0000000
--- a/exchange2/res/values-ko/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"수락: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"거부: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"미정: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"취소: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"업데이트: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"일시: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"장소: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"일시: <xliff:g id="EVENTDATE">%s</xliff:g>(반복 일정)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"일시: <xliff:g id="EVENTDATE">%s</xliff:g>(종일)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"일시: <xliff:g id="EVENTDATE">%s</xliff:g>(종일, 반복)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange 캘린더 추가됨"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange 서비스"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"<xliff:g id="DATE">%s</xliff:g>에 있을 이 일정이 취소되었습니다."</string>
-    <string name="exception_updated" msgid="3397583105901142050">"<xliff:g id="DATE">%s</xliff:g>에 있을 이 일정의 세부사항이 변경되었습니다."</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"저장 카드 허용 안함"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"서명되지 않은 앱 허용 안함"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"서명되지 않은 앱 설치 프로그램 허용 안함"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wi-Fi 허용 안함"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"문자 메시지 허용 안함"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3 또는 IMAP 계정 허용 안함"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"적외선 통신 허용 안함"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML 이메일 허용 안함"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"브라우저 허용 안함"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"소비자 이메일 허용 안함"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"인터넷 공유 허용 안함"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME 메시지 필요"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"블루투스 사용 제한"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"지정된 앱 허용 안함"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"지정한 앱만 허용"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"텍스트 이메일 크기 제한"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"HTML 이메일 크기 제한"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SD 카드 암호화 필요"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"첨부 파일 허용 안함"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"첨부 파일 크기 제한"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"로밍 중에 수동 동기화만 허용"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"기기 암호화 필요"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"자동"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"하루"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3일"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1주"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2주"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1달"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"전체"</string>
-</resources>

diff --git a/exchange2/res/values-lt/strings.xml b/exchange2/res/values-lt/strings.xml
deleted file mode 100644
index f5e37f5..0000000
--- a/exchange2/res/values-lt/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Priimta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Atmesta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Neapsispręsta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Atšaukta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Atnaujinta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kada: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kur: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (pasikartojantis)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (visą dieną)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (visą dieną, pasikartojantis)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Pridėtas „Exchange“ kalendorius"</string>
-    <string name="app_name" msgid="5316597712787122829">"„Exchange“ paslaugos"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Šis įvykis atšauktas: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Išsami šio įvykio informacija buvo pakeista: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Neleisti atminties kortelių"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Neleisti anoniminių programų"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Neleisti anon. programų diegimo progr."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Neleisti „Wi-Fi“"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Neleisti teksto pranešimų"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Neleisti POP3 ar IMAP prieigos paskyrų"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Neleisti infraraudonųjų spindulių ryšių"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Neleisti HTML el. laiškų"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Neleisti naršyklių"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Neleisti vartotojų el. laiškų"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Neleisti bendrinimo internetu"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Reikalauti SMIME pranešimų"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Apriboti „Bluetooth“ naudojimą"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Neleisti nurodytų programų"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Leisti tik nurodytas programas"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Riboti teksto el. laiškų dydį"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Riboti HTML el. laiškų dydį"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Reikalauti SD kortelės šifravimo"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Neleisti priedų"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Riboti priedo dydį"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Veikiant tarptink. r. sinch. tik pačiam"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Reikalauti įrenginių šifravimo"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatinis"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Vieną dieną"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tris dienas"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Viena savaitė"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dvi savaitės"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Vienas mėnuo"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visas"</string>
-</resources>

diff --git a/exchange2/res/values-lv/strings.xml b/exchange2/res/values-lv/strings.xml
deleted file mode 100644
index b615f28..0000000
--- a/exchange2/res/values-lv/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Pieņemts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Noraidīts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Pagaidu: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Atcelts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Atjaunināts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kad: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kur: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kad: <xliff:g id="EVENTDATE">%s</xliff:g> (tiek atkārtots)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kad: <xliff:g id="EVENTDATE">%s</xliff:g> (visu dienu)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kad: <xliff:g id="EVENTDATE">%s</xliff:g> (visu dienu, atkārtoti)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange kalendārs ir pievienots"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange pakalpojumi"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Pasākums šajā datumā ir atcelts: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Šī pasākuma dati šādā datumā ir mainīti: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Neatļaut atmiņas kartes"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Neatļaut neparakstītas lietotnes"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Neatļaut neparakst. lietotņu instal. p."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Neatļaut Wi-Fi savienojumu"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Neatļaut īsziņas"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Neatļaut POP3 vai IMAP kontus"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Neatļaut infrasarkanos sakarus"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Neatļaut HTML e-pasta ziņojumus"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Neatļaut pārlūkprogrammas"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Neatļaut patērētāju e-pasta ziņojumus"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Neatļaut kopīgošanu internetā"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Pieprasīt SMIME formāta ziņojumus"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ierobežot Bluetooth lietošanu"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Neatļaut noteiktas lietotnes"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Atļaut tikai norādītās lietotnes"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ierobežot teksta e-pasta ziņojumu izmēru"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ierobežot HTML e-pasta ziņojumu izmēru"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Pieprasīt SD kartes šifrēšanu"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Neatļaut pielikumus"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ierobežot pielikumu izmēru"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Atļaut tikai man. sinhr., izm. viesabon."</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Pieprasīt ierīces šifrēšanu"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automātiski"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Viena diena"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trīs dienas"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Viena nedēļa"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Divas nedēļas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Viens mēnesis"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visi"</string>
-</resources>

diff --git a/exchange2/res/values-ms/strings.xml b/exchange2/res/values-ms/strings.xml
deleted file mode 100644
index d838e16..0000000
--- a/exchange2/res/values-ms/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Diterima: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Ditolak: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Sementaraan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Dibatalkan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Dikemas kini: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Bila: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Di mana: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Bila: <xliff:g id="EVENTDATE">%s</xliff:g> (berulangan)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Bila: <xliff:g id="EVENTDATE">%s</xliff:g> (sepanjang hari)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Bila: <xliff:g id="EVENTDATE">%s</xliff:g> (sepanjang hari, berulang-ulang)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Kalendar Exchange ditambah"</string>
-    <string name="app_name" msgid="5316597712787122829">"Perkhidmatan Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Acara ini sudah dibatalkan untuk: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Butiran acara ini telah ditukar kepada: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Jgn benarkan kad storan"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Jgn bnrkan apl tanpa tandatangan"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Jgn bnrkan pemsng apl tanpa tandatangan"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Jgn benarkan Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Jgn benarkan pemesejan teks"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Jgn benarkan akaun POP3 atau IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Jgn benarkan komunikasi inframerah"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Jgn benarkan e-mel HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Jgn benarkan penyemak imbas"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Jgn benarkan e-mel pengguna"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Jgn benarkan perkongsian internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Perlukan mesej SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Hadkan penggunaan Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Jgn benarkan apl tertentu"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Benarnya hanya apl dinyatakan"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Hadkan saiz e-mel teks"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Hadkan saiz e-mel HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Memerlukan penyulitan kad SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Jgn benarkan lampiran"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Hadkan saiz lampiran"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Bnr sgrk manual sj semasa perayauan"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Perlukan penyulitan peranti"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatik"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Satu hari"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tiga hari"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Satu minggu"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dua minggu"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Semua"</string>
-</resources>

diff --git a/exchange2/res/values-nb/strings.xml b/exchange2/res/values-nb/strings.xml
deleted file mode 100644
index 1affca5..0000000
--- a/exchange2/res/values-nb/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Godtatt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Avslått: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Foreslått: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Kansellert: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Oppdatert: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Når: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Hvor: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Når: <xliff:g id="EVENTDATE">%s</xliff:g> (gjentakende)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Når: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dagen)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Når: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dagen, gjentakende)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalender er lagt til"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange-tjenester"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Denne aktiviteten er kansellert for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Detaljene for denne aktiviteten er endret for: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Ikke tillat minnekort"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Ikke tillat usignerte apper"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ikke tillat usign. appinstallasjonsprog."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Ikke tillat Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Ikke tillat tekstmeldinger"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Ikke tillat POP3- eller IMAP-kontoer"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Ikke tillat infrarød kommunikasjon"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Ikke tillat e-post i HTML-format"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Ikke tillat nettlesere"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Ikke tillat forbruker-e-post"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Ikke tillat Internett-deling"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Krev SMIME-meldinger"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Begrens bruk av Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Forby angitte apper"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Tillat bare spesifikke apper"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Begrens størr. på e-post i tekstformat"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Begrens størr. på e-post i HTML-format"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Krev kryptering av SD-kort"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Ikke tillat vedlegg"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Begrens vedleggsstørrelse"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Bare tillat manuell synk. ved roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Krev enhetskryptering"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Én dag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dager"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Én uke"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uker"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Én måned"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
-</resources>

diff --git a/exchange2/res/values-nl/strings.xml b/exchange2/res/values-nl/strings.xml
deleted file mode 100644
index c211304..0000000
--- a/exchange2/res/values-nl/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Geaccepteerd: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Afgewezen: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Voorlopig: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Geannuleerd: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Bijgewerkt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Wanneer: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Waar: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (herhalen)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dag)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Wanneer: <xliff:g id="EVENTDATE">%s</xliff:g> (hele dag, herhalen)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-agenda toegevoegd"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Deze afspraak is geannuleerd voor: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"De details van deze afspraak zijn gewijzigd voor: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Geheugenkaarten niet toestaan"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Niet-ondertekende apps niet toestaan"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Niet-ondertekende appinstallers weigeren"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Wifi niet toestaan"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Sms\'en niet toestaan"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3- of IMAP-accounts niet toestaan"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Infraroodcommunicatie niet toestaan"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML-e-mail niet toestaan"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Browsers niet toestaan"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Consumenten-e-mail niet toestaan"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Internet delen niet toestaan"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"SMIME-berichten vereisen"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Het gebruik van Bluetooth beperken"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Opgegeven apps niet toestaan"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Alleen opgegeven apps toestaan"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Tekstgrootte van e-mail beperken"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Grootte van HTML-e-mails beperken"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Codering van SD-kaart vereisen"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Bijlagen niet toestaan"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Grootte van bijlagen beperken"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Alleen handm. synchr. toestn bij roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Apparaatencryptie vereisen"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Eén dag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Drie dagen"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Eén week"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Twee weken"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Eén maand"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alles"</string>
-</resources>

diff --git a/exchange2/res/values-pl/strings.xml b/exchange2/res/values-pl/strings.xml
deleted file mode 100644
index 33b2aff..0000000
--- a/exchange2/res/values-pl/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Zaakceptowano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Odrzucono: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Wahanie: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Anulowano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Zaktualizowano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kiedy: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Gdzie: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kiedy: <xliff:g id="EVENTDATE">%s</xliff:g> (powtarzane)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Data: <xliff:g id="EVENTDATE">%s</xliff:g> (cały dzień)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Data: <xliff:g id="EVENTDATE">%s</xliff:g> (cały dzień, cykliczne)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Dodano kalendarz Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Usługi Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"To zdarzenie zostało anulowane dla: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Szczegóły tego zdarzenia zostały zmienione dla: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Nie zezwalaj na karty pamięci"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Nie zezwalaj na niepodpisane aplikacje"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Nie zezwalaj na niepodpisane instalatory"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Nie zezwalaj na używanie sieci Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Nie zezwalaj na wiadomości SMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Nie zezwalaj na konta POP3 ani IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Nie zezwalaj na łączność w podczerwieni"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Nie zezwalaj na e-maile w formacie HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Nie zezwalaj na przeglądarki"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Nie zezwalaj na e-maile komercyjne"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Nie zezwalaj na udostępnianie internetu"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Wymagaj wiadomości w formacie SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ogranicz użycie Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Nie zezwalaj na określone aplikacje"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Zezwalaj tylko na określone aplikacje"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ograniczaj rozmiar e-maili tekstowych"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ogranicz rozmiar e-maili w formacie HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Wymagaj szyfrowania na karcie SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Nie zezwalaj na załączniki"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ograniczaj rozmiar załączników"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"W roamingu tylko synchronizacja ręczna"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Wymagaj szyfrowania w urządzeniu"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatycznie"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden dzień"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trzy dni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jeden tydzień"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dwa tygodnie"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden miesiąc"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Wszystkie"</string>
-</resources>

diff --git a/exchange2/res/values-pt-rPT/strings.xml b/exchange2/res/values-pt-rPT/strings.xml
deleted file mode 100644
index f9ad5e9..0000000
--- a/exchange2/res/values-pt-rPT/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Aceite: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Recusado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Provisório: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualizado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Quando: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Onde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (periódica)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (todo o dia)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (todo o dia, recorrente)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendário do Exchange adicionado"</string>
-    <string name="app_name" msgid="5316597712787122829">"Serviços do Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Este evento foi cancelado para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Os detalhes deste evento foram alterados para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Não permitir cartões de armazenamento"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Não permitir aplicações não assinadas"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Não permitir prog. de inst. não assinados"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Não permitir Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Não permitir mensagens de texto"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Não permitir contas POP3 ou IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Não permitir comun. por infravermelhos"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Não permitir e-mails em HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Não permitir navegadores"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Não permitir e-mails ao consumidor"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Não permitir partilha de internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Solicitar mensagens SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Limitar utilização de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Não permitir aplicações especificadas"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permitir apenas aplicações especificadas"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Limitar tamanho de e-mails de texto"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Limitar tamanho de e-mails em HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Solicitar encriptação do cartão SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Não permitir anexos"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Limitar tamanho dos anexos"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Permitir apenas sinc. manual em roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Solicitar encriptação do aparelho"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Um dia"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Três dias"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Uma semana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todas"</string>
-</resources>

diff --git a/exchange2/res/values-pt/strings.xml b/exchange2/res/values-pt/strings.xml
deleted file mode 100644
index 2b98532..0000000
--- a/exchange2/res/values-pt/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Aceito: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Recusado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentativa: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Atualizado: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Quando:<xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Onde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (recorrente)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (o dia todo)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Quando: <xliff:g id="EVENTDATE">%s</xliff:g> (o dia todo, recorrente)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Agenda do Exchange adicionada"</string>
-    <string name="app_name" msgid="5316597712787122829">"Serviços Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Este evento foi cancelado para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Os detalhes deste evento foram alterados para: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Não permitir cartões de armazenamento"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Não permitir aplicativos não assinados"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Não permitir instal. aplic. não assinado"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Não permitir Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Não permitir mensagens de texto"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Não permitir contas POP3 ou IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Não permitir comunic. via infravermelho"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Não permitir e-mail em HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Não permitir navegadores"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Não permitir e-mail do consumidor"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Não permitir compart. pela Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Exigir mensagens em SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Restringir o uso de Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Desautorizar aplicativos especificados"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permitir somente aplic. especificados"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Restringir o tamanho do e-mail em texto"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Restringir tamanho do e-mail em HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Exigir criptografia do cartão SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Não permitir anexos"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Restringir tamanho do anexo"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Permitir sinc. manual somente em roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Exigir criptografia do dispositivo"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Um dia"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Três dias"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Uma semana"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
-</resources>

diff --git a/exchange2/res/values-rm/strings.xml b/exchange2/res/values-rm/strings.xml
deleted file mode 100644
index 13b3491..0000000
--- a/exchange2/res/values-rm/strings.xml
+++ /dev/null

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Acceptà: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Refusà: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Project dad inscunter: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Interrut: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualisà: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Cura: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Nua: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Cura: <xliff:g id="EVENTDATE">%s</xliff:g> (periodic)"</string>
-    <!-- no translation found for meeting_allday (6696389765484663513) -->
-    <skip />
-    <!-- no translation found for meeting_allday_recurring (2320264182781062684) -->
-    <skip />
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Agiuntà in chalender Exchange"</string>
-    <!-- no translation found for app_name (5316597712787122829) -->
-    <skip />
-    <string name="exception_cancel" msgid="6160117429428313805">"Questa occurrenza è vegnida annullada: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Ils detagls da questa occurrenza èn vegnids modifitgads: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <!-- no translation found for policy_dont_allow_storage_cards (2765447013574188473) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_unsigned_apps (4896164334956001479) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_unsigned_installers (1326544905185523540) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_wifi (3109487776704143995) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_text_messaging (7846141657345860427) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_pop_imap (4702932192358698651) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_irda (1848561629495912430) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_html (5888652525907651489) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_browser (1018764395507493616) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_consumer_email (6958427300686692292) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_internet_sharing (2370083814654927695) -->
-    <skip />
-    <!-- no translation found for policy_require_smime (673557150920820590) -->
-    <skip />
-    <!-- no translation found for policy_bluetooth_restricted (5248824127186039567) -->
-    <skip />
-    <!-- no translation found for policy_app_blacklist (8169194058285873461) -->
-    <skip />
-    <!-- no translation found for policy_app_whitelist (3670572644342165306) -->
-    <skip />
-    <!-- no translation found for policy_text_truncation (1783448050735715818) -->
-    <skip />
-    <!-- no translation found for policy_html_truncation (102158408055486343) -->
-    <skip />
-    <!-- no translation found for policy_require_sd_encryption (366468398301273342) -->
-    <skip />
-    <!-- no translation found for policy_dont_allow_attachments (6250520458670348907) -->
-    <skip />
-    <!-- no translation found for policy_max_attachment_size (4020279603050888661) -->
-    <skip />
-    <!-- no translation found for policy_require_manual_sync_roaming (6637416341015662148) -->
-    <skip />
-    <!-- no translation found for policy_require_encryption (7984702283392885348) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_window_auto (4188895354366183790) -->
-    <skip />
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"In di"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trais dis"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Ina emna"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas emnas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"In mais"</string>
-    <!-- no translation found for account_setup_options_mail_window_all (5372861827683632364) -->
-    <skip />
-</resources>

diff --git a/exchange2/res/values-ro/strings.xml b/exchange2/res/values-ro/strings.xml
deleted file mode 100644
index c5d8825..0000000
--- a/exchange2/res/values-ro/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Acceptat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Refuzat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Tentativă: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Anulat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Actualizat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Când: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Unde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Când: <xliff:g id="EVENTDATE">%s</xliff:g> (recurent)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Când: <xliff:g id="EVENTDATE">%s</xliff:g> (toată ziua)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Când: <xliff:g id="EVENTDATE">%s</xliff:g> (toată ziua, repetat)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendar Exchange adăugat"</string>
-    <string name="app_name" msgid="5316597712787122829">"Servicii Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Acest eveniment a fost anulat pentru: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Detaliile acestui eveniment au fost modificate pentru: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Nu permiteţi carduri de stocare"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Nu permiteţi aplicaţii nesemnate"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Nu permiteţi instal. aplic. nesemnate"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Nu permiteţi Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Nu permiteţi mesagerie text"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Nu permiteţi conturi POP3 sau IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Nu permiteţi comunicaţiile în infraroşu"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Nu permiteţi e-mailuri HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Nu permiteţi browserele"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Nu permiteţi e-mailuri client"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Nu permiteţi distribuirea prin internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Solicitaţi mesaje SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Limitaţi util. funcţiilor Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Nu permiteţi anumite aplicaţii"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Permiteţi numai aplicaţii indicate"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Limitaţi dimensiunea e-mailurilor text"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Limitaţi dimensiunea e-mailurilor HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Necesită criptarea cardului SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Nu permiteţi ataşamente"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Limitaţi dimensiunea ataşamentului"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"În roaming permiteţi doar sincr. manuală"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Solicitaţi criptarea dispozitivului"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automat"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"O zi"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trei zile"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"O săptămână"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Două săptămâni"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"O lună"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Toate"</string>
-</resources>

diff --git a/exchange2/res/values-ru/strings.xml b/exchange2/res/values-ru/strings.xml
deleted file mode 100644
index 7bb86c2..0000000
--- a/exchange2/res/values-ru/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Принято: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Отклонено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Может быть: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Отменено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Обновлено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Время: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Где: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Время: <xliff:g id="EVENTDATE">%s</xliff:g> (повторяющееся)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Дата: <xliff:g id="EVENTDATE">%s</xliff:g> (весь день)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Дата: <xliff:g id="EVENTDATE">%s</xliff:g> (весь день, повторяется)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Календарь Exchange добавлен"</string>
-    <string name="app_name" msgid="5316597712787122829">"Службы Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Это мероприятие отменено: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Сведения об этом мероприятии были изменены: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Не использовать карты памяти"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Запрещать неподписанные приложения"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Запрещать неподписанные установщики"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Не использовать Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Запрещать SMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Не использовать аккаунты POP3 и IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Не использовать инфракрасный порт"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Не принимать письма в формате HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Не использовать браузеры"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Не принимать пользовательскую почту"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Не использовать режим модема"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Принимать только письма в формате SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ограничить использование Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Запрещать указанные приложения"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Разрешать только указанные приложения"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ограничивать размер текстовых писем"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ограничивать размер писем в формате HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Всегда шифровать SD-карты"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Не загружать прикрепленные файлы"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ограничивать размер прикрепленных файлов"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"В роуминге только ручная синхронизация"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Всегда шифровать устройство"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматически"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Один день"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дня"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Одна неделя"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недели"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один месяц"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Все"</string>
-</resources>

diff --git a/exchange2/res/values-sk/strings.xml b/exchange2/res/values-sk/strings.xml
deleted file mode 100644
index 0a907ea..0000000
--- a/exchange2/res/values-sk/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Potvrdené: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Odmietnuté: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Možno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Zrušené: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Aktualizované: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kedy: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kde: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kedy: <xliff:g id="EVENTDATE">%s</xliff:g> (pravidelne)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kedy: <xliff:g id="EVENTDATE">%s</xliff:g> (celý deň)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kedy: <xliff:g id="EVENTDATE">%s</xliff:g> (celý deň, opakujúce sa)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Kalendár Exchange bol pridaný"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Táto udalosť bola zrušená pre termín: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Došlo k zmene podrobností tejto udalosti pre termín: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Nepovoliť karty s ukladacím priestorom"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Nepovoliť nepodpísané aplikácie"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Nepovoliť nepodpísané inštalátory aplikácií"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Nepovoliť siete Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Nepovoliť správy SMS a MMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Nepovoliť účty POP3 ani IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Nepovoliť infračervenú komunikáciu"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Nepovoliť e-mail vo formáte HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Nepovoliť prehliadače"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Nepovoliť marketingové e-maily"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Nepovoliť zdieľanie internetu"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Vyžadovať správy vo formáte SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Obmedziť použitie rozhrania Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Nepovoliť určené aplikácie"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Povoliť iba určené aplikácie"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Obmedziť veľkosť textového e-mailu"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Obmedziť veľkosť e-mailu vo formáte HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Vyžadovať šifrovanie kariet SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Nepovoliť prílohy"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Obmedziť veľkosť prílohy"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Povoliť ručnú synchr. len pri roamingu"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Vyžadovať šifrovanie zariadenia"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaticky"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden deň"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Týždeň"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden mesiac"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Všetky"</string>
-</resources>

diff --git a/exchange2/res/values-sl/strings.xml b/exchange2/res/values-sl/strings.xml
deleted file mode 100644
index 61bfbf9..0000000
--- a/exchange2/res/values-sl/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Sprejeto: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Zavrnjeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Pogojno sprejeto: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Preklicano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Posodobljeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kdaj: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kje: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kdaj: <xliff:g id="EVENTDATE">%s</xliff:g> (se ponavlja)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kdaj: <xliff:g id="EVENTDATE">%s</xliff:g> (ves dan)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kdaj: <xliff:g id="EVENTDATE">%s</xliff:g> (ves dan, ponavljajoče)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Dodan koledar računa Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Storitve Exchange Services"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Ta dogodek je bil preklican za: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Podrobnosti tega dogodka so bile spremenjene: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Ne dovoli pomnilniških kartic"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Ne dovoli nepodpisanih programov"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ne dovoli nepodpisanih namest. programov"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Ne dovoli povezave Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Ne dovoli sporočil SMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Ne dovoli računov POP3 ali IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Ne dovoli komunik. z infrardečo povezavo"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Ne dovoli e-poštnih sporočil HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Ne dovoli brskalnikov"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Ne dovoli potrošnišk. e-poštnih sporočil"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Ne dovoli skupne rabe interneta"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Zahtevaj sporočila v obliki zapisa SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Omeji uporabo Bluetootha"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Ne dovoli navedenih programov"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Dovoli samo navedene programe"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Omeji besedilo v e-poštnem sporočilu"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Omeji velikost e-poštnih sporočil HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Zahtevaj šifriranje kartice SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Ne dovoli prilog"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Omeji velikost prilog"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Med gostovanjem dovoli samo ročno sinhr."</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Zahtevaj šifriranje naprave"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Samodejno"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dan"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En teden"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tedna"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En mesec"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vse"</string>
-</resources>

diff --git a/exchange2/res/values-sr/strings.xml b/exchange2/res/values-sr/strings.xml
deleted file mode 100644
index 6abf45c..0000000
--- a/exchange2/res/values-sr/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Прихваћено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Одбијен: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Проба: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Отказано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Ажурирано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Када: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Где: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Када: <xliff:g id="EVENTDATE">%s</xliff:g> (редовно)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Када: <xliff:g id="EVENTDATE">%s</xliff:g> (цео дан)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Када: <xliff:g id="EVENTDATE">%s</xliff:g> (цео дан, понавља се)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Додат је Exchange календар"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange услуге"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Овај догађај је отказан за: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Детаљи овог догађаја су промењени за: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Не дозволи меморијске картице"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Не дозволи непотписане апликације"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Не дозволи непотписане инст. програме апликација"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Не дозволи Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Не дозволи размену текстуалних порука"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Не дозволи POP3 или IMAP налоге"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Не дозволи инфрацрвене комуникације"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Не дозволи HTML е-пошту"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Не дозволи прегледаче"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Не дозволи корисничку е-пошту"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Не дозволи дељење интернет везе"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Захтевај SMIME поруке"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Ограничи коришћење Bluetooth-а"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Онемогући наведене апликације"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Дозволи само наведене апликације"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Ограничи величину текста порука е-поште"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Ограничи величину HTML порука е-поште"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Захтевај шифровање SD картице"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Не дозволи прилоге"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ограничи величину прилога"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Дозволи само ручну синхрониз. у ромингу"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Захтевај шифровање уређаја"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Аутоматски"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Један дан"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дана"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Недељу дана"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недеље"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Месец дана"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Све"</string>
-</resources>

diff --git a/exchange2/res/values-sv/strings.xml b/exchange2/res/values-sv/strings.xml
deleted file mode 100644
index 45d9454..0000000
--- a/exchange2/res/values-sv/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Accepterat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Avvisat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Preliminärt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Inställt: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Uppdaterat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"När: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Var: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"När: <xliff:g id="EVENTDATE">%s</xliff:g> (återkommande)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"När: <xliff:g id="EVENTDATE">%s</xliff:g> (hela dagen)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"När: <xliff:g id="EVENTDATE">%s</xliff:g> (hela dagen, återkommande)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalendern har lagts till"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange-tjänster"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Det här händelsen har ställts in för: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Den här händelsens information har ändrats för: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Tillåt inte minneskort"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Tillåt inte osignerade appar"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Tillåt inte installationsprogram för osignerade appar"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Tillåt inte Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Tillåt inte SMS"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Tillåt inte POP3- eller IMAP-konton"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Tillåt inte infraröd kommunikation"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Tillåt inte HTML-e-post"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Tillåt inte webbläsare"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Tillåt inte e-post från konsument"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Tillåt inte Internetdelning"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Kräv SMIME-meddelanden"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Begränsa Bluetooth-användning"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Tillåt inte specificerade appar"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Tillåt endast specificerade appar"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Begränsa textstorleken i e-post"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Begränsa storleken på HTML-e-post"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Kräv kryptering av SD-kort"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Tillåt inte bilagor"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Begränsa bilagans storlek"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Tillåt endast manuell synk vid roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Kräv enhetskryptering"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dagar"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En vecka"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Två veckor"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En månad"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alla"</string>
-</resources>

diff --git a/exchange2/res/values-sw/strings.xml b/exchange2/res/values-sw/strings.xml
deleted file mode 100644
index 103b471..0000000
--- a/exchange2/res/values-sw/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Amekubali: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Amekataa: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Kwa sasa: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Zilizoghairiwa: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Imesasishwa: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Lini: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Wapi: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Wakati: <xliff:g id="EVENTDATE">%s</xliff:g> (itarudiwa)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Lini: <xliff:g id="EVENTDATE">%s</xliff:g> (siku nzima)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Lini: <xliff:g id="EVENTDATE">%s</xliff:g> (siku nzima, inajirudia)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Kalenda ya Exchange imeongezwa"</string>
-    <string name="app_name" msgid="5316597712787122829">"Huduma za Microsoft Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Tukio hili limeghairiwa kwa: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Maelezo ya tukio hili yamebadilishwa kwa: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"usiruhusu kadi za kuhifadhi"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Usiruhusu programu ambazo hazina saini"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Usiruhusu visakanishaji vya programu ambavyo havina saini"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Usiruhusu Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Usiruhusu utumaji ujumbe wa maandishi"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"usiruhusu akaunti za POP3 au IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"usiruhusu mawasiliano ya infraredi"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Usiruhusu barua pepe ya HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"usiruhusu vivinjari"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Usiruhusu barua pepe ya watumiaji"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Usiruhusu ushiriki kwenye mtandao"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Inahitaji ujumbe wa SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Zuia matumizi ya Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Usiruhusu programu zilizobainishwa"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Ruhusu programu zilizobainishwa pekee"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"weka mipaka ya ukubwa wa barua pepe ya maandishi"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"weka mipaka ya ukubwa wa barua pepe ya HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Inahitaji usimbaji fiche wa kadi ya SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Usiruhusu viambatisho"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"weka mipaka ya ukubwa wa viambatisho"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Ruhusu usawazishaji wa mkono wakati wa urandaji pekee"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Inahitaji usimbaji fiche wa kifaa"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Kiotomatiki"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Siku moja"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Siku tatu"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Wiki moja"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Wiki mbili"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Mwezi mmoja"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Zote"</string>
-</resources>

diff --git a/exchange2/res/values-th/strings.xml b/exchange2/res/values-th/strings.xml
deleted file mode 100644
index ec0968b..0000000
--- a/exchange2/res/values-th/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"ตกลงเข้าร่วม: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"ปฏิเสธ: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"ชั่วคราว: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"ยกเลิกแล้ว: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"อัปเดต: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"เวลา: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"สถานที่: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"เวลา: <xliff:g id="EVENTDATE">%s</xliff:g> (เกิดซ้ำ)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"เมื่อ: <xliff:g id="EVENTDATE">%s</xliff:g> (ตลอดวัน)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"เมื่อ: <xliff:g id="EVENTDATE">%s</xliff:g> (ตลอดวัน เกิดซ้ำ)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"เพิ่มปฏิทิน Exchange แล้ว"</string>
-    <string name="app_name" msgid="5316597712787122829">"บริการอีเมล Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"กิจกรรมถูกยกเลิกแล้วในวันที่: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"วันที่ของกิจกรรมนี้ถูกเปลี่ยนเป็น: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"ไม่อนุญาตให้มีการ์ดบันทึกข้อมูล"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"ไม่อนุญาตแอปพลิเคชันที่ไม่ได้ลงชื่อ"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"ไม่อนุญาตตัวติดตั้งแอปฯ ที่ไม่ได้ลงชื่อ"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"ไม่อนุญาตให้ใช้ WiFi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"ไม่อนุญาตการรับส่งข้อความ"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"ไม่อนุญาตให้ใช้บัญชี POP3 หรือ IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"ไม่อนุญาตให้มีการสื่อสารอินฟราเรด"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"ไม่อนุญาตให้รับอีเมลแบบ HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"ไม่อนุญาตให้ใช้เบราว์เซอร์"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"ไม่อนุญาตให้รับอีเมลลูกค้า"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"ไม่อนุญาตการแบ่งปันอินเทอร์เน็ต"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"ต้องมีข้อความรูปแบบ SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"จำกัดการใช้บลูทูธ"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"ไม่อนุญาตให้ใช้แอปพลิเคชันที่ระบุ"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"อนุญาตแอปพลิเคชันที่ระบุเท่านั้น"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"จำกัดขนาดอีเมลแบบข้อความ"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"จำกัดขนาดอีเมลแบบ HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"ต้องมีการเข้ารหัสการ์ด SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"ไม่อนุญาตให้ดาวน์โหลดไฟล์แนบ"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"จำกัดขนาดไฟล์แนบ"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"อนุญาตเฉพาะการซิงค์ด้วยตนเองขณะโรมมิ่ง"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"ต้องมีการเข้ารหัสอุปกรณ์"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"อัตโนมัติ"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"หนึ่งวัน"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3 วัน"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 สัปดาห์"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"สองสัปดาห์"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 เดือน"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ทั้งหมด"</string>
-</resources>

diff --git a/exchange2/res/values-tl/strings.xml b/exchange2/res/values-tl/strings.xml
deleted file mode 100644
index b29e5c4..0000000
--- a/exchange2/res/values-tl/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Tinanggap: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Tinanggihan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Pansamantala: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Kinansela: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Na-update: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Kailan: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Saan: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Kailan: <xliff:g id="EVENTDATE">%s</xliff:g> (paulit-ulit)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Kailan: <xliff:g id="EVENTDATE">%s</xliff:g> (buong araw)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Kailan: <xliff:g id="EVENTDATE">%s</xliff:g> (buong araw, umuulit)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Idinagdag ang kalendaryong Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Mga Serbisyo ng Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Kinansela ang kaganapang ito para sa: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Ang mga detalye ng kaganapang ito ay binago para sa: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Huwag payagan ang mga storage card"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Huwag payagan ang mga di-pirmadong app"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Huwag payagan di-pirmadong app installer"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Huwag payagan ang Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Huwag payagan pagpapadala text message"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Huwag payagan mga POP3 o IMAP na account"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Wag payagan mga komunikasyon sa infrared"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Huwag payagan ang HTML na email"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Huwag payagan ang mga browser"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Huwag payagan ang email ng consumer"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Huwag payagan pagbabahagi ng internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Hilingin ang mga SMIME na mensahe"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Paghigpitan ang paggamit ng Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Huwag payagan ang mga tinukoy na app"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Payagan lamang ang mga tinukoy na app"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Paghigpitan ang laki ng tekstong email"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Paghigpitan ang laki ng HTML na email"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Hilingin ang pag-encrypt ng SD card"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Huwag payagan ang mga attachment"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Paghigpitan ang laki ng attachment"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Payag lang manu-mano sync kapag roaming"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Hilingin ang pag-encrypt ng device"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Awtomatiko"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Isang araw"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tatlong araw"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Isang linggo"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dalawang linggo"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Isang buwan"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Lahat"</string>
-</resources>

diff --git a/exchange2/res/values-tr/strings.xml b/exchange2/res/values-tr/strings.xml
deleted file mode 100644
index a3373db..0000000
--- a/exchange2/res/values-tr/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Kabul edildi: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Reddedildi: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Kararsız: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"İptal Edildi: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Güncellendi: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Zaman: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Yer: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Zaman: <xliff:g id="EVENTDATE">%s</xliff:g> (yinelenen)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Tarih: <xliff:g id="EVENTDATE">%s</xliff:g> (tüm gün)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Tarih: <xliff:g id="EVENTDATE">%s</xliff:g> (tüm gün, düzenli)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange takvimi eklendi"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange Hizmetleri"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Bu olay şu tarih için iptal edildi: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Bu olayın ayrıntıları değiştirildi: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Depolama kartlarına izin verme"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"İmzasız uygulamalara izin verme"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"İmzasız uygulama yükleyicilere izin verme"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Kablosuza izin verme"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Kısa mesaja izin verme"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"POP3 veya IMAP hesaplarına izin verme"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Kızılötesi iletişime izin verme"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"HTML e-postaya izin verme"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Tarayıcılara izin verme"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Tüketici e-postasına izin verme"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"İnternet paylaşımına izin verme"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"İletilerin SMIME olmasını gerektir"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Bluetooth kullanımını kısıtla"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Belirtilen uygulamalara izin verme"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Sadece belirtilen uygulamalara izin ver"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Metin e-posta boyutunu kısıtla"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"HTML e-posta boyutunu kısıtla"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"SD kart şifrelemesi gerektir"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Eklere izin verme"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Ek boyutunu kısıtla"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Dolaşımda sadece elle senk. izin ver"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Cihaz şifrelemesi gerektir"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Otomatik"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Bir gün"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Üç gün"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Bir hafta"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"İki hafta"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Bir ay"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tümü"</string>
-</resources>

diff --git a/exchange2/res/values-uk/strings.xml b/exchange2/res/values-uk/strings.xml
deleted file mode 100644
index 9980194..0000000
--- a/exchange2/res/values-uk/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Прийнято: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Відхилено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Попередньо: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Скасовано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Оновлено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Коли: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Де: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Коли: <xliff:g id="EVENTDATE">%s</xliff:g> (повтор.)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Коли: <xliff:g id="EVENTDATE">%s</xliff:g> (увесь день)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Коли: <xliff:g id="EVENTDATE">%s</xliff:g> (увесь день, періодично)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Додано календар Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Служби Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Цю подію було скасовано для: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Деталі цієї події змінено на: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Не дозволяти карти пам’яті"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Не дозволяти непідписані програми"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Не дозвол. встановлюв. непідпис. прогр."</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Не дозволяти Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Не дозволяти текстові повідомлення"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Не дозволяти облік. записи POP3 або IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Не дозволяти інфрачервоний зв’язок"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Не дозволяти листи у форматі HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Не дозволяти веб-переглядачі"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Не дозволяти поштові сервіси"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Не дозвол. надання доступу до Інтернету"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Вимагати повідомлення у форматі SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Обмежувати використання Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Забороняти вказані програми"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Дозволяти лише вказані програми"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Обмежувати розмір тексту листів"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Обмежувати розмір листів у форматі HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Вимагати шифрування карти SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Не дозволяти вкладені файли"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Обмежувати розмір вкладених файлів"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Дозвол. синхрон. вручну лише в роумінгу"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Вимагати шифрування пристрою"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматично"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Один день"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дні"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 тиждень"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 тижні"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один місяць"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Усі"</string>
-</resources>

diff --git a/exchange2/res/values-vi/strings.xml b/exchange2/res/values-vi/strings.xml
deleted file mode 100644
index 1a7866a..0000000
--- a/exchange2/res/values-vi/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Được chấp nhận: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Đã từ chối: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Dự kiến: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Đã hủy: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Đã cập nhật: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Thời gian: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Địa điểm: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Thời gian: <xliff:g id="EVENTDATE">%s</xliff:g> (lặp lại)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Thời gian: <xliff:g id="EVENTDATE">%s</xliff:g> (cả ngày)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Thời gian: <xliff:g id="EVENTDATE">%s</xliff:g> (cả ngày, lặp lại)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Đã thêm lịch Exchange"</string>
-    <string name="app_name" msgid="5316597712787122829">"Các dịch vụ của Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Sự kiện này đã bị hủy cho: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Chi tiết về sự kiện này đã được thay đổi cho: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"Không cho phép thẻ lưu trữ"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Không cho phép ứng dụng chưa kiểm tra"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ko cho phép tr.cài đặt ứ.dụng chưa k.tra"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Không cho phép Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"Không cho phép nhắn tin văn bản"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Không cho phép tài khoản POP3 hoặc IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"Không cho phép giao tiếp bằng hồng ngoại"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"Không cho phép email HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"Không cho phép trình duyệt"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"Không cho phép email của người dùng"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Không cho phép chia sẻ kết nối Internet"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"Yêu cầu tin nhắn  SMIME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Hạn chế sử dụng Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Ko cho phép các ứng dụng được chỉ định"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Chỉ cho phép các ứng dụng được chỉ định"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Hạn chế kích thước email văn bản"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Hạn chế kích thước email HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Yêu cầu mã hóa thẻ SD"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"Không cho phép tệp đính kèm"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Hạn chế kích thước của tệp đính kèm"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"Chỉ được đ.bộ hóa thủ công khi ch.vùng"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"Yêu cầu mã hóa thiết bị"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Tự động"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Một ngày"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Ba ngày"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Một tuần"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Hai tuần"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Một tháng"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tất cả"</string>
-</resources>

diff --git a/exchange2/res/values-zh-rCN/strings.xml b/exchange2/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 1b324ce..0000000
--- a/exchange2/res/values-zh-rCN/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"已接受：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"已拒绝：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"暂定：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"已取消：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"已更新：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"时间：<xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"地点：<xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"时间：<xliff:g id="EVENTDATE">%s</xliff:g>（重复）"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"日期：<xliff:g id="EVENTDATE">%s</xliff:g>（全天）"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"日期：<xliff:g id="EVENTDATE">%s</xliff:g>（全天，循环）"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"已添加 Exchange 日历"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange 服务"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"定于以下日期的活动已取消：<xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"定于以下日期的活动的详细信息已更改：<xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"不允许使用存储卡"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"不允许安装未签名的应用"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"不允许通过未签名的安装程序来安装应用"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"不允许使用 WLAN"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"不允许使用短信功能"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"不允许使用 POP3 或 IMAP 帐户"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"不允许红外通信"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"不允许接收 HTML 电子邮件"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"不允许使用浏览器"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"不允许接收消费者电子邮件"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"不允许共享互联网连接"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"电子邮件必须采用 SMIME 格式"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"限制蓝牙功能"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"不允许使用指定的应用"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"只允许使用指定的应用"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"限制文本电子邮件的大小"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"限制 HTML 电子邮件的大小"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"要求 SD 卡加密"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"不允许下载附件"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"限制附件的大小"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"只允许在漫游时手动同步"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"要求设备加密"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自动"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"一天"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"三天"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"一周"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"两周"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"一个月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
-</resources>

diff --git a/exchange2/res/values-zh-rTW/strings.xml b/exchange2/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 66b47a8..0000000
--- a/exchange2/res/values-zh-rTW/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"已接受：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"已拒絕：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"未定：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"已取消：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"已更新：<xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"登入時間：<xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"地點：<xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"時間：<xliff:g id="EVENTDATE">%s</xliff:g> (週期性)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"時間：<xliff:g id="EVENTDATE">%s</xliff:g> (整天)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"時間：<xliff:g id="EVENTDATE">%s</xliff:g> (整天，週期性)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"已新增 Exchange 日曆"</string>
-    <string name="app_name" msgid="5316597712787122829">"Exchange 服務"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"已將 <xliff:g id="DATE">%s</xliff:g> 時的此活動取消"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"已變更此活動於 <xliff:g id="DATE">%s</xliff:g> 時的詳細資料"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"不允許儲存卡"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"不允許未簽署的應用程式"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"不允許未簽署的應用程式安裝程式"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"不允許 Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"不允許傳送簡訊"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"不允許 POP3 或 IMAP 帳戶"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"不允許紅外線通訊"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"不允許接收 HTML 電子郵件"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"不允許瀏覽器"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"不允許接收消費者電子郵件"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"不允許網際網路共用功能"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"需要 SMIME 郵件"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"限制藍牙使用量"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"不允許指定的應用程式"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"只允許指定的應用程式"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"限制文字電子郵件大小"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"限制 HTML 電子郵件大小"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"需要 SD 卡加密"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"不允許附件"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"限制附件大小"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"漫遊時僅允許手動同步處理"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"需要裝置加密"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自動"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"1 天"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3 天"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 週"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 週"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 個月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
-</resources>

diff --git a/exchange2/res/values-zu/strings.xml b/exchange2/res/values-zu/strings.xml
deleted file mode 100644
index b6bc533..0000000
--- a/exchange2/res/values-zu/strings.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Ukuvumelanisa Okusebenzayo Kokushintshanisa kwe-Microsoft"</string>
-    <string name="meeting_accepted" msgid="8796609373330400268">"Kwamukeliwe: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_declined" msgid="6707617183246608552">"Inqabile: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_tentative" msgid="8250995722130443785">"Okwesikhashana: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_canceled" msgid="3949893881872084244">"Kukhanseliwe: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_updated" msgid="8529675857361702860">"Kubuyekeziwe: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
-    <string name="meeting_when" msgid="2765696159697448656">"Nini: <xliff:g id="WHEN">%s</xliff:g>"</string>
-    <string name="meeting_where" msgid="5992367535856553079">"Kuphi: <xliff:g id="WHERE">%s</xliff:g>"</string>
-    <string name="meeting_recurring" msgid="3134262212606714023">"Nini: <xliff:g id="EVENTDATE">%s</xliff:g> (okuvela njalo)"</string>
-    <string name="meeting_allday" msgid="6696389765484663513">"Nini: <xliff:g id="EVENTDATE">%s</xliff:g> (usuku lonke)"</string>
-    <string name="meeting_allday_recurring" msgid="2320264182781062684">"Nini: <xliff:g id="EVENTDATE">%s</xliff:g> (usuku lonke, okuqhubekayo)"</string>
-    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Ukushintsha ikhalenda kufakiwe"</string>
-    <string name="app_name" msgid="5316597712787122829">"Amasevisi we-Exchange"</string>
-    <string name="exception_cancel" msgid="6160117429428313805">"Lesi senzakalo sikhanselwe i-<xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="exception_updated" msgid="3397583105901142050">"Imininingwane yalesenzakalo ishintshelwe:<xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="policy_dont_allow_storage_cards" msgid="2765447013574188473">"ungavumeli amakhadi okulonda"</string>
-    <string name="policy_dont_allow_unsigned_apps" msgid="4896164334956001479">"Ungavumeli ama-apps angabhalisiwe"</string>
-    <string name="policy_dont_allow_unsigned_installers" msgid="1326544905185523540">"Ungafumeli izifaki ze-app ezingangenanga"</string>
-    <string name="policy_dont_allow_wifi" msgid="3109487776704143995">"Ungavumeli i-Wi-Fi"</string>
-    <string name="policy_dont_allow_text_messaging" msgid="7846141657345860427">"ungavumeli imilayezo yombhalo"</string>
-    <string name="policy_dont_allow_pop_imap" msgid="4702932192358698651">"Ungavumeli i-POP3 noma ama-akhawunti e-IMAP"</string>
-    <string name="policy_dont_allow_irda" msgid="1848561629495912430">"ungavumeli ukukhulumisana kwe-infrared"</string>
-    <string name="policy_dont_allow_html" msgid="5888652525907651489">"ungavumeli i-imeyli ye-HTML"</string>
-    <string name="policy_dont_allow_browser" msgid="1018764395507493616">"ungavumeli isiphequluli"</string>
-    <string name="policy_dont_allow_consumer_email" msgid="6958427300686692292">"ungavumeli i-imeyli yomthengi"</string>
-    <string name="policy_dont_allow_internet_sharing" msgid="2370083814654927695">"Ungavumeli ukwabelana nge-inthanethi"</string>
-    <string name="policy_require_smime" msgid="673557150920820590">"idinga imiyalezo ye-SMME"</string>
-    <string name="policy_bluetooth_restricted" msgid="5248824127186039567">"Nciphisa ukusetshenziswa kwe-Bluetooth"</string>
-    <string name="policy_app_blacklist" msgid="8169194058285873461">"Ungavumeli ama-apps angacacisiwe"</string>
-    <string name="policy_app_whitelist" msgid="3670572644342165306">"Vumela ama-apps avunyelwe"</string>
-    <string name="policy_text_truncation" msgid="1783448050735715818">"Nciphisa usayizi wombhalo we-imeyli"</string>
-    <string name="policy_html_truncation" msgid="102158408055486343">"Nciphisa usayizi wama-imeyli e-HTML"</string>
-    <string name="policy_require_sd_encryption" msgid="366468398301273342">"Idinga ikhadimfihlo lekhadi le-sd"</string>
-    <string name="policy_dont_allow_attachments" msgid="6250520458670348907">"ungavumeli okunamathiselwa ku-imeyli"</string>
-    <string name="policy_max_attachment_size" msgid="4020279603050888661">"Nciphisa usayizi wokunamathiselwa ku-imeyli"</string>
-    <string name="policy_require_manual_sync_roaming" msgid="6637416341015662148">"vumela ukuvumelanisa ngokwenziwa ngezandla kuphela uma uzulazula"</string>
-    <string name="policy_require_encryption" msgid="7984702283392885348">"idinga amakhodimfihlo edivayisi"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Okuzenzakalelayo"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Usuku olulodwa"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Izinsuku ezintathu"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Iviki elilodwa"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Amaviki amabili"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Inyanga eyodwa"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Konke"</string>
-</resources>

diff --git a/exchange2/res/values/arrays.xml b/exchange2/res/values/arrays.xml
deleted file mode 100644
index d2f24f6..0000000
--- a/exchange2/res/values/arrays.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-
-    <!-- Mail sync window sizes for EAS accounts -->
-    <!--  The window length array/strings below MUST remain in sync with com.android.email -->
-    <string-array name="account_settings_mail_window_entries">
-        <item>@string/account_setup_options_mail_window_auto</item>
-        <item>@string/account_setup_options_mail_window_1day</item>
-        <item>@string/account_setup_options_mail_window_3days</item>
-        <item>@string/account_setup_options_mail_window_1week</item>
-        <item>@string/account_setup_options_mail_window_2weeks</item>
-        <item>@string/account_setup_options_mail_window_1month</item>
-        <item>@string/account_setup_options_mail_window_all</item>
-    </string-array>
-
-</resources>

diff --git a/exchange2/res/values/strings.xml b/exchange2/res/values/strings.xml
deleted file mode 100644
index 1716e35..0000000
--- a/exchange2/res/values/strings.xml
+++ /dev/null

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Deprecated strings - Move the identifiers to this section, mark as
-        DO NOT TRANSLATE, and remove the actual text. These will be removed in a
-        bulk operation. -->
-    <!-- Do Not Translate. Unused string. -->
-
-    <!-- Name of Microsoft Exchange account type; used by AccountManager -->
-    <string name="exchange_name">Corporate</string>
-    <!-- Name of Microsoft Exchange account type; used by AccountManager -->
-    <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
-
-    <!-- Message subject for meeting accepted response. This will be followed
-        by a colon and the title of the meeting (i.e. the title of the meeting becomes
-        part of the subject of the message that's sent) -->
-    <string name="meeting_accepted">
-        Accepted:
-        <xliff:g id="subject">%s</xliff:g>
-    </string>
-    <!-- Message subject for meeting declined response. This is followed by
-        a colon and the title of the meeting (i.e. the title of the meeting becomes
-        part of the subject of the message that's sent) -->
-    <string name="meeting_declined">
-        Declined:
-        <xliff:g id="subject">%s</xliff:g>
-    </string>
-    <!-- Message subject for meeting tentative response. This is followed by
-        a colon and the title of the meeting (i.e. the title of the meeting becomes
-        part of the subject of the message that's sent) -->
-    <string name="meeting_tentative">
-        Tentative:
-        <xliff:g id="subject">%s</xliff:g>
-    </string>
-    <!-- Message subject for a canceled meeting email. This is followed by a
-        colon and the title of the meeting (i.e. the title of the meeting becomes
-        part of the subject of the message that's sent) -->
-    <string name="meeting_canceled">
-        Canceled:
-        <xliff:g id="subject">%s</xliff:g>
-    </string>
-    <!-- Message subject for an updated meeting email. This is followed by a
-        colon and the title of the meeting (i.e. the title of the meeting becomes
-        part of the subject of the message that's sent) -->
-    <string name="meeting_updated">
-        Updated:
-        <xliff:g id="subject">%s</xliff:g>
-    </string>
-
-    <!-- Indicate when a meeting takes place. This is presented in in bullet
-        form, as in, "When: xxx" followed by "Where: xxx" -->
-    <string name="meeting_when">
-        When:
-        <xliff:g id="when">%s</xliff:g>
-    </string>
-    <!-- Indicate where a meeting takes place. This is presented in in bullet
-        form, as in, "When: xxx" followed by "Where: xxx" -->
-    <string name="meeting_where">
-        Where:
-        <xliff:g id="where">%s</xliff:g>
-    </string>
-    <!-- Indicate that a meeting is recurring. This would normally be presented
-        after "When: xxx", e.g. "When: Tue, Mar 10, 2010 at 2:30pm (recurring)" -->
-    <string name="meeting_recurring">
-        When:
-        <xliff:g id="eventdate" example="Tue, Mar 10, 2010 at 2:30 pm">%s</xliff:g>
-        (recurring)
-    </string>
-    <!-- Indicate that a meeting lasts all day. This would normally be presented
-        after "When: xxx", e.g. "When: Tue, Mar 10, 2010 (all day)" -->
-    <string name="meeting_allday">
-        When:
-        <xliff:g id="eventdate" example="Tue, Mar 10, 2010 ">%s</xliff:g>
-        (all day)
-    </string>
-    <!-- Indicate that a meeting lasts all day and is recurring. This would normally be presented
-        after "When: xxx", e.g. "When: Tue, Mar 10, 2010 (all day, recurring)" -->
-    <string name="meeting_allday_recurring">
-        When:
-        <xliff:g id="eventdate" example="Tue, Mar 10, 2010 ">%s</xliff:g>
-        (all day, recurring)
-    </string>
-
-    <!-- Notification message in notifications window when calendar sync is
-        automatically enabled for pre-existing Exchange accounts on upgrade -->
-    <string name="notification_exchange_calendar_added">Exchange calendar added</string>
-
-    <!-- The name of this APK as shown in manage applications settings. [CHAR LIMIT=30] -->
-    <string name="app_name" >Exchange Services</string>
-
-    <!-- Used as the body text of a message reporting to an attendee that a
-        specific instance of a recurring meeting has been canceled -->
-    <string name="exception_cancel">
-        This event has been canceled
-        for:
-        <xliff:g id="date">%s</xliff:g>
-    </string>
-    <!-- Used as the body text of a message reporting to an attendee that a
-        specific instance of a recurring meeting has been changed -->
-    <string name="exception_updated">
-        The details of this event have been changed
-        for:
-        <xliff:g id="date">%s</xliff:g>
-    </string>
-
-    <!-- The following are a list of policies that the user's server might require, but that can't
-        be enforced by our device.  We will list them separated by commas, as required -->
-    <!-- A policy in which the device may not have a storage card [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_storage_cards">Don\'t allow storage cards</string>
-    <!-- A policy in which the device may not have unsigned applications installed
-        [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_unsigned_apps">Don\'t allow unsigned apps</string>
-    <!-- A policy in which the device may not allow application installation via an unsigned
-        installer [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_unsigned_installers">Don\'t allow unsigned app
-        installers</string>
-    <!-- A policy in which the device may not allow wifi communications [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_wifi">Don\'t allow Wi-Fi</string>
-    <!-- A policy in which the device may not allow text messaging [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_text_messaging">Don\'t allow text messaging</string>
-    <!-- A policy in which the device may not allow POP3 or IMAP email accounts [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_pop_imap">Don\'t allow POP3 or IMAP accounts</string>
-    <!-- A policy in which the device may allow infrared communications [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_irda">Don\'t allow infrared communications</string>
-    <!-- A policy in which the device may allow HTML email to be received [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_html">Don\'t allow HTML email</string>
-    <!-- A policy in which the device may not allow the user of web browsers [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_browser">Don\'t allow browsers</string>
-    <!-- A policy in which the device may not allow the receipt of consumer email
-        [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_consumer_email">Don\'t allow consumer email</string>
-    <!-- A policy in which the device may not allow internet connection sharing
-        [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_internet_sharing">Don\'t allow Internet sharing</string>
-    <!-- A policy in which messages must be in SMIME format [CHAR LIMIT=50] -->
-    <string name="policy_require_smime">Require SMIME messages</string>
-    <!-- A policy in which the device's bluetooth capabilities are restricted [CHAR LIMIT=50] -->
-    <string name="policy_bluetooth_restricted">Restrict Bluetooth usage</string>
-    <!-- A policy in which the device blocks specified applications [CHAR LIMIT=50]-->
-    <string name="policy_app_blacklist">Disallow specified apps</string>
-    <!-- A policy in which the device allows only specified applications [CHAR LIMIT=50] -->
-    <string name="policy_app_whitelist">Allow only specified apps</string>
-    <!-- A policy in which the device limits the amount of text that can be displayed for a
-        given message [CHAR LIMIT=50] -->
-    <string name="policy_text_truncation">Restrict text email size</string>
-    <!-- A policy in which the device limits the amount of HTML text that can be displayed for a
-        given message [CHAR LIMIT=50] -->
-    <string name="policy_html_truncation">Restrict HTML email size</string>
-    <!-- A policy in which the device requires device or sd card encryption [CHAR LIMIT=50] -->
-    <string name="policy_require_sd_encryption">Require SD card encryption</string>
-
-    <!-- The following are a list of policies that the user's server requires and that are
-         in force.  We will list them separated by commas, as required -->
-    <!-- A policy in which attachments aren't allowed to be downloaded [CHAR LIMIT=50] -->
-    <string name="policy_dont_allow_attachments">Don\'t allow attachments</string>
-    <!-- A policy in which the device restricts the size of attachments that can be downloaded
-        [CHAR LIMIT=50] -->
-    <string name="policy_max_attachment_size">Restrict attachment size</string>
-    <!-- A policy in which the device may only sync manually while roaming [CHAR LIMIT=50] -->
-    <string name="policy_require_manual_sync_roaming">Only allow manual sync while roaming</string>
-
-    <!-- The following is a policy that may or not be supported on a particular device -->
-    <!-- A policy in which the device requires device or sd card encryption [CHAR LIMIT=50] -->
-    <string name="policy_require_encryption">Require device encryption</string>
-
-
-    <!--  The window length strings below MUST remain in sync with those in com.android.email -->
-    <!-- In account setup options & account settings screens (exchange), sync window length; this
-        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
-    <string name="account_setup_options_mail_window_auto">Automatic</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_1day">One day</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_3days">Three days</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_1week">One week</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_2weeks">Two weeks</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_1month">One month</string>
-    <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
-    <string name="account_setup_options_mail_window_all">All</string>
-</resources>

diff --git a/exchange2/res/xml/syncadapter_calendar.xml b/exchange2/res/xml/syncadapter_calendar.xml
deleted file mode 100644
index a6c0fc6..0000000
--- a/exchange2/res/xml/syncadapter_calendar.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.calendar"
-    android:accountType="com.android.exchange"
-/>

diff --git a/exchange2/res/xml/syncadapter_contacts.xml b/exchange2/res/xml/syncadapter_contacts.xml
deleted file mode 100644
index 4691aee..0000000
--- a/exchange2/res/xml/syncadapter_contacts.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.contacts"
-    android:accountType="com.android.exchange"
-/>

diff --git a/exchange2/res/xml/syncadapter_email.xml b/exchange2/res/xml/syncadapter_email.xml
deleted file mode 100644
index c7ca850..0000000
--- a/exchange2/res/xml/syncadapter_email.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.email.provider"
-    android:accountType="com.android.exchange"
-    android:supportsUploading="false"
-/>

diff --git a/exchange2/src/com/android/exchange/AbstractSyncService.java b/exchange2/src/com/android/exchange/AbstractSyncService.java
deleted file mode 100644
index 6ccc7c3..0000000
--- a/exchange2/src/com/android/exchange/AbstractSyncService.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.utility.FileLogger;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.os.Bundle;
-import android.util.Log;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * Base class for all protocol services SyncManager (extends Service, implements
- * Runnable) instantiates subclasses to run a sync (either timed, or push, or
- * mail placed in outbox, etc.) EasSyncService is currently implemented; my goal
- * would be to move IMAP to this structure when it comes time to introduce push
- * functionality.
- */
-public abstract class AbstractSyncService implements Runnable {
-
-    public String TAG = "AbstractSyncService";
-
-    public static final int SECONDS = 1000;
-    public static final int MINUTES = 60*SECONDS;
-    public static final int HOURS = 60*MINUTES;
-    public static final int DAYS = 24*HOURS;
-
-    public static final int CONNECT_TIMEOUT = 30*SECONDS;
-    public static final int NETWORK_WAIT = 15*SECONDS;
-
-    public static final String EAS_PROTOCOL = "eas";
-    public static final int EXIT_DONE = 0;
-    public static final int EXIT_IO_ERROR = 1;
-    public static final int EXIT_LOGIN_FAILURE = 2;
-    public static final int EXIT_EXCEPTION = 3;
-    public static final int EXIT_SECURITY_FAILURE = 4;
-    public static final int EXIT_ACCESS_DENIED = 5;
-
-    public Mailbox mMailbox;
-    protected long mMailboxId;
-    protected int mExitStatus = EXIT_EXCEPTION;
-    protected String mMailboxName;
-    public Account mAccount;
-    public Context mContext;
-    public int mChangeCount = 0;
-    public volatile int mSyncReason = 0;
-    protected volatile boolean mStop = false;
-    protected volatile Thread mThread;
-    protected final Object mSynchronizer = new Object();
-
-    protected volatile long mRequestTime = 0;
-    protected LinkedBlockingQueue<Request> mRequestQueue = new LinkedBlockingQueue<Request>();
-
-    /**
-     * Sent by SyncManager to request that the service stop itself cleanly
-     */
-    public abstract void stop();
-
-    /**
-     * Sent by SyncManager to indicate that an alarm has fired for this service, and that its
-     * pending (network) operation has timed out. The service is NOT automatically stopped,
-     * although the behavior is service dependent.
-     *
-     * @return true if the operation was stopped normally; false if the thread needed to be
-     * interrupted.
-     */
-    public abstract boolean alarm();
-
-    /**
-     * Sent by SyncManager to request that the service reset itself cleanly; the meaning of this
-     * operation is service dependent.
-     */
-    public abstract void reset();
-
-    /**
-     * Called to validate an account; abstract to allow each protocol to do what
-     * is necessary. For consistency with the Email app's original
-     * functionality, success is indicated by a failure to throw an Exception
-     * (ugh). Parameters are self-explanatory
-     *
-     * @param hostAuth
-     * @return a Bundle containing a result code and, depending on the result, a PolicySet or an
-     * error message
-     */
-    public abstract Bundle validateAccount(HostAuth hostAuth, Context context);
-
-    public AbstractSyncService(Context _context, Mailbox _mailbox) {
-        mContext = _context;
-        mMailbox = _mailbox;
-        mMailboxId = _mailbox.mId;
-        mMailboxName = _mailbox.mServerId;
-        mAccount = Account.restoreAccountWithId(_context, _mailbox.mAccountKey);
-    }
-
-    // Will be required when subclasses are instantiated by name
-    public AbstractSyncService(String prefix) {
-    }
-
-    /**
-     * The UI can call this static method to perform account validation.  This method wraps each
-     * protocol's validateAccount method.   Arguments are self-explanatory, except where noted.
-     *
-     * @param klass the protocol class (EasSyncService.class for example)
-     * @param hostAuth
-     * @param context
-     * @return a Bundle containing a result code and, depending on the result, a PolicySet or an
-     * error message
-     */
-    public static Bundle validate(Class<? extends AbstractSyncService> klass,
-            HostAuth hostAuth, Context context) {
-        AbstractSyncService svc;
-        try {
-            svc = klass.newInstance();
-            return svc.validateAccount(hostAuth, context);
-        } catch (IllegalAccessException e) {
-        } catch (InstantiationException e) {
-        }
-        return null;
-    }
-
-    public static class ValidationResult {
-        static final int NO_FAILURE = 0;
-        static final int CONNECTION_FAILURE = 1;
-        static final int VALIDATION_FAILURE = 2;
-        static final int EXCEPTION = 3;
-
-        static final ValidationResult succeeded = new ValidationResult(true, NO_FAILURE, null);
-        boolean success;
-        int failure = NO_FAILURE;
-        String reason = null;
-        Exception exception = null;
-
-        ValidationResult(boolean _success, int _failure, String _reason) {
-            success = _success;
-            failure = _failure;
-            reason = _reason;
-        }
-
-        ValidationResult(boolean _success) {
-            success = _success;
-        }
-
-        ValidationResult(Exception e) {
-            success = false;
-            failure = EXCEPTION;
-            exception = e;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-
-        public String getReason() {
-            return reason;
-        }
-    }
-
-    public boolean isStopped() {
-        return mStop;
-    }
-
-    public Object getSynchronizer() {
-        return mSynchronizer;
-    }
-
-    /**
-     * Convenience methods to do user logging (i.e. connection activity).  Saves a bunch of
-     * repetitive code.
-     */
-    public void userLog(String string, int code, String string2) {
-        if (Eas.USER_LOG) {
-            userLog(string + code + string2);
-        }
-    }
-
-    public void userLog(String string, int code) {
-        if (Eas.USER_LOG) {
-            userLog(string + code);
-        }
-    }
-
-    public void userLog(String str, Exception e) {
-        if (Eas.USER_LOG) {
-            Log.e(TAG, str, e);
-        } else {
-            Log.e(TAG, str + e);
-        }
-        if (Eas.FILE_LOG) {
-            FileLogger.log(e);
-        }
-    }
-
-    /**
-     * Standard logging for EAS.
-     * If user logging is active, we concatenate any arguments and log them using Log.d
-     * We also check for file logging, and log appropriately
-     * @param strings strings to concatenate and log
-     */
-    public void userLog(String ...strings) {
-        if (Eas.USER_LOG) {
-            String logText;
-            if (strings.length == 1) {
-                logText = strings[0];
-            } else {
-                StringBuilder sb = new StringBuilder(64);
-                for (String string: strings) {
-                    sb.append(string);
-                }
-                logText = sb.toString();
-            }
-            Log.d(TAG, logText);
-            if (Eas.FILE_LOG) {
-                FileLogger.log(TAG, logText);
-            }
-        }
-    }
-
-    /**
-     * Error log is used for serious issues that should always be logged
-     * @param str the string to log
-     */
-    public void errorLog(String str) {
-        Log.e(TAG, str);
-        if (Eas.FILE_LOG) {
-            FileLogger.log(TAG, str);
-        }
-    }
-
-    /**
-     * Waits for up to 10 seconds for network connectivity; returns whether or not there is
-     * network connectivity.
-     *
-     * @return whether there is network connectivity
-     */
-    public boolean hasConnectivity() {
-        ConnectivityManager cm =
-                (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        int tries = 0;
-        while (tries++ < 1) {
-            // Use the same test as in ExchangeService#waitForConnectivity
-            // TODO: Create common code for this test in emailcommon
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null) {
-                return true;
-            }
-            try {
-                Thread.sleep(10*SECONDS);
-            } catch (InterruptedException e) {
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Request handling (common functionality)
-     * Can be overridden if desired
-     */
-
-    public void addRequest(Request req) {
-        mRequestQueue.offer(req);
-    }
-
-    public void removeRequest(Request req) {
-        mRequestQueue.remove(req);
-    }
-
-    public boolean hasPendingRequests() {
-        return !mRequestQueue.isEmpty();
-    }
-
-    public void clearRequests() {
-        mRequestQueue.clear();
-    }
-}

diff --git a/exchange2/src/com/android/exchange/CalendarSyncAdapterService.java b/exchange2/src/com/android/exchange/CalendarSyncAdapterService.java
deleted file mode 100644
index 5ff03b3..0000000
--- a/exchange2/src/com/android/exchange/CalendarSyncAdapterService.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.accounts.Account;
-import android.accounts.OperationCanceledException;
-import android.app.Service;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SyncResult;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.provider.CalendarContract.Events;
-import android.util.Log;
-
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-
-public class CalendarSyncAdapterService extends Service {
-    private static final String TAG = "EAS CalendarSyncAdapterService";
-    private static SyncAdapterImpl sSyncAdapter = null;
-    private static final Object sSyncAdapterLock = new Object();
-
-    private static final String ACCOUNT_AND_TYPE_CALENDAR =
-        MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CALENDAR;
-    private static final String DIRTY_IN_ACCOUNT =
-        Events.DIRTY + "=1 AND " + Events.ACCOUNT_NAME + "=?";
-    private static final String[] ID_SYNC_KEY_PROJECTION =
-        new String[] {MailboxColumns.ID, MailboxColumns.SYNC_KEY};
-    private static final int ID_SYNC_KEY_MAILBOX_ID = 0;
-    private static final int ID_SYNC_KEY_SYNC_KEY = 1;
-
-    public CalendarSyncAdapterService() {
-        super();
-    }
-
-    private static class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
-        private Context mContext;
-
-        public SyncAdapterImpl(Context context) {
-            super(context, true /* autoInitialize */);
-            mContext = context;
-        }
-
-        @Override
-        public void onPerformSync(Account account, Bundle extras,
-                String authority, ContentProviderClient provider, SyncResult syncResult) {
-            try {
-                CalendarSyncAdapterService.performSync(mContext, account, extras,
-                        authority, provider, syncResult);
-            } catch (OperationCanceledException e) {
-            }
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        synchronized (sSyncAdapterLock) {
-            if (sSyncAdapter == null) {
-                sSyncAdapter = new SyncAdapterImpl(getApplicationContext());
-            }
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sSyncAdapter.getSyncAdapterBinder();
-    }
-
-    /**
-     * Partial integration with system SyncManager; we tell our EAS ExchangeService to start a
-     * calendar sync when we get the signal from SyncManager.
-     * The missing piece at this point is integration with the push/ping mechanism in EAS; this will
-     * be put in place at a later time.
-     */
-    private static void performSync(Context context, Account account, Bundle extras,
-            String authority, ContentProviderClient provider, SyncResult syncResult)
-            throws OperationCanceledException {
-        ContentResolver cr = context.getContentResolver();
-        boolean logging = Eas.USER_LOG;
-        if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
-            Cursor c = cr.query(Events.CONTENT_URI,
-                    new String[] {Events._ID}, DIRTY_IN_ACCOUNT, new String[] {account.name}, null);
-            try {
-                if (!c.moveToFirst()) {
-                    if (logging) {
-                        Log.d(TAG, "No changes for " + account.name);
-                    }
-                    return;
-                }
-            } finally {
-                c.close();
-            }
-        }
-
-        // Find the (EmailProvider) account associated with this email address
-        Cursor accountCursor =
-            cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
-                    EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
-                    new String[] {account.name}, null);
-        try {
-            if (accountCursor.moveToFirst()) {
-                long accountId = accountCursor.getLong(0);
-                // Now, find the calendar mailbox associated with the account
-                Cursor mailboxCursor = cr.query(Mailbox.CONTENT_URI, ID_SYNC_KEY_PROJECTION,
-                        ACCOUNT_AND_TYPE_CALENDAR, new String[] {Long.toString(accountId)}, null);
-                try {
-                     if (mailboxCursor.moveToFirst()) {
-                        if (logging) {
-                            Log.d(TAG, "Upload sync requested for " + account.name);
-                        }
-                        String syncKey = mailboxCursor.getString(ID_SYNC_KEY_SYNC_KEY);
-                        if ((syncKey == null) || (syncKey.equals("0"))) {
-                            if (logging) {
-                                Log.d(TAG, "Can't sync; mailbox in initial state");
-                            }
-                            return;
-                        }
-                        // Ask for a sync from our sync manager
-                        ExchangeService.serviceRequest(mailboxCursor.getLong(
-                                ID_SYNC_KEY_MAILBOX_ID), ExchangeService.SYNC_UPSYNC);
-                    }
-                } finally {
-                    mailboxCursor.close();
-                }
-            }
-        } finally {
-            accountCursor.close();
-        }
-    }
-}
\ No newline at end of file

diff --git a/exchange2/src/com/android/exchange/EmailSyncAdapterService.java b/exchange2/src/com/android/exchange/EmailSyncAdapterService.java
deleted file mode 100644
index f91ee13..0000000
--- a/exchange2/src/com/android/exchange/EmailSyncAdapterService.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-
-import android.accounts.Account;
-import android.accounts.OperationCanceledException;
-import android.app.Service;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SyncResult;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-
-public class EmailSyncAdapterService extends Service {
-    private static final String TAG = "EAS EmailSyncAdapterService";
-    private static SyncAdapterImpl sSyncAdapter = null;
-    private static final Object sSyncAdapterLock = new Object();
-
-    private static final String[] ID_PROJECTION = new String[] {EmailContent.RECORD_ID};
-    private static final String ACCOUNT_AND_TYPE_INBOX =
-        MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_INBOX;
-
-    public EmailSyncAdapterService() {
-        super();
-    }
-
-    private static class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
-        private Context mContext;
-
-        public SyncAdapterImpl(Context context) {
-            super(context, true /* autoInitialize */);
-            mContext = context;
-        }
-
-        @Override
-        public void onPerformSync(Account account, Bundle extras,
-                String authority, ContentProviderClient provider, SyncResult syncResult) {
-            try {
-                EmailSyncAdapterService.performSync(mContext, account, extras,
-                        authority, provider, syncResult);
-            } catch (OperationCanceledException e) {
-            }
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        synchronized (sSyncAdapterLock) {
-            if (sSyncAdapter == null) {
-                sSyncAdapter = new SyncAdapterImpl(getApplicationContext());
-            }
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sSyncAdapter.getSyncAdapterBinder();
-    }
-
-    /**
-     * Partial integration with system SyncManager; we tell our EAS ExchangeService to start an
-     * inbox sync when we get the signal from the system SyncManager.
-     */
-    private static void performSync(Context context, Account account, Bundle extras,
-            String authority, ContentProviderClient provider, SyncResult syncResult)
-            throws OperationCanceledException {
-        ContentResolver cr = context.getContentResolver();
-        Log.i(TAG, "performSync");
-
-        // Find the (EmailProvider) account associated with this email address
-        Cursor accountCursor =
-            cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
-                    ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.name},
-                    null);
-        try {
-            if (accountCursor.moveToFirst()) {
-                long accountId = accountCursor.getLong(0);
-                // Now, find the inbox associated with the account
-                Cursor mailboxCursor = cr.query(Mailbox.CONTENT_URI, ID_PROJECTION,
-                        ACCOUNT_AND_TYPE_INBOX, new String[] {Long.toString(accountId)}, null);
-                try {
-                     if (mailboxCursor.moveToFirst()) {
-                        Log.i(TAG, "Mail sync requested for " + account.name);
-                        // Ask for a sync from our sync manager
-                        ExchangeService.serviceRequest(mailboxCursor.getLong(0),
-                                ExchangeService.SYNC_KICK);
-                    }
-                } finally {
-                    mailboxCursor.close();
-                }
-            }
-        } finally {
-            accountCursor.close();
-        }
-    }
-}
\ No newline at end of file

diff --git a/exchange2/src/com/android/exchange/EmailSyncAlarmReceiver.java b/exchange2/src/com/android/exchange/EmailSyncAlarmReceiver.java
deleted file mode 100644
index 8006016..0000000
--- a/exchange2/src/com/android/exchange/EmailSyncAlarmReceiver.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*
- *  Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.util.Log;
-
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.provider.ProviderUnavailableException;
-
-import java.util.ArrayList;
-
-/**
- * EmailSyncAlarmReceiver (USAR) is used by the SyncManager to start up-syncs of user-modified data
- * back to the Exchange server.
- *
- * Here's how this works for Email, for example:
- *
- * 1) User modifies or deletes an email from the UI.
- * 2) SyncManager, which has a ContentObserver watching the Message class, is alerted to a change
- * 3) SyncManager sets an alarm (to be received by USAR) for a few seconds in the
- * future (currently 15), the delay preventing excess syncing (think of it as a debounce mechanism).
- * 4) ESAR Receiver's onReceive method is called
- * 5) ESAR goes through all change and deletion records and compiles a list of mailboxes which have
- * changes to be uploaded.
- * 6) ESAR calls SyncManager to start syncs of those mailboxes
- *
- * If EmailProvider isn't available, the upsyncs will happen the next time ExchangeService starts
- *
- */
-public class EmailSyncAlarmReceiver extends BroadcastReceiver {
-    final String[] MAILBOX_DATA_PROJECTION = {MessageColumns.MAILBOX_KEY};
-
-    @Override
-    public void onReceive(final Context context, Intent intent) {
-        new Thread(new Runnable() {
-            public void run() {
-                handleReceive(context);
-            }
-        }).start();
-    }
-
-    private void handleReceive(Context context) {
-        ArrayList<Long> mailboxesToNotify = new ArrayList<Long>();
-        ContentResolver cr = context.getContentResolver();
-        int messageCount = 0;
-        
-        // Get a selector for EAS accounts (we don't want to sync on changes to POP/IMAP messages)
-        String selector = ExchangeService.getEasAccountSelector();
-        
-        try {
-            // Find all of the deletions
-            Cursor c = cr.query(Message.DELETED_CONTENT_URI, MAILBOX_DATA_PROJECTION, selector,
-                   null, null);
-            if (c == null) throw new ProviderUnavailableException();
-            try {
-                // Keep track of which mailboxes to notify; we'll only notify each one once
-                while (c.moveToNext()) {
-                    messageCount++;
-                    long mailboxId = c.getLong(0);
-                    if (!mailboxesToNotify.contains(mailboxId)) {
-                        mailboxesToNotify.add(mailboxId);
-                    }
-                }
-            } finally {
-                c.close();
-            }
-
-            // Now, find changed messages
-            c = cr.query(Message.UPDATED_CONTENT_URI, MAILBOX_DATA_PROJECTION, selector,
-                    null, null);
-            if (c == null) throw new ProviderUnavailableException();
-            try {
-                // Keep track of which mailboxes to notify; we'll only notify each one once
-                while (c.moveToNext()) {
-                    messageCount++;
-                    long mailboxId = c.getLong(0);
-                    if (!mailboxesToNotify.contains(mailboxId)) {
-                        mailboxesToNotify.add(mailboxId);
-                    }
-                }
-            } finally {
-                c.close();
-            }
-
-            // Request service from the mailbox
-            for (Long mailboxId: mailboxesToNotify) {
-                ExchangeService.serviceRequest(mailboxId, ExchangeService.SYNC_UPSYNC);
-            }
-        } catch (ProviderUnavailableException e) {
-            Log.e("EmailSyncAlarmReceiver", "EmailProvider unavailable; aborting alarm receiver");
-        }
-    }
-}

diff --git a/exchange2/src/com/android/exchange/ExchangeService.java b/exchange2/src/com/android/exchange/ExchangeService.java
deleted file mode 100644
index 9c8286b..0000000
--- a/exchange2/src/com/android/exchange/ExchangeService.java
+++ /dev/null

@@ -1,2705 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Debug;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.os.Process;
-import android.os.RemoteCallbackList;
-import android.os.RemoteException;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.Calendars;
-import android.provider.CalendarContract.Events;
-import android.provider.ContactsContract;
-import android.util.Log;
-
-import com.android.emailcommon.Api;
-import com.android.emailcommon.TempDirectory;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.Body;
-import com.android.emailcommon.provider.EmailContent.BodyColumns;
-import com.android.emailcommon.provider.EmailContent.HostAuthColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.SyncColumns;
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.provider.Policy;
-import com.android.emailcommon.provider.ProviderUnavailableException;
-import com.android.emailcommon.service.AccountServiceProxy;
-import com.android.emailcommon.service.EmailServiceProxy;
-import com.android.emailcommon.service.EmailServiceStatus;
-import com.android.emailcommon.service.IEmailService;
-import com.android.emailcommon.service.IEmailServiceCallback;
-import com.android.emailcommon.service.PolicyServiceProxy;
-import com.android.emailcommon.service.SearchParams;
-import com.android.emailcommon.utility.EmailAsyncTask;
-import com.android.emailcommon.utility.EmailClientConnectionManager;
-import com.android.emailcommon.utility.Utility;
-import com.android.exchange.adapter.CalendarSyncAdapter;
-import com.android.exchange.adapter.ContactsSyncAdapter;
-import com.android.exchange.adapter.Search;
-import com.android.exchange.provider.MailboxUtilities;
-import com.android.exchange.utility.FileLogger;
-
-import org.apache.http.conn.params.ConnManagerPNames;
-import org.apache.http.conn.params.ConnPerRoute;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The ExchangeService handles all aspects of starting, maintaining, and stopping the various sync
- * adapters used by Exchange.  However, it is capable of handing any kind of email sync, and it
- * would be appropriate to use for IMAP push, when that functionality is added to the Email
- * application.
- *
- * The Email application communicates with EAS sync adapters via ExchangeService's binder interface,
- * which exposes UI-related functionality to the application (see the definitions below)
- *
- * ExchangeService uses ContentObservers to detect changes to accounts, mailboxes, and messages in
- * order to maintain proper 2-way syncing of data.  (More documentation to follow)
- *
- */
-public class ExchangeService extends Service implements Runnable {
-
-    private static final String TAG = "ExchangeService";
-
-    // The ExchangeService's mailbox "id"
-    public static final int EXTRA_MAILBOX_ID = -1;
-    public static final int EXCHANGE_SERVICE_MAILBOX_ID = 0;
-
-    private static final int SECONDS = 1000;
-    private static final int MINUTES = 60*SECONDS;
-    private static final int ONE_DAY_MINUTES = 1440;
-
-    private static final int EXCHANGE_SERVICE_HEARTBEAT_TIME = 15*MINUTES;
-    private static final int CONNECTIVITY_WAIT_TIME = 10*MINUTES;
-
-    // Sync hold constants for services with transient errors
-    private static final int HOLD_DELAY_MAXIMUM = 4*MINUTES;
-
-    // Reason codes when ExchangeService.kick is called (mainly for debugging)
-    // UI has changed data, requiring an upsync of changes
-    public static final int SYNC_UPSYNC = 0;
-    // A scheduled sync (when not using push)
-    public static final int SYNC_SCHEDULED = 1;
-    // Mailbox was marked push
-    public static final int SYNC_PUSH = 2;
-    // A ping (EAS push signal) was received
-    public static final int SYNC_PING = 3;
-    // Misc.
-    public static final int SYNC_KICK = 4;
-    // A part request (attachment load, for now) was sent to ExchangeService
-    public static final int SYNC_SERVICE_PART_REQUEST = 5;
-
-    // Requests >= SYNC_CALLBACK_START generate callbacks to the UI
-    public static final int SYNC_CALLBACK_START = 6;
-    // startSync was requested of ExchangeService (other than due to user request)
-    public static final int SYNC_SERVICE_START_SYNC = SYNC_CALLBACK_START + 0;
-    // startSync was requested of ExchangeService (due to user request)
-    public static final int SYNC_UI_REQUEST = SYNC_CALLBACK_START + 1;
-
-    private static final String WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX =
-        MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.TYPE + "!=" +
-        Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + " and " + MailboxColumns.SYNC_INTERVAL +
-        " IN (" + Mailbox.CHECK_INTERVAL_PING + ',' + Mailbox.CHECK_INTERVAL_PUSH + ')';
-    protected static final String WHERE_IN_ACCOUNT_AND_PUSHABLE =
-        MailboxColumns.ACCOUNT_KEY + "=? and type in (" + Mailbox.TYPE_INBOX + ','
-        + Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + ',' + Mailbox.TYPE_CONTACTS + ','
-        + Mailbox.TYPE_CALENDAR + ')';
-    protected static final String WHERE_IN_ACCOUNT_AND_TYPE_INBOX =
-        MailboxColumns.ACCOUNT_KEY + "=? and type = " + Mailbox.TYPE_INBOX ;
-    private static final String WHERE_MAILBOX_KEY = Message.MAILBOX_KEY + "=?";
-    private static final String WHERE_PROTOCOL_EAS = HostAuthColumns.PROTOCOL + "=\"" +
-        AbstractSyncService.EAS_PROTOCOL + "\"";
-    private static final String WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN =
-        "(" + MailboxColumns.TYPE + '=' + Mailbox.TYPE_OUTBOX
-        + " or " + MailboxColumns.SYNC_INTERVAL + "!=" + Mailbox.CHECK_INTERVAL_NEVER + ')'
-        + " and " + MailboxColumns.ACCOUNT_KEY + " in (";
-    private static final String ACCOUNT_KEY_IN = MailboxColumns.ACCOUNT_KEY + " in (";
-    private static final String WHERE_CALENDAR_ID = Events.CALENDAR_ID + "=?";
-
-    // Offsets into the syncStatus data for EAS that indicate type, exit status, and change count
-    // The format is S<type_char>:<exit_char>:<change_count>
-    public static final int STATUS_TYPE_CHAR = 1;
-    public static final int STATUS_EXIT_CHAR = 3;
-    public static final int STATUS_CHANGE_COUNT_OFFSET = 5;
-
-    // Ready for ping
-    public static final int PING_STATUS_OK = 0;
-    // Service already running (can't ping)
-    public static final int PING_STATUS_RUNNING = 1;
-    // Service waiting after I/O error (can't ping)
-    public static final int PING_STATUS_WAITING = 2;
-    // Service had a fatal error; can't run
-    public static final int PING_STATUS_UNABLE = 3;
-    // Service is disabled by user (checkbox)
-    public static final int PING_STATUS_DISABLED = 4;
-
-    private static final int MAX_CLIENT_CONNECTION_MANAGER_SHUTDOWNS = 1;
-
-    // We synchronize on this for all actions affecting the service and error maps
-    private static final Object sSyncLock = new Object();
-    // All threads can use this lock to wait for connectivity
-    public static final Object sConnectivityLock = new Object();
-    public static boolean sConnectivityHold = false;
-
-    // Keeps track of running services (by mailbox id)
-    private final HashMap<Long, AbstractSyncService> mServiceMap =
-        new HashMap<Long, AbstractSyncService>();
-    // Keeps track of services whose last sync ended with an error (by mailbox id)
-    /*package*/ ConcurrentHashMap<Long, SyncError> mSyncErrorMap =
-        new ConcurrentHashMap<Long, SyncError>();
-    // Keeps track of which services require a wake lock (by mailbox id)
-    private final HashMap<Long, Boolean> mWakeLocks = new HashMap<Long, Boolean>();
-    // Keeps track of PendingIntents for mailbox alarms (by mailbox id)
-    private final HashMap<Long, PendingIntent> mPendingIntents = new HashMap<Long, PendingIntent>();
-    // The actual WakeLock obtained by ExchangeService
-    private WakeLock mWakeLock = null;
-    // Keep our cached list of active Accounts here
-    public final AccountList mAccountList = new AccountList();
-
-    // Observers that we use to look for changed mail-related data
-    private final Handler mHandler = new Handler();
-    private AccountObserver mAccountObserver;
-    private MailboxObserver mMailboxObserver;
-    private SyncedMessageObserver mSyncedMessageObserver;
-
-    // Concurrent because CalendarSyncAdapter can modify the map during a wipe
-    private final ConcurrentHashMap<Long, CalendarObserver> mCalendarObservers =
-        new ConcurrentHashMap<Long, CalendarObserver>();
-
-    private ContentResolver mResolver;
-
-    // The singleton ExchangeService object, with its thread and stop flag
-    protected static ExchangeService INSTANCE;
-    private static Thread sServiceThread = null;
-    // Cached unique device id
-    private static String sDeviceId = null;
-    // HashMap of ConnectionManagers that all EAS threads can use (by ssl/port pair)
-    private static HashMap<Integer, EmailClientConnectionManager> sClientConnectionManagers =
-            new HashMap<Integer, EmailClientConnectionManager>();
-    // Count of ClientConnectionManager shutdowns
-    private static volatile int sClientConnectionManagerShutdownCount = 0;
-
-    private static volatile boolean sStartingUp = false;
-    private static volatile boolean sStop = false;
-
-    // The reason for ExchangeService's next wakeup call
-    private String mNextWaitReason;
-    // Whether we have an unsatisfied "kick" pending
-    private boolean mKicked = false;
-
-    // Receiver of connectivity broadcasts
-    private ConnectivityReceiver mConnectivityReceiver = null;
-    private ConnectivityReceiver mBackgroundDataSettingReceiver = null;
-    private volatile boolean mBackgroundData = true;
-    // The most current NetworkInfo (from ConnectivityManager)
-    private NetworkInfo mNetworkInfo;
-
-    // Callbacks as set up via setCallback
-    private final RemoteCallbackList<IEmailServiceCallback> mCallbackList =
-        new RemoteCallbackList<IEmailServiceCallback>();
-
-    private interface ServiceCallbackWrapper {
-        public void call(IEmailServiceCallback cb) throws RemoteException;
-    }
-
-    /**
-     * Proxy that can be used by various sync adapters to tie into ExchangeService's callback system
-     * Used this way:  ExchangeService.callback().callbackMethod(args...);
-     * The proxy wraps checking for existence of a ExchangeService instance
-     * Failures of these callbacks can be safely ignored.
-     */
-    static private final IEmailServiceCallback.Stub sCallbackProxy =
-        new IEmailServiceCallback.Stub() {
-
-        /**
-         * Broadcast a callback to the everyone that's registered
-         *
-         * @param wrapper the ServiceCallbackWrapper used in the broadcast
-         */
-        private synchronized void broadcastCallback(ServiceCallbackWrapper wrapper) {
-            RemoteCallbackList<IEmailServiceCallback> callbackList =
-                (INSTANCE == null) ? null: INSTANCE.mCallbackList;
-            if (callbackList != null) {
-                // Call everyone on our callback list
-                int count = callbackList.beginBroadcast();
-                try {
-                    for (int i = 0; i < count; i++) {
-                        try {
-                            wrapper.call(callbackList.getBroadcastItem(i));
-                        } catch (RemoteException e) {
-                            // Safe to ignore
-                        } catch (RuntimeException e) {
-                            // We don't want an exception in one call to prevent other calls, so
-                            // we'll just log this and continue
-                            Log.e(TAG, "Caught RuntimeException in broadcast", e);
-                        }
-                    }
-                } finally {
-                    // No matter what, we need to finish the broadcast
-                    callbackList.finishBroadcast();
-                }
-            }
-        }
-
-        @Override
-        public void loadAttachmentStatus(final long messageId, final long attachmentId,
-                final int status, final int progress) {
-            broadcastCallback(new ServiceCallbackWrapper() {
-                @Override
-                public void call(IEmailServiceCallback cb) throws RemoteException {
-                    cb.loadAttachmentStatus(messageId, attachmentId, status, progress);
-                }
-            });
-        }
-
-        @Override
-        public void sendMessageStatus(final long messageId, final String subject, final int status,
-                final int progress) {
-            broadcastCallback(new ServiceCallbackWrapper() {
-                @Override
-                public void call(IEmailServiceCallback cb) throws RemoteException {
-                    cb.sendMessageStatus(messageId, subject, status, progress);
-                }
-            });
-        }
-
-        @Override
-        public void syncMailboxListStatus(final long accountId, final int status,
-                final int progress) {
-            broadcastCallback(new ServiceCallbackWrapper() {
-                @Override
-                public void call(IEmailServiceCallback cb) throws RemoteException {
-                    cb.syncMailboxListStatus(accountId, status, progress);
-                }
-            });
-        }
-
-        @Override
-        public void syncMailboxStatus(final long mailboxId, final int status,
-                final int progress) {
-            broadcastCallback(new ServiceCallbackWrapper() {
-                @Override
-                public void call(IEmailServiceCallback cb) throws RemoteException {
-                    cb.syncMailboxStatus(mailboxId, status, progress);
-                }
-            });
-        }
-
-        @Override
-        public void loadMessageStatus(long messageId, int statusCode, int progress)
-                throws RemoteException {
-        }
-    };
-
-    /**
-     * Create our EmailService implementation here.
-     */
-    private final IEmailService.Stub mBinder = new IEmailService.Stub() {
-
-        @Override
-        public int getApiLevel() {
-            return Api.LEVEL;
-        }
-
-        @Override
-        public Bundle validate(HostAuth hostAuth) throws RemoteException {
-            return AbstractSyncService.validate(EasSyncService.class,
-                    hostAuth, ExchangeService.this);
-        }
-
-        @Override
-        public Bundle autoDiscover(String userName, String password) throws RemoteException {
-            EasSyncService service = new EasSyncService();
-            // Must init the mContext that is used in getHttpClient.
-            service.mContext = ExchangeService.this;
-            return service.tryAutodiscover(userName, password);
-        }
-
-        @Override
-        public void startSync(long mailboxId, boolean userRequest) throws RemoteException {
-            ExchangeService exchangeService = INSTANCE;
-            if (exchangeService == null) return;
-            checkExchangeServiceServiceRunning();
-            Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-            if (m == null) return;
-            Account acct = Account.restoreAccountWithId(exchangeService, m.mAccountKey);
-            if (acct == null) return;
-            // If this is a user request and we're being held, release the hold; this allows us to
-            // try again (the hold might have been specific to this account and released already)
-            if (userRequest) {
-                if (onSyncDisabledHold(acct)) {
-                    releaseSyncHolds(exchangeService, AbstractSyncService.EXIT_ACCESS_DENIED, acct);
-                    log("User requested sync of account in sync disabled hold; releasing");
-                } else if (onSecurityHold(acct)) {
-                    releaseSyncHolds(exchangeService, AbstractSyncService.EXIT_SECURITY_FAILURE,
-                            acct);
-                    log("User requested sync of account in security hold; releasing");
-                }
-                if (sConnectivityHold) {
-                    try {
-                        // UI is expecting the callbacks....
-                        sCallbackProxy.syncMailboxStatus(mailboxId, EmailServiceStatus.IN_PROGRESS,
-                                0);
-                        sCallbackProxy.syncMailboxStatus(mailboxId,
-                                EmailServiceStatus.CONNECTION_ERROR, 0);
-                    } catch (RemoteException ignore) {
-                    }
-                    return;
-                }
-            }
-            if (m.mType == Mailbox.TYPE_OUTBOX) {
-                // We're using SERVER_ID to indicate an error condition (it has no other use for
-                // sent mail)  Upon request to sync the Outbox, we clear this so that all messages
-                // are candidates for sending.
-                ContentValues cv = new ContentValues();
-                cv.put(SyncColumns.SERVER_ID, 0);
-                exchangeService.getContentResolver().update(Message.CONTENT_URI,
-                    cv, WHERE_MAILBOX_KEY, new String[] {Long.toString(mailboxId)});
-                // Clear the error state; the Outbox sync will be started from checkMailboxes
-                exchangeService.mSyncErrorMap.remove(mailboxId);
-                kick("start outbox");
-                // Outbox can't be synced in EAS
-                return;
-            } else if (!isSyncable(m)) {
-                try {
-                    // UI may be expecting the callbacks, so send them
-                    sCallbackProxy.syncMailboxStatus(mailboxId, EmailServiceStatus.IN_PROGRESS, 0);
-                    sCallbackProxy.syncMailboxStatus(mailboxId, EmailServiceStatus.SUCCESS, 0);
-                } catch (RemoteException ignore) {
-                    // We tried
-                }
-                return;
-            }
-            startManualSync(mailboxId, userRequest ? ExchangeService.SYNC_UI_REQUEST :
-                ExchangeService.SYNC_SERVICE_START_SYNC, null);
-        }
-
-        @Override
-        public void stopSync(long mailboxId) throws RemoteException {
-            stopManualSync(mailboxId);
-        }
-
-        @Override
-        public void loadAttachment(long attachmentId, boolean background) throws RemoteException {
-            Attachment att = Attachment.restoreAttachmentWithId(ExchangeService.this, attachmentId);
-            log("loadAttachment " + attachmentId + ": " + att.mFileName);
-            sendMessageRequest(new PartRequest(att, null, null));
-        }
-
-        @Override
-        public void updateFolderList(long accountId) throws RemoteException {
-            reloadFolderList(ExchangeService.this, accountId, false);
-        }
-
-        @Override
-        public void hostChanged(long accountId) throws RemoteException {
-            ExchangeService exchangeService = INSTANCE;
-            if (exchangeService == null) return;
-            ConcurrentHashMap<Long, SyncError> syncErrorMap = exchangeService.mSyncErrorMap;
-            // Go through the various error mailboxes
-            for (long mailboxId: syncErrorMap.keySet()) {
-                SyncError error = syncErrorMap.get(mailboxId);
-                // If it's a login failure, look a little harder
-                Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-                // If it's for the account whose host has changed, clear the error
-                // If the mailbox is no longer around, remove the entry in the map
-                if (m == null) {
-                    syncErrorMap.remove(mailboxId);
-                } else if (error != null && m.mAccountKey == accountId) {
-                    error.fatal = false;
-                    error.holdEndTime = 0;
-                }
-            }
-            // Stop any running syncs
-            exchangeService.stopAccountSyncs(accountId, true);
-            // Kick ExchangeService
-            kick("host changed");
-        }
-
-        @Override
-        public void setLogging(int flags) throws RemoteException {
-            Eas.setUserDebug(flags);
-        }
-
-        @Override
-        public void sendMeetingResponse(long messageId, int response) throws RemoteException {
-            sendMessageRequest(new MeetingResponseRequest(messageId, response));
-        }
-
-        @Override
-        public void loadMore(long messageId) throws RemoteException {
-        }
-
-        // The following three methods are not implemented in this version
-        @Override
-        public boolean createFolder(long accountId, String name) throws RemoteException {
-            return false;
-        }
-
-        @Override
-        public boolean deleteFolder(long accountId, String name) throws RemoteException {
-            return false;
-        }
-
-        @Override
-        public boolean renameFolder(long accountId, String oldName, String newName)
-                throws RemoteException {
-            return false;
-        }
-
-        @Override
-        public void setCallback(IEmailServiceCallback cb) throws RemoteException {
-            mCallbackList.register(cb);
-        }
-
-        /**
-         * Delete PIM (calendar, contacts) data for the specified account
-         *
-         * @param accountId the account whose data should be deleted
-         * @throws RemoteException
-         */
-        @Override
-        public void deleteAccountPIMData(long accountId) throws RemoteException {
-            ExchangeService exchangeService = INSTANCE;
-            if (exchangeService == null) return;
-            // Stop any running syncs
-            ExchangeService.stopAccountSyncs(accountId);
-            // Delete the data
-            ExchangeService.deleteAccountPIMData(accountId);
-            long accountMailboxId = Mailbox.findMailboxOfType(exchangeService, accountId,
-                    Mailbox.TYPE_EAS_ACCOUNT_MAILBOX);
-            if (accountMailboxId != Mailbox.NO_MAILBOX) {
-                // Make sure the account mailbox is held due to security
-                synchronized(sSyncLock) {
-                    mSyncErrorMap.put(accountMailboxId, exchangeService.new SyncError(
-                            AbstractSyncService.EXIT_SECURITY_FAILURE, false));
-
-                }
-            }
-            // Make sure the reconciler runs
-            runAccountReconcilerSync(ExchangeService.this);
-        }
-
-        @Override
-        public int searchMessages(long accountId, SearchParams searchParams, long destMailboxId) {
-            ExchangeService exchangeService = INSTANCE;
-            if (exchangeService == null) return 0;
-            return Search.searchMessages(exchangeService, accountId, searchParams,
-                    destMailboxId);
-        }
-
-        @Override
-        public void sendMail(long accountId) throws RemoteException {
-        }
-    };
-
-    /**
-     * Return a list of all Accounts in EmailProvider.  Because the result of this call may be used
-     * in account reconciliation, an exception is thrown if the result cannot be guaranteed accurate
-     * @param context the caller's context
-     * @param accounts a list that Accounts will be added into
-     * @return the list of Accounts
-     * @throws ProviderUnavailableException if the list of Accounts cannot be guaranteed valid
-     */
-    private static AccountList collectEasAccounts(Context context, AccountList accounts) {
-        ContentResolver resolver = context.getContentResolver();
-        Cursor c = resolver.query(Account.CONTENT_URI, Account.CONTENT_PROJECTION, null, null,
-                null);
-        // We must throw here; callers might use the information we provide for reconciliation, etc.
-        if (c == null) throw new ProviderUnavailableException();
-        try {
-            ContentValues cv = new ContentValues();
-            while (c.moveToNext()) {
-                long hostAuthId = c.getLong(Account.CONTENT_HOST_AUTH_KEY_RECV_COLUMN);
-                if (hostAuthId > 0) {
-                    HostAuth ha = HostAuth.restoreHostAuthWithId(context, hostAuthId);
-                    if (ha != null && ha.mProtocol.equals("eas")) {
-                        Account account = new Account();
-                        account.restore(c);
-                        // Cache the HostAuth
-                        account.mHostAuthRecv = ha;
-                        accounts.add(account);
-                        // Fixup flags for inbox (should accept moved mail)
-                        Mailbox inbox = Mailbox.restoreMailboxOfType(context, account.mId,
-                                Mailbox.TYPE_INBOX);
-                        if (inbox != null &&
-                                ((inbox.mFlags & Mailbox.FLAG_ACCEPTS_MOVED_MAIL) == 0)) {
-                            cv.put(MailboxColumns.FLAGS,
-                                    inbox.mFlags | Mailbox.FLAG_ACCEPTS_MOVED_MAIL);
-                            resolver.update(
-                                    ContentUris.withAppendedId(Mailbox.CONTENT_URI, inbox.mId), cv,
-                                    null, null);
-                        }
-                    }
-                }
-            }
-        } finally {
-            c.close();
-        }
-        return accounts;
-    }
-
-    static class AccountList extends ArrayList<Account> {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public boolean add(Account account) {
-            // Cache the account manager account
-            account.mAmAccount = new android.accounts.Account(account.mEmailAddress,
-                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
-            super.add(account);
-            return true;
-        }
-
-        public boolean contains(long id) {
-            for (Account account : this) {
-                if (account.mId == id) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public Account getById(long id) {
-            for (Account account : this) {
-                if (account.mId == id) {
-                    return account;
-                }
-            }
-            return null;
-        }
-
-        public Account getByName(String accountName) {
-            for (Account account : this) {
-                if (account.mEmailAddress.equalsIgnoreCase(accountName)) {
-                    return account;
-                }
-            }
-            return null;
-        }
-    }
-
-    public static void deleteAccountPIMData(long accountId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        Mailbox mailbox =
-            Mailbox.restoreMailboxOfType(exchangeService, accountId, Mailbox.TYPE_CONTACTS);
-        if (mailbox != null) {
-            EasSyncService service = EasSyncService.getServiceForMailbox(exchangeService, mailbox);
-            ContactsSyncAdapter adapter = new ContactsSyncAdapter(service);
-            adapter.wipe();
-        }
-        mailbox =
-            Mailbox.restoreMailboxOfType(exchangeService, accountId, Mailbox.TYPE_CALENDAR);
-        if (mailbox != null) {
-            EasSyncService service = EasSyncService.getServiceForMailbox(exchangeService, mailbox);
-            CalendarSyncAdapter adapter = new CalendarSyncAdapter(service);
-            adapter.wipe();
-        }
-    }
-
-    static boolean onSecurityHold(Account account) {
-        return (account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0;
-    }
-
-    private boolean onSyncDisabledHold(Account account) {
-        return (account.mFlags & Account.FLAGS_SYNC_DISABLED) != 0;
-    }
-
-    class AccountObserver extends ContentObserver {
-        String mSyncableEasMailboxSelector = null;
-        String mEasAccountSelector = null;
-
-        // Runs when ExchangeService first starts
-        public AccountObserver(Handler handler) {
-            super(handler);
-            // At startup, we want to see what EAS accounts exist and cache them
-            // TODO: Move database work out of UI thread
-            Context context = getContext();
-            synchronized (mAccountList) {
-                try {
-                    collectEasAccounts(context, mAccountList);
-                } catch (ProviderUnavailableException e) {
-                    // Just leave if EmailProvider is unavailable
-                    return;
-                }
-                // Create an account mailbox for any account without one
-                for (Account account : mAccountList) {
-                    int cnt = Mailbox.count(context, Mailbox.CONTENT_URI, "accountKey="
-                            + account.mId, null);
-                    if (cnt == 0) {
-                        // This case handles a newly created account
-                        addAccountMailbox(account.mId);
-                    }
-                }
-            }
-            // Run through accounts and update account hold information
-            Utility.runAsync(new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (mAccountList) {
-                        for (Account account : mAccountList) {
-                            if (onSecurityHold(account)) {
-                                // If we're in a security hold, and our policies are active, release
-                                // the hold
-                                if (PolicyServiceProxy.isActive(ExchangeService.this, null)) {
-                                    PolicyServiceProxy.setAccountHoldFlag(ExchangeService.this,
-                                            account, false);
-                                    log("isActive true; release hold for " + account.mDisplayName);
-				}
-                            }
-                        }
-                    }
-                }});
-        }
-
-        /**
-         * Returns a String suitable for appending to a where clause that selects for all syncable
-         * mailboxes in all eas accounts
-         * @return a complex selection string that is not to be cached
-         */
-        public String getSyncableEasMailboxWhere() {
-            if (mSyncableEasMailboxSelector == null) {
-                StringBuilder sb = new StringBuilder(WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN);
-                boolean first = true;
-                synchronized (mAccountList) {
-                    for (Account account : mAccountList) {
-                        if (!first) {
-                            sb.append(',');
-                        } else {
-                            first = false;
-                        }
-                        sb.append(account.mId);
-                    }
-                }
-                sb.append(')');
-                mSyncableEasMailboxSelector = sb.toString();
-            }
-            return mSyncableEasMailboxSelector;
-        }
-
-        /**
-         * Returns a String suitable for appending to a where clause that selects for all eas
-         * accounts.
-         * @return a String in the form "accountKey in (a, b, c...)" that is not to be cached
-         */
-        public String getAccountKeyWhere() {
-            if (mEasAccountSelector == null) {
-                StringBuilder sb = new StringBuilder(ACCOUNT_KEY_IN);
-                boolean first = true;
-                synchronized (mAccountList) {
-                    for (Account account : mAccountList) {
-                        if (!first) {
-                            sb.append(',');
-                        } else {
-                            first = false;
-                        }
-                        sb.append(account.mId);
-                    }
-                }
-                sb.append(')');
-                mEasAccountSelector = sb.toString();
-            }
-            return mEasAccountSelector;
-        }
-
-        private void onAccountChanged() {
-            try {
-                maybeStartExchangeServiceThread();
-                Context context = getContext();
-
-                // A change to the list requires us to scan for deletions (stop running syncs)
-                // At startup, we want to see what accounts exist and cache them
-                AccountList currentAccounts = new AccountList();
-                try {
-                    collectEasAccounts(context, currentAccounts);
-                } catch (ProviderUnavailableException e) {
-                    // Just leave if EmailProvider is unavailable
-                    return;
-                }
-                synchronized (mAccountList) {
-                    for (Account account : mAccountList) {
-                        boolean accountIncomplete =
-                            (account.mFlags & Account.FLAGS_INCOMPLETE) != 0;
-                        // If the current list doesn't include this account and the account wasn't
-                        // incomplete, then this is a deletion
-                        if (!currentAccounts.contains(account.mId) && !accountIncomplete) {
-                            // The implication is that the account has been deleted; let's find out
-                            alwaysLog("Observer found deleted account: " + account.mDisplayName);
-                            // Run the reconciler (the reconciliation itself runs in the Email app)
-                            runAccountReconcilerSync(ExchangeService.this);
-                            // See if the account is still around
-                            Account deletedAccount =
-                                Account.restoreAccountWithId(context, account.mId);
-                            if (deletedAccount != null) {
-                                // It is; add it to our account list
-                                alwaysLog("Account still in provider: " + account.mDisplayName);
-                                currentAccounts.add(account);
-                            } else {
-                                // It isn't; stop syncs and clear our selectors
-                                alwaysLog("Account deletion confirmed: " + account.mDisplayName);
-                                stopAccountSyncs(account.mId, true);
-                                mSyncableEasMailboxSelector = null;
-                                mEasAccountSelector = null;
-                            }
-                        } else {
-                            // Get the newest version of this account
-                            Account updatedAccount =
-                                Account.restoreAccountWithId(context, account.mId);
-                            if (updatedAccount == null) continue;
-                            if (account.mSyncInterval != updatedAccount.mSyncInterval
-                                    || account.mSyncLookback != updatedAccount.mSyncLookback) {
-                                // Set the inbox interval to the interval of the Account
-                                // This setting should NOT affect other boxes
-                                ContentValues cv = new ContentValues();
-                                cv.put(MailboxColumns.SYNC_INTERVAL, updatedAccount.mSyncInterval);
-                                getContentResolver().update(Mailbox.CONTENT_URI, cv,
-                                        WHERE_IN_ACCOUNT_AND_TYPE_INBOX, new String[] {
-                                        Long.toString(account.mId)
-                                });
-                                // Stop all current syncs; the appropriate ones will restart
-                                log("Account " + account.mDisplayName + " changed; stop syncs");
-                                stopAccountSyncs(account.mId, true);
-                            }
-
-                            // See if this account is no longer on security hold
-                            if (onSecurityHold(account) && !onSecurityHold(updatedAccount)) {
-                                releaseSyncHolds(ExchangeService.this,
-                                        AbstractSyncService.EXIT_SECURITY_FAILURE, account);
-                            }
-
-                            // Put current values into our cached account
-                            account.mSyncInterval = updatedAccount.mSyncInterval;
-                            account.mSyncLookback = updatedAccount.mSyncLookback;
-                            account.mFlags = updatedAccount.mFlags;
-                        }
-                    }
-                    // Look for new accounts
-                    for (Account account : currentAccounts) {
-                        if (!mAccountList.contains(account.mId)) {
-                            // Don't forget to cache the HostAuth
-                            HostAuth ha = HostAuth.restoreHostAuthWithId(getContext(),
-                                    account.mHostAuthKeyRecv);
-                            if (ha == null) continue;
-                            account.mHostAuthRecv = ha;
-                            // This is an addition; create our magic hidden mailbox...
-                            log("Account observer found new account: " + account.mDisplayName);
-                            addAccountMailbox(account.mId);
-                            mAccountList.add(account);
-                            mSyncableEasMailboxSelector = null;
-                            mEasAccountSelector = null;
-                        }
-                    }
-                    // Finally, make sure our account list is up to date
-                    mAccountList.clear();
-                    mAccountList.addAll(currentAccounts);
-                }
-
-                // See if there's anything to do...
-                kick("account changed");
-            } catch (ProviderUnavailableException e) {
-                alwaysLog("Observer failed; provider unavailable");
-            }
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            new Thread(new Runnable() {
-               @Override
-            public void run() {
-                   onAccountChanged();
-                }}, "Account Observer").start();
-        }
-
-        private void addAccountMailbox(long acctId) {
-            Account acct = Account.restoreAccountWithId(getContext(), acctId);
-            Mailbox main = new Mailbox();
-            main.mDisplayName = Eas.ACCOUNT_MAILBOX_PREFIX;
-            main.mServerId = Eas.ACCOUNT_MAILBOX_PREFIX + System.nanoTime();
-            main.mAccountKey = acct.mId;
-            main.mType = Mailbox.TYPE_EAS_ACCOUNT_MAILBOX;
-            main.mSyncInterval = Mailbox.CHECK_INTERVAL_PUSH;
-            main.mFlagVisible = false;
-            main.save(getContext());
-            log("Initializing account: " + acct.mDisplayName);
-        }
-
-    }
-
-    /**
-     * Register a specific Calendar's data observer; we need to recognize when the SYNC_EVENTS
-     * column has changed (when sync has turned off or on)
-     * @param account the Account whose Calendar we're observing
-     */
-    private void registerCalendarObserver(Account account) {
-        // Get a new observer
-        CalendarObserver observer = new CalendarObserver(mHandler, account);
-        if (observer.mCalendarId != 0) {
-            // If we find the Calendar (and we'd better) register it and store it in the map
-            mCalendarObservers.put(account.mId, observer);
-            mResolver.registerContentObserver(
-                    ContentUris.withAppendedId(Calendars.CONTENT_URI, observer.mCalendarId), false,
-                    observer);
-        }
-    }
-
-    /**
-     * Unregister all CalendarObserver's
-     */
-    static public void unregisterCalendarObservers() {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        ContentResolver resolver = exchangeService.mResolver;
-        for (CalendarObserver observer: exchangeService.mCalendarObservers.values()) {
-            resolver.unregisterContentObserver(observer);
-        }
-        exchangeService.mCalendarObservers.clear();
-    }
-
-    /**
-     * Return the syncable state of an account's calendar, as determined by the sync_events column
-     * of our Calendar (from CalendarProvider2)
-     * Note that the current state of sync_events is cached in our CalendarObserver
-     * @param accountId the id of the account whose calendar we are checking
-     * @return whether or not syncing of events is enabled
-     */
-    private boolean isCalendarEnabled(long accountId) {
-        CalendarObserver observer = mCalendarObservers.get(accountId);
-        if (observer != null) {
-            return (observer.mSyncEvents == 1);
-        }
-        // If there's no observer, there's no Calendar in CalendarProvider2, so we return true
-        // to allow Calendar creation
-        return true;
-    }
-
-    private class CalendarObserver extends ContentObserver {
-        long mAccountId;
-        long mCalendarId;
-        long mSyncEvents;
-        String mAccountName;
-
-        public CalendarObserver(Handler handler, Account account) {
-            super(handler);
-            mAccountId = account.mId;
-            mAccountName = account.mEmailAddress;
-
-            // Find the Calendar for this account
-            Cursor c = mResolver.query(Calendars.CONTENT_URI,
-                    new String[] {Calendars._ID, Calendars.SYNC_EVENTS},
-                    CalendarSyncAdapter.CALENDAR_SELECTION,
-                    new String[] {account.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE},
-                    null);
-            if (c != null) {
-                // Save its id and its sync events status
-                try {
-                    if (c.moveToFirst()) {
-                        mCalendarId = c.getLong(0);
-                        mSyncEvents = c.getLong(1);
-                    }
-                } finally {
-                    c.close();
-                }
-            }
-        }
-
-        @Override
-        public synchronized void onChange(boolean selfChange) {
-            // See if the user has changed syncing of our calendar
-            if (!selfChange) {
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            Cursor c = mResolver.query(Calendars.CONTENT_URI,
-                                    new String[] {Calendars.SYNC_EVENTS}, Calendars._ID + "=?",
-                                    new String[] {Long.toString(mCalendarId)}, null);
-                            if (c == null) return;
-                            // Get its sync events; if it's changed, we've got work to do
-                            try {
-                                if (c.moveToFirst()) {
-                                    long newSyncEvents = c.getLong(0);
-                                    if (newSyncEvents != mSyncEvents) {
-                                        log("_sync_events changed for calendar in " + mAccountName);
-                                        Mailbox mailbox = Mailbox.restoreMailboxOfType(INSTANCE,
-                                                mAccountId, Mailbox.TYPE_CALENDAR);
-                                        // Sanity check for mailbox deletion
-                                        if (mailbox == null) return;
-                                        ContentValues cv = new ContentValues();
-                                        if (newSyncEvents == 0) {
-                                            // When sync is disabled, we're supposed to delete
-                                            // all events in the calendar
-                                            log("Deleting events and setting syncKey to 0 for " +
-                                                    mAccountName);
-                                            // First, stop any sync that's ongoing
-                                            stopManualSync(mailbox.mId);
-                                            // Set the syncKey to 0 (reset)
-                                            EasSyncService service =
-                                                EasSyncService.getServiceForMailbox(
-                                                        INSTANCE, mailbox);
-                                            CalendarSyncAdapter adapter =
-                                                new CalendarSyncAdapter(service);
-                                            try {
-                                                adapter.setSyncKey("0", false);
-                                            } catch (IOException e) {
-                                                // The provider can't be reached; nothing to be done
-                                            }
-                                            // Reset the sync key locally and stop syncing
-                                            cv.put(Mailbox.SYNC_KEY, "0");
-                                            cv.put(Mailbox.SYNC_INTERVAL,
-                                                    Mailbox.CHECK_INTERVAL_NEVER);
-                                            mResolver.update(ContentUris.withAppendedId(
-                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
-                                                    null);
-                                            // Delete all events using the sync adapter
-                                            // parameter so that the deletion is only local
-                                            Uri eventsAsSyncAdapter =
-                                                CalendarSyncAdapter.asSyncAdapter(
-                                                    Events.CONTENT_URI,
-                                                    mAccountName,
-                                                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
-                                            mResolver.delete(eventsAsSyncAdapter, WHERE_CALENDAR_ID,
-                                                    new String[] {Long.toString(mCalendarId)});
-                                        } else {
-                                            // Make this a push mailbox and kick; this will start
-                                            // a resync of the Calendar; the account mailbox will
-                                            // ping on this during the next cycle of the ping loop
-                                            cv.put(Mailbox.SYNC_INTERVAL,
-                                                    Mailbox.CHECK_INTERVAL_PUSH);
-                                            mResolver.update(ContentUris.withAppendedId(
-                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
-                                                    null);
-                                            kick("calendar sync changed");
-                                        }
-
-                                        // Save away the new value
-                                        mSyncEvents = newSyncEvents;
-                                    }
-                                }
-                            } finally {
-                                c.close();
-                            }
-                        } catch (ProviderUnavailableException e) {
-                            Log.w(TAG, "Observer failed; provider unavailable");
-                        }
-                    }}, "Calendar Observer").start();
-            }
-        }
-    }
-
-    private class MailboxObserver extends ContentObserver {
-        public MailboxObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            // See if there's anything to do...
-            if (!selfChange) {
-                kick("mailbox changed");
-            }
-        }
-    }
-
-    private class SyncedMessageObserver extends ContentObserver {
-        Intent syncAlarmIntent = new Intent(INSTANCE, EmailSyncAlarmReceiver.class);
-        PendingIntent syncAlarmPendingIntent =
-            PendingIntent.getBroadcast(INSTANCE, 0, syncAlarmIntent, 0);
-        AlarmManager alarmManager = (AlarmManager)INSTANCE.getSystemService(Context.ALARM_SERVICE);
-
-        public SyncedMessageObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            alarmManager.set(AlarmManager.RTC_WAKEUP,
-                    System.currentTimeMillis() + 10*SECONDS, syncAlarmPendingIntent);
-        }
-    }
-
-    static public IEmailServiceCallback callback() {
-        return sCallbackProxy;
-    }
-
-    static public Account getAccountById(long accountId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            AccountList accountList = exchangeService.mAccountList;
-            synchronized (accountList) {
-                return accountList.getById(accountId);
-            }
-        }
-        return null;
-    }
-
-    static public Account getAccountByName(String accountName) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            AccountList accountList = exchangeService.mAccountList;
-            synchronized (accountList) {
-                return accountList.getByName(accountName);
-            }
-        }
-        return null;
-    }
-
-    static public String getEasAccountSelector() {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null && exchangeService.mAccountObserver != null) {
-            return exchangeService.mAccountObserver.getAccountKeyWhere();
-        }
-        return null;
-    }
-
-    public class SyncStatus {
-        static public final int NOT_RUNNING = 0;
-        static public final int DIED = 1;
-        static public final int SYNC = 2;
-        static public final int IDLE = 3;
-    }
-
-    /*package*/ class SyncError {
-        int reason;
-        boolean fatal = false;
-        long holdDelay = 15*SECONDS;
-        long holdEndTime = System.currentTimeMillis() + holdDelay;
-
-        SyncError(int _reason, boolean _fatal) {
-            reason = _reason;
-            fatal = _fatal;
-        }
-
-        /**
-         * We double the holdDelay from 15 seconds through 8 mins
-         */
-        void escalate() {
-            if (holdDelay <= HOLD_DELAY_MAXIMUM) {
-                holdDelay *= 2;
-            }
-            holdEndTime = System.currentTimeMillis() + holdDelay;
-        }
-    }
-
-    private void logSyncHolds() {
-        if (Eas.USER_LOG) {
-            log("Sync holds:");
-            long time = System.currentTimeMillis();
-            for (long mailboxId : mSyncErrorMap.keySet()) {
-                Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
-                if (m == null) {
-                    log("Mailbox " + mailboxId + " no longer exists");
-                } else {
-                    SyncError error = mSyncErrorMap.get(mailboxId);
-                    if (error != null) {
-                        log("Mailbox " + m.mDisplayName + ", error = " + error.reason
-                                + ", fatal = " + error.fatal);
-                        if (error.holdEndTime > 0) {
-                            log("Hold ends in " + ((error.holdEndTime - time) / 1000) + "s");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Release security holds for the specified account
-     * @param account the account whose Mailboxes should be released from security hold
-     */
-    static public void releaseSecurityHold(Account account) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.releaseSyncHolds(INSTANCE, AbstractSyncService.EXIT_SECURITY_FAILURE,
-                    account);
-        }
-    }
-
-    /**
-     * Release a specific type of hold (the reason) for the specified Account; if the account
-     * is null, mailboxes from all accounts with the specified hold will be released
-     * @param reason the reason for the SyncError (AbstractSyncService.EXIT_XXX)
-     * @param account an Account whose mailboxes should be released (or all if null)
-     * @return whether or not any mailboxes were released
-     */
-    /*package*/ boolean releaseSyncHolds(Context context, int reason, Account account) {
-        boolean holdWasReleased = releaseSyncHoldsImpl(context, reason, account);
-        kick("security release");
-        return holdWasReleased;
-    }
-
-    private boolean releaseSyncHoldsImpl(Context context, int reason, Account account) {
-        boolean holdWasReleased = false;
-        for (long mailboxId: mSyncErrorMap.keySet()) {
-            if (account != null) {
-                Mailbox m = Mailbox.restoreMailboxWithId(context, mailboxId);
-                if (m == null) {
-                    mSyncErrorMap.remove(mailboxId);
-                } else if (m.mAccountKey != account.mId) {
-                    continue;
-                }
-            }
-            SyncError error = mSyncErrorMap.get(mailboxId);
-            if (error != null && error.reason == reason) {
-                mSyncErrorMap.remove(mailboxId);
-                holdWasReleased = true;
-            }
-        }
-        return holdWasReleased;
-    }
-
-    /**
-     * Reconcile Exchange accounts with AccountManager (asynchronous)
-     * @param context the caller's Context
-     */
-    public static void reconcileAccounts(final Context context) {
-        Utility.runAsync(new Runnable() {
-            @Override
-            public void run() {
-                ExchangeService exchangeService = INSTANCE;
-                if (exchangeService != null) {
-                    exchangeService.runAccountReconcilerSync(context);
-                }
-            }});
-    }
-
-    /**
-     * Blocking call to the account reconciler
-     */
-    public static void runAccountReconcilerSync(Context context) {
-        alwaysLog("Reconciling accounts...");
-        new AccountServiceProxy(context).reconcileAccounts(
-                HostAuth.SCHEME_EAS, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
-    }
-
-    public static void log(String str) {
-        log(TAG, str);
-    }
-
-    public static void log(String tag, String str) {
-        if (Eas.USER_LOG) {
-            Log.d(tag, str);
-            if (Eas.FILE_LOG) {
-                FileLogger.log(tag, str);
-            }
-        }
-    }
-
-    public static void alwaysLog(String str) {
-        if (!Eas.USER_LOG) {
-            Log.d(TAG, str);
-        } else {
-            log(str);
-        }
-    }
-
-    /**
-     * EAS requires a unique device id, so that sync is possible from a variety of different
-     * devices (e.g. the syncKey is specific to a device)  If we're on an emulator or some other
-     * device that doesn't provide one, we can create it as "device".
-     * This would work on a real device as well, but it would be better to use the "real" id if
-     * it's available
-     */
-    static public String getDeviceId(Context context) throws IOException {
-        if (sDeviceId == null) {
-            sDeviceId = new AccountServiceProxy(context).getDeviceId();
-            alwaysLog("Received deviceId from Email app: " + sDeviceId);
-        }
-        return sDeviceId;
-    }
-
-    @Override
-    public IBinder onBind(Intent arg0) {
-        return mBinder;
-    }
-
-    static public ConnPerRoute sConnPerRoute = new ConnPerRoute() {
-        @Override
-        public int getMaxForRoute(HttpRoute route) {
-            return 8;
-        }
-    };
-
-    static public synchronized EmailClientConnectionManager getClientConnectionManager(boolean ssl,
-            int port) {
-        // We'll use a different connection manager for each ssl/port pair
-        int key = (ssl ? 0x10000 : 0) + port;
-        EmailClientConnectionManager mgr = sClientConnectionManagers.get(key);
-        if (mgr == null) {
-            // After two tries, kill the process.  Most likely, this will happen in the background
-            // The service will restart itself after about 5 seconds
-            if (sClientConnectionManagerShutdownCount > MAX_CLIENT_CONNECTION_MANAGER_SHUTDOWNS) {
-                alwaysLog("Shutting down process to unblock threads");
-                Process.killProcess(Process.myPid());
-            }
-            HttpParams params = new BasicHttpParams();
-            params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 25);
-            params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, sConnPerRoute);
-            mgr = EmailClientConnectionManager.newInstance(params, ssl, port);
-            log("Creating connection manager for port " + port + ", ssl: " + ssl);
-            sClientConnectionManagers.put(key, mgr);
-        }
-        // Null is a valid return result if we get an exception
-        return mgr;
-    }
-
-    static private synchronized void shutdownConnectionManager() {
-        log("Shutting down ClientConnectionManagers");
-        for (EmailClientConnectionManager mgr: sClientConnectionManagers.values()) {
-            mgr.shutdown();
-        }
-        sClientConnectionManagers.clear();
-    }
-
-    public static void stopAccountSyncs(long acctId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.stopAccountSyncs(acctId, true);
-        }
-    }
-
-    private void stopAccountSyncs(long acctId, boolean includeAccountMailbox) {
-        synchronized (sSyncLock) {
-            List<Long> deletedBoxes = new ArrayList<Long>();
-            for (Long mid : mServiceMap.keySet()) {
-                Mailbox box = Mailbox.restoreMailboxWithId(this, mid);
-                if (box != null) {
-                    if (box.mAccountKey == acctId) {
-                        if (!includeAccountMailbox &&
-                                box.mType == Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-                            AbstractSyncService svc = mServiceMap.get(mid);
-                            if (svc != null) {
-                                svc.stop();
-                            }
-                            continue;
-                        }
-                        AbstractSyncService svc = mServiceMap.get(mid);
-                        if (svc != null) {
-                            svc.stop();
-                            Thread t = svc.mThread;
-                            if (t != null) {
-                                t.interrupt();
-                            }
-                        }
-                        deletedBoxes.add(mid);
-                    }
-                }
-            }
-            for (Long mid : deletedBoxes) {
-                releaseMailbox(mid);
-            }
-        }
-    }
-
-    static private void reloadFolderListFailed(long accountId) {
-        try {
-            callback().syncMailboxListStatus(accountId,
-                    EmailServiceStatus.ACCOUNT_UNINITIALIZED, 0);
-        } catch (RemoteException e1) {
-            // Don't care if this fails
-        }
-    }
-
-    static public void reloadFolderList(Context context, long accountId, boolean force) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,
-                Mailbox.CONTENT_PROJECTION, MailboxColumns.ACCOUNT_KEY + "=? AND " +
-                MailboxColumns.TYPE + "=?",
-                new String[] {Long.toString(accountId),
-                    Long.toString(Mailbox.TYPE_EAS_ACCOUNT_MAILBOX)}, null);
-        try {
-            if (c.moveToFirst()) {
-                synchronized(sSyncLock) {
-                    Mailbox mailbox = new Mailbox();
-                    mailbox.restore(c);
-                    Account acct = Account.restoreAccountWithId(context, accountId);
-                    if (acct == null) {
-                        reloadFolderListFailed(accountId);
-                        return;
-                    }
-                    String syncKey = acct.mSyncKey;
-                    // No need to reload the list if we don't have one
-                    if (!force && (syncKey == null || syncKey.equals("0"))) {
-                        reloadFolderListFailed(accountId);
-                        return;
-                    }
-
-                    // Change all ping/push boxes to push/hold
-                    ContentValues cv = new ContentValues();
-                    cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PUSH_HOLD);
-                    context.getContentResolver().update(Mailbox.CONTENT_URI, cv,
-                            WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX,
-                            new String[] {Long.toString(accountId)});
-                    log("Set push/ping boxes to push/hold");
-
-                    long id = mailbox.mId;
-                    AbstractSyncService svc = exchangeService.mServiceMap.get(id);
-                    // Tell the service we're done
-                    if (svc != null) {
-                        synchronized (svc.getSynchronizer()) {
-                            svc.stop();
-                            // Interrupt the thread so that it can stop
-                            Thread thread = svc.mThread;
-                            if (thread != null) {
-                                thread.setName(thread.getName() + " (Stopped)");
-                                thread.interrupt();
-                            }
-                        }
-                        // Abandon the service
-                        exchangeService.releaseMailbox(id);
-                        // And have it start naturally
-                        kick("reload folder list");
-                    }
-                }
-            }
-        } finally {
-            c.close();
-        }
-    }
-
-    /**
-     * Informs ExchangeService that an account has a new folder list; as a result, any existing
-     * folder might have become invalid.  Therefore, we act as if the account has been deleted, and
-     * then we reinitialize it.
-     *
-     * @param acctId
-     */
-    static public void stopNonAccountMailboxSyncsForAccount(long acctId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.stopAccountSyncs(acctId, false);
-            kick("reload folder list");
-        }
-    }
-
-    private void acquireWakeLock(long id) {
-        synchronized (mWakeLocks) {
-            Boolean lock = mWakeLocks.get(id);
-            if (lock == null) {
-                if (mWakeLock == null) {
-                    PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
-                    mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MAIL_SERVICE");
-                    mWakeLock.acquire();
-                    //log("+WAKE LOCK ACQUIRED");
-                }
-                mWakeLocks.put(id, true);
-             }
-        }
-    }
-
-    private void releaseWakeLock(long id) {
-        synchronized (mWakeLocks) {
-            Boolean lock = mWakeLocks.get(id);
-            if (lock != null) {
-                mWakeLocks.remove(id);
-                if (mWakeLocks.isEmpty()) {
-                    if (mWakeLock != null) {
-                        mWakeLock.release();
-                    }
-                    mWakeLock = null;
-                    //log("+WAKE LOCK RELEASED");
-                } else {
-                }
-            }
-        }
-    }
-
-    static public String alarmOwner(long id) {
-        if (id == EXTRA_MAILBOX_ID) {
-            return "ExchangeService";
-        } else {
-            String name = Long.toString(id);
-            if (Eas.USER_LOG && INSTANCE != null) {
-                Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, id);
-                if (m != null) {
-                    name = m.mDisplayName + '(' + m.mAccountKey + ')';
-                }
-            }
-            return "Mailbox " + name;
-        }
-    }
-
-    private void clearAlarm(long id) {
-        synchronized (mPendingIntents) {
-            PendingIntent pi = mPendingIntents.get(id);
-            if (pi != null) {
-                AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-                alarmManager.cancel(pi);
-                //log("+Alarm cleared for " + alarmOwner(id));
-                mPendingIntents.remove(id);
-            }
-        }
-    }
-
-    private void setAlarm(long id, long millis) {
-        synchronized (mPendingIntents) {
-            PendingIntent pi = mPendingIntents.get(id);
-            if (pi == null) {
-                Intent i = new Intent(this, MailboxAlarmReceiver.class);
-                i.putExtra("mailbox", id);
-                i.setData(Uri.parse("Box" + id));
-                pi = PendingIntent.getBroadcast(this, 0, i, 0);
-                mPendingIntents.put(id, pi);
-
-                AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-                alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + millis, pi);
-                //log("+Alarm set for " + alarmOwner(id) + ", " + millis/1000 + "s");
-            }
-        }
-    }
-
-    private void clearAlarms() {
-        AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-        synchronized (mPendingIntents) {
-            for (PendingIntent pi : mPendingIntents.values()) {
-                alarmManager.cancel(pi);
-            }
-            mPendingIntents.clear();
-        }
-    }
-
-    static public void runAwake(long id) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.acquireWakeLock(id);
-            exchangeService.clearAlarm(id);
-        }
-    }
-
-    static public void runAsleep(long id, long millis) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.setAlarm(id, millis);
-            exchangeService.releaseWakeLock(id);
-        }
-    }
-
-    static public void clearWatchdogAlarm(long id) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.clearAlarm(id);
-        }
-    }
-
-    static public void setWatchdogAlarm(long id, long millis) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.setAlarm(id, millis);
-        }
-    }
-
-    static public void alert(Context context, final long id) {
-        final ExchangeService exchangeService = INSTANCE;
-        checkExchangeServiceServiceRunning();
-        if (id < 0) {
-            log("ExchangeService alert");
-            kick("ping ExchangeService");
-        } else if (exchangeService == null) {
-            context.startService(new Intent(context, ExchangeService.class));
-        } else {
-            final AbstractSyncService service = exchangeService.mServiceMap.get(id);
-            if (service != null) {
-                // Handle alerts in a background thread, as we are typically called from a
-                // broadcast receiver, and are therefore running in the UI thread
-                String threadName = "ExchangeService Alert: ";
-                if (service.mMailbox != null) {
-                    threadName += service.mMailbox.mDisplayName;
-                }
-                new Thread(new Runnable() {
-                   @Override
-                public void run() {
-                       Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, id);
-                       if (m != null) {
-                           // We ignore drafts completely (doesn't sync).  Changes in Outbox are
-                           // handled in the checkMailboxes loop, so we can ignore these pings.
-                           if (Eas.USER_LOG) {
-                               Log.d(TAG, "Alert for mailbox " + id + " (" + m.mDisplayName + ")");
-                           }
-                           if (m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_OUTBOX) {
-                               String[] args = new String[] {Long.toString(m.mId)};
-                               ContentResolver resolver = INSTANCE.mResolver;
-                               resolver.delete(Message.DELETED_CONTENT_URI, WHERE_MAILBOX_KEY,
-                                       args);
-                               resolver.delete(Message.UPDATED_CONTENT_URI, WHERE_MAILBOX_KEY,
-                                       args);
-                               return;
-                           }
-                           service.mAccount = Account.restoreAccountWithId(INSTANCE, m.mAccountKey);
-                           service.mMailbox = m;
-                           // Send the alarm to the sync service
-                           if (!service.alarm()) {
-                               // A false return means that we were forced to interrupt the thread
-                               // In this case, we release the mailbox so that we can start another
-                               // thread to do the work
-                               log("Alarm failed; releasing mailbox");
-                               synchronized(sSyncLock) {
-                                   exchangeService.releaseMailbox(id);
-                               }
-                               // Shutdown the connection manager; this should close all of our
-                               // sockets and generate IOExceptions all around.
-                               ExchangeService.shutdownConnectionManager();
-                           }
-                       }
-                    }}, threadName).start();
-            }
-        }
-    }
-
-    public class ConnectivityReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-                Bundle b = intent.getExtras();
-                if (b != null) {
-                    NetworkInfo a = (NetworkInfo)b.get(ConnectivityManager.EXTRA_NETWORK_INFO);
-                    String info = "Connectivity alert for " + a.getTypeName();
-                    State state = a.getState();
-                    if (state == State.CONNECTED) {
-                        info += " CONNECTED";
-                        log(info);
-                        synchronized (sConnectivityLock) {
-                            sConnectivityLock.notifyAll();
-                        }
-                        kick("connected");
-                    } else if (state == State.DISCONNECTED) {
-                        info += " DISCONNECTED";
-                        log(info);
-                        kick("disconnected");
-                    }
-                }
-            } else if (intent.getAction().equals(
-                    ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED)) {
-                ConnectivityManager cm =
-                        (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
-                mBackgroundData = cm.getBackgroundDataSetting();
-                // If background data is now on, we want to kick ExchangeService
-                if (mBackgroundData) {
-                    kick("background data on");
-                    log("Background data on; restart syncs");
-                // Otherwise, stop all syncs
-                } else {
-                    log("Background data off: stop all syncs");
-                    EmailAsyncTask.runAsyncParallel(new Runnable() {
-                        @Override
-                        public void run() {
-                            synchronized (mAccountList) {
-                                for (Account account : mAccountList)
-                                    ExchangeService.stopAccountSyncs(account.mId);
-                            }
-                        }});
-                }
-            }
-        }
-    }
-
-    /**
-     * Starts a service thread and enters it into the service map
-     * This is the point of instantiation of all sync threads
-     * @param service the service to start
-     * @param m the Mailbox on which the service will operate
-     */
-    private void startServiceThread(AbstractSyncService service) {
-        synchronized (sSyncLock) {
-            Mailbox mailbox = service.mMailbox;
-            String mailboxName = mailbox.mDisplayName;
-            String accountName = service.mAccount.mDisplayName;
-            Thread thread = new Thread(service, mailboxName + "[" + accountName + "]");
-            log("Starting thread for " + mailboxName + " in account " + accountName);
-            thread.start();
-            mServiceMap.put(mailbox.mId, service);
-            runAwake(mailbox.mId);
-            if (mailbox.mServerId != null && mailbox.mType != Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-                stopPing(mailbox.mAccountKey);
-            }
-        }
-    }
-
-    /**
-     * Stop any ping in progress for the given account
-     * @param accountId
-     */
-    private void stopPing(long accountId) {
-        // Go through our active mailboxes looking for the right one
-        synchronized (sSyncLock) {
-            for (long mailboxId: mServiceMap.keySet()) {
-                Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
-                if (m != null) {
-                    String serverId = m.mServerId;
-                    if (m.mAccountKey == accountId && serverId != null &&
-                          m.mType == Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-                        // Here's our account mailbox; reset him (stopping pings)
-                        AbstractSyncService svc = mServiceMap.get(mailboxId);
-                        svc.reset();
-                    }
-                }
-            }
-        }
-    }
-
-    private void requestSync(Mailbox m, int reason, Request req) {
-        int syncStatus = EmailContent.SYNC_STATUS_BACKGROUND;
-        // Don't sync if there's no connectivity
-        if (sConnectivityHold || (m == null) || sStop) {
-            if (reason >= SYNC_CALLBACK_START) {
-                try {
-                    sCallbackProxy.syncMailboxStatus(m.mId, EmailServiceStatus.CONNECTION_ERROR, 0);
-                } catch (RemoteException e) {
-                    // We tried...
-                }
-            }
-            return;
-        }
-        synchronized (sSyncLock) {
-            Account acct = Account.restoreAccountWithId(this, m.mAccountKey);
-            if (acct != null) {
-                // Always make sure there's not a running instance of this service
-                AbstractSyncService service = mServiceMap.get(m.mId);
-                if (service == null) {
-                    service = EasSyncService.getServiceForMailbox(this, m);
-                    if (!((EasSyncService)service).mIsValid) return;
-                    service.mSyncReason = reason;
-                    if (req != null) {
-                        service.addRequest(req);
-                    }
-                    startServiceThread(service);
-                    if (reason >= SYNC_CALLBACK_START) {
-                        syncStatus = EmailContent.SYNC_STATUS_USER;
-                    }
-                    setMailboxSyncStatus(m.mId, syncStatus);
-                }
-            }
-        }
-    }
-
-    private void setMailboxSyncStatus(long id, int status) {
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.UI_SYNC_STATUS, status);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
-    }
-
-    private void setMailboxLastSyncResult(long id, int result) {
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.UI_LAST_SYNC_RESULT, result);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
-    }
-
-    private void stopServiceThreads() {
-        synchronized (sSyncLock) {
-            ArrayList<Long> toStop = new ArrayList<Long>();
-
-            // Keep track of which services to stop
-            for (Long mailboxId : mServiceMap.keySet()) {
-                toStop.add(mailboxId);
-            }
-
-            // Shut down all of those running services
-            for (Long mailboxId : toStop) {
-                AbstractSyncService svc = mServiceMap.get(mailboxId);
-                if (svc != null) {
-                    log("Stopping " + svc.mAccount.mDisplayName + '/' + svc.mMailbox.mDisplayName);
-                    svc.stop();
-                    if (svc.mThread != null) {
-                        svc.mThread.interrupt();
-                    }
-                }
-                releaseWakeLock(mailboxId);
-            }
-        }
-    }
-
-    private void waitForConnectivity() {
-        boolean waiting = false;
-        ConnectivityManager cm =
-            (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
-        while (!sStop) {
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null) {
-                mNetworkInfo = info;
-                // We're done if there's an active network
-                if (waiting) {
-                    // If we've been waiting, release any I/O error holds
-                    releaseSyncHolds(this, AbstractSyncService.EXIT_IO_ERROR, null);
-                    // And log what's still being held
-                    logSyncHolds();
-                }
-                return;
-            } else {
-                // If this is our first time through the loop, shut down running service threads
-                if (!waiting) {
-                    waiting = true;
-                    stopServiceThreads();
-                }
-                // Wait until a network is connected (or 10 mins), but let the device sleep
-                // We'll set an alarm just in case we don't get notified (bugs happen)
-                synchronized (sConnectivityLock) {
-                    runAsleep(EXTRA_MAILBOX_ID, CONNECTIVITY_WAIT_TIME+5*SECONDS);
-                    try {
-                        log("Connectivity lock...");
-                        sConnectivityHold = true;
-                        sConnectivityLock.wait(CONNECTIVITY_WAIT_TIME);
-                        log("Connectivity lock released...");
-                    } catch (InterruptedException e) {
-                        // This is fine; we just go around the loop again
-                    } finally {
-                        sConnectivityHold = false;
-                    }
-                    runAwake(EXTRA_MAILBOX_ID);
-                }
-            }
-        }
-    }
-
-    /**
-     * Note that there are two ways the EAS ExchangeService service can be created:
-     *
-     * 1) as a background service instantiated via startService (which happens on boot, when the
-     * first EAS account is created, etc), in which case the service thread is spun up, mailboxes
-     * sync, etc. and
-     * 2) to execute an RPC call from the UI, in which case the background service will already be
-     * running most of the time (unless we're creating a first EAS account)
-     *
-     * If the running background service detects that there are no EAS accounts (on boot, if none
-     * were created, or afterward if the last remaining EAS account is deleted), it will call
-     * stopSelf() to terminate operation.
-     *
-     * The goal is to ensure that the background service is running at all times when there is at
-     * least one EAS account in existence
-     *
-     * Because there are edge cases in which our process can crash (typically, this has been seen
-     * in UI crashes, ANR's, etc.), it's possible for the UI to start up again without the
-     * background service having been started.  We explicitly try to start the service in Welcome
-     * (to handle the case of the app having been reloaded).  We also start the service on any
-     * startSync call (if it isn't already running)
-     */
-    @Override
-    public void onCreate() {
-        Utility.runAsync(new Runnable() {
-            @Override
-            public void run() {
-                // Quick checks first, before getting the lock
-                if (sStartingUp) return;
-                synchronized (sSyncLock) {
-                    alwaysLog("!!! EAS ExchangeService, onCreate");
-                    // Try to start up properly; we might be coming back from a crash that the Email
-                    // application isn't aware of.
-                    startService(new Intent(EmailServiceProxy.EXCHANGE_INTENT));
-                    if (sStop) {
-                        return;
-                    }
-                }
-            }});
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        alwaysLog("!!! EAS ExchangeService, onStartCommand, startingUp = " + sStartingUp +
-                ", running = " + (INSTANCE != null));
-        if (!sStartingUp && INSTANCE == null) {
-            sStartingUp = true;
-            Utility.runAsync(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        synchronized (sSyncLock) {
-                            // ExchangeService cannot start unless we can connect to AccountService
-                            if (!new AccountServiceProxy(ExchangeService.this).test()) {
-                                alwaysLog("!!! Email application not found; stopping self");
-                                stopSelf();
-                            }
-                            if (sDeviceId == null) {
-                                try {
-                                    String deviceId = getDeviceId(ExchangeService.this);
-                                    if (deviceId != null) {
-                                        sDeviceId = deviceId;
-                                    }
-                                } catch (IOException e) {
-                                }
-                                if (sDeviceId == null) {
-                                    alwaysLog("!!! deviceId unknown; stopping self and retrying");
-                                    stopSelf();
-                                    // Try to restart ourselves in a few seconds
-                                    Utility.runAsync(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            try {
-                                                Thread.sleep(5000);
-                                            } catch (InterruptedException e) {
-                                            }
-                                            startService(new Intent(
-                                                    EmailServiceProxy.EXCHANGE_INTENT));
-                                        }});
-                                    return;
-                                }
-                            }
-                            // Run the reconciler and clean up mismatched accounts - if we weren't
-                            // running when accounts were deleted, it won't have been called.
-                            runAccountReconcilerSync(ExchangeService.this);
-                            // Update other services depending on final account configuration
-                            maybeStartExchangeServiceThread();
-                            if (sServiceThread == null) {
-                                log("!!! EAS ExchangeService, stopping self");
-                                stopSelf();
-                            } else if (sStop) {
-                                // If we were trying to stop, attempt a restart in 5 secs
-                                setAlarm(EXCHANGE_SERVICE_MAILBOX_ID, 5*SECONDS);
-                            }
-                        }
-                    } finally {
-                        sStartingUp = false;
-                    }
-                }});
-        }
-        return Service.START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        log("!!! EAS ExchangeService, onDestroy");
-        // Handle shutting down off the UI thread
-        Utility.runAsync(new Runnable() {
-            @Override
-            public void run() {
-                // Quick checks first, before getting the lock
-                if (INSTANCE == null || sServiceThread == null) return;
-                synchronized(sSyncLock) {
-                    // Stop the sync manager thread and return
-                    if (sServiceThread != null) {
-                        sStop = true;
-                        sServiceThread.interrupt();
-                    }
-                }
-            }});
-    }
-
-    void maybeStartExchangeServiceThread() {
-        // Start our thread...
-        // See if there are any EAS accounts; otherwise, just go away
-        if (sServiceThread == null || !sServiceThread.isAlive()) {
-            if (EmailContent.count(this, HostAuth.CONTENT_URI, WHERE_PROTOCOL_EAS, null) > 0) {
-                log(sServiceThread == null ? "Starting thread..." : "Restarting thread...");
-                sServiceThread = new Thread(this, "ExchangeService");
-                INSTANCE = this;
-                sServiceThread.start();
-            }
-        }
-    }
-
-    /**
-     * Start up the ExchangeService service if it's not already running
-     * This is a stopgap for cases in which ExchangeService died (due to a crash somewhere in
-     * com.android.email) and hasn't been restarted. See the comment for onCreate for details
-     */
-    static void checkExchangeServiceServiceRunning() {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        if (sServiceThread == null) {
-            log("!!! checkExchangeServiceServiceRunning; starting service...");
-            exchangeService.startService(new Intent(exchangeService, ExchangeService.class));
-        }
-    }
-
-    @Override
-    public void run() {
-        sStop = false;
-        alwaysLog("ExchangeService thread running");
-        // If we're really debugging, turn on all logging
-        if (Eas.DEBUG) {
-            Eas.USER_LOG = true;
-            Eas.PARSER_LOG = true;
-            Eas.FILE_LOG = true;
-        }
-
-        TempDirectory.setTempDirectory(this);
-
-        // If we need to wait for the debugger, do so
-        if (Eas.WAIT_DEBUG) {
-            Debug.waitForDebugger();
-        }
-
-        // Synchronize here to prevent a shutdown from happening while we initialize our observers
-        // and receivers
-        synchronized (sSyncLock) {
-            if (INSTANCE != null) {
-                mResolver = getContentResolver();
-
-                // Set up our observers; we need them to know when to start/stop various syncs based
-                // on the insert/delete/update of mailboxes and accounts
-                // We also observe synced messages to trigger upsyncs at the appropriate time
-                mAccountObserver = new AccountObserver(mHandler);
-                mResolver.registerContentObserver(Account.NOTIFIER_URI, true, mAccountObserver);
-                mMailboxObserver = new MailboxObserver(mHandler);
-                mResolver.registerContentObserver(Mailbox.CONTENT_URI, false, mMailboxObserver);
-                mSyncedMessageObserver = new SyncedMessageObserver(mHandler);
-                mResolver.registerContentObserver(Message.SYNCED_CONTENT_URI, true,
-                        mSyncedMessageObserver);
-
-                // Set up receivers for connectivity and background data setting
-                mConnectivityReceiver = new ConnectivityReceiver();
-                registerReceiver(mConnectivityReceiver, new IntentFilter(
-                        ConnectivityManager.CONNECTIVITY_ACTION));
-
-                mBackgroundDataSettingReceiver = new ConnectivityReceiver();
-                registerReceiver(mBackgroundDataSettingReceiver, new IntentFilter(
-                        ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED));
-                // Save away the current background data setting; we'll keep track of it with the
-                // receiver we just registered
-                ConnectivityManager cm = (ConnectivityManager)getSystemService(
-                        Context.CONNECTIVITY_SERVICE);
-                mBackgroundData = cm.getBackgroundDataSetting();
-
-                // Do any required work to clean up our Mailboxes (this serves to upgrade
-                // mailboxes that existed prior to EmailProvider database version 17)
-                MailboxUtilities.fixupUninitializedParentKeys(this, getEasAccountSelector());
-            }
-        }
-
-        try {
-            // Loop indefinitely until we're shut down
-            while (!sStop) {
-                runAwake(EXTRA_MAILBOX_ID);
-                waitForConnectivity();
-                mNextWaitReason = null;
-                long nextWait = checkMailboxes();
-                try {
-                    synchronized (this) {
-                        if (!mKicked) {
-                            if (nextWait < 0) {
-                                log("Negative wait? Setting to 1s");
-                                nextWait = 1*SECONDS;
-                            }
-                            if (nextWait > 10*SECONDS) {
-                                if (mNextWaitReason != null) {
-                                    log("Next awake " + nextWait / 1000 + "s: " + mNextWaitReason);
-                                }
-                                runAsleep(EXTRA_MAILBOX_ID, nextWait + (3*SECONDS));
-                            }
-                            wait(nextWait);
-                        }
-                    }
-                } catch (InterruptedException e) {
-                    // Needs to be caught, but causes no problem
-                    log("ExchangeService interrupted");
-                } finally {
-                    synchronized (this) {
-                        if (mKicked) {
-                            //log("Wait deferred due to kick");
-                            mKicked = false;
-                        }
-                    }
-                }
-            }
-            log("Shutdown requested");
-        } catch (ProviderUnavailableException pue) {
-            // Shutdown cleanly in this case
-            // NOTE: Sync adapters will also crash with this error, but that is already handled
-            // in the adapters themselves, i.e. they return cleanly via done().  When the Email
-            // process starts running again, the Exchange process will be started again in due
-            // course, assuming there is at least one existing EAS account.
-            Log.e(TAG, "EmailProvider unavailable; shutting down");
-            // Ask for our service to be restarted; this should kick-start the Email process as well
-            startService(new Intent(this, ExchangeService.class));
-        } catch (RuntimeException e) {
-            // Crash; this is a completely unexpected runtime error
-            Log.e(TAG, "RuntimeException in ExchangeService", e);
-            throw e;
-        } finally {
-            shutdown();
-        }
-    }
-
-    private void shutdown() {
-        synchronized (sSyncLock) {
-            // If INSTANCE is null, we've already been shut down
-            if (INSTANCE != null) {
-                log("ExchangeService shutting down...");
-
-                // Stop our running syncs
-                stopServiceThreads();
-
-                // Stop receivers
-                if (mConnectivityReceiver != null) {
-                    unregisterReceiver(mConnectivityReceiver);
-                }
-                if (mBackgroundDataSettingReceiver != null) {
-                    unregisterReceiver(mBackgroundDataSettingReceiver);
-                }
-
-                // Unregister observers
-                ContentResolver resolver = getContentResolver();
-                if (mSyncedMessageObserver != null) {
-                    resolver.unregisterContentObserver(mSyncedMessageObserver);
-                    mSyncedMessageObserver = null;
-                }
-                if (mAccountObserver != null) {
-                    resolver.unregisterContentObserver(mAccountObserver);
-                    mAccountObserver = null;
-                }
-                if (mMailboxObserver != null) {
-                    resolver.unregisterContentObserver(mMailboxObserver);
-                    mMailboxObserver = null;
-                }
-                unregisterCalendarObservers();
-
-                // Clear pending alarms and associated Intents
-                clearAlarms();
-
-                // Release our wake lock, if we have one
-                synchronized (mWakeLocks) {
-                    if (mWakeLock != null) {
-                        mWakeLock.release();
-                        mWakeLock = null;
-                    }
-                }
-
-                INSTANCE = null;
-                sServiceThread = null;
-                sStop = false;
-                log("Goodbye");
-            }
-        }
-    }
-
-    /**
-     * Release a mailbox from the service map and release its wake lock.
-     * NOTE: This method MUST be called while holding sSyncLock!
-     *
-     * @param mailboxId the id of the mailbox to be released
-     */
-    private void releaseMailbox(long mailboxId) {
-        mServiceMap.remove(mailboxId);
-        releaseWakeLock(mailboxId);
-    }
-
-    /**
-     * Check whether an Outbox (referenced by a Cursor) has any messages that can be sent
-     * @param c the cursor to an Outbox
-     * @return true if there is mail to be sent
-     */
-    private boolean hasSendableMessages(Cursor outboxCursor) {
-        Cursor c = mResolver.query(Message.CONTENT_URI, Message.ID_COLUMN_PROJECTION,
-                EasOutboxService.MAILBOX_KEY_AND_NOT_SEND_FAILED,
-                new String[] {Long.toString(outboxCursor.getLong(Mailbox.CONTENT_ID_COLUMN))},
-                null);
-        try {
-            while (c.moveToNext()) {
-                if (!Utility.hasUnloadedAttachments(this, c.getLong(Message.CONTENT_ID_COLUMN))) {
-                    return true;
-                }
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Determine whether the account is allowed to sync automatically, as opposed to manually, based
-     * on whether the "require manual sync when roaming" policy is in force and applicable
-     * @param account the account
-     * @return whether or not the account can sync automatically
-     */
-    /*package*/ static boolean canAutoSync(Account account) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) {
-            return false;
-        }
-        NetworkInfo networkInfo = exchangeService.mNetworkInfo;
-
-        // Enforce manual sync only while roaming here
-        long policyKey = account.mPolicyKey;
-        // Quick exit from this check
-        if ((policyKey != 0) && (networkInfo != null) &&
-                (ConnectivityManager.isNetworkTypeMobile(networkInfo.getType()))) {
-            // We'll cache the Policy data here
-            Policy policy = account.mPolicy;
-            if (policy == null) {
-                policy = Policy.restorePolicyWithId(INSTANCE, policyKey);
-                account.mPolicy = policy;
-                if (!PolicyServiceProxy.isActive(exchangeService, policy)) {
-                    PolicyServiceProxy.setAccountHoldFlag(exchangeService, account, true);
-                    log("canAutoSync; policies not active, set hold flag");
-                    return false;
-                }
-            }
-            if (policy != null && policy.mRequireManualSyncWhenRoaming && networkInfo.isRoaming()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Convenience method to determine whether Email sync is enabled for a given account
-     * @param account the Account in question
-     * @return whether Email sync is enabled
-     */
-    private boolean canSyncEmail(android.accounts.Account account) {
-        return ContentResolver.getSyncAutomatically(account, EmailContent.AUTHORITY);
-    }
-
-    /**
-     * Determine whether a mailbox of a given type in a given account can be synced automatically
-     * by ExchangeService.  This is an increasingly complex determination, taking into account
-     * security policies and user settings (both within the Email application and in the Settings
-     * application)
-     *
-     * @param account the Account that the mailbox is in
-     * @param type the type of the Mailbox
-     * @return whether or not to start a sync
-     */
-    private boolean isMailboxSyncable(Account account, int type) {
-        // This 'if' statement performs checks to see whether or not a mailbox is a
-        // candidate for syncing based on policies, user settings, & other restrictions
-        if (type == Mailbox.TYPE_OUTBOX) {
-            // Outbox is always syncable
-            return true;
-        } else if (type == Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-            // Always sync EAS mailbox unless master sync is off
-            return ContentResolver.getMasterSyncAutomatically();
-        } else if (type == Mailbox.TYPE_CONTACTS || type == Mailbox.TYPE_CALENDAR) {
-            // Contacts/Calendar obey this setting from ContentResolver
-            if (!ContentResolver.getMasterSyncAutomatically()) {
-                return false;
-            }
-            // Get the right authority for the mailbox
-            String authority;
-            if (type == Mailbox.TYPE_CONTACTS) {
-                authority = ContactsContract.AUTHORITY;
-            } else {
-                authority = CalendarContract.AUTHORITY;
-                if (!mCalendarObservers.containsKey(account.mId)){
-                    // Make sure we have an observer for this Calendar, as
-                    // we need to be able to detect sync state changes, sigh
-                    registerCalendarObserver(account);
-                }
-            }
-            // See if "sync automatically" is set; if not, punt
-            if (!ContentResolver.getSyncAutomatically(account.mAmAccount, authority)) {
-                return false;
-            // See if the calendar is enabled from the Calendar app UI; if not, punt
-            } else if ((type == Mailbox.TYPE_CALENDAR) && !isCalendarEnabled(account.mId)) {
-                return false;
-            }
-        // Never automatically sync trash
-        } else if (type == Mailbox.TYPE_TRASH) {
-            return false;
-        // For non-outbox, non-account mail, we do three checks:
-        // 1) are we restricted by policy (i.e. manual sync only),
-        // 2) has the user checked the "Sync Email" box in Account Settings, and
-        // 3) does the user have the master "background data" box checked in Settings
-        } else if (!canAutoSync(account) || !canSyncEmail(account.mAmAccount) || !mBackgroundData) {
-            return false;
-        }
-        return true;
-    }
-
-    private long checkMailboxes () {
-        // First, see if any running mailboxes have been deleted
-        ArrayList<Long> deletedMailboxes = new ArrayList<Long>();
-        synchronized (sSyncLock) {
-            for (long mailboxId: mServiceMap.keySet()) {
-                Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
-                if (m == null) {
-                    deletedMailboxes.add(mailboxId);
-                }
-            }
-            // If so, stop them or remove them from the map
-            for (Long mailboxId: deletedMailboxes) {
-                AbstractSyncService svc = mServiceMap.get(mailboxId);
-                if (svc == null || svc.mThread == null) {
-                    releaseMailbox(mailboxId);
-                    continue;
-                } else {
-                    boolean alive = svc.mThread.isAlive();
-                    log("Deleted mailbox: " + svc.mMailboxName);
-                    if (alive) {
-                        stopManualSync(mailboxId);
-                    } else {
-                        log("Removing from serviceMap");
-                        releaseMailbox(mailboxId);
-                    }
-                }
-            }
-        }
-
-        long nextWait = EXCHANGE_SERVICE_HEARTBEAT_TIME;
-        long now = System.currentTimeMillis();
-
-        // Start up threads that need it; use a query which finds eas mailboxes where the
-        // the sync interval is not "never".  This is the set of mailboxes that we control
-        if (mAccountObserver == null) {
-            log("mAccountObserver null; service died??");
-            return nextWait;
-        }
-
-        Cursor c = getContentResolver().query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION,
-                mAccountObserver.getSyncableEasMailboxWhere(), null, null);
-        if (c == null) throw new ProviderUnavailableException();
-        try {
-            while (c.moveToNext()) {
-                final long mailboxId = c.getLong(Mailbox.CONTENT_ID_COLUMN);
-                AbstractSyncService service = null;
-                synchronized (sSyncLock) {
-                    service = mServiceMap.get(mailboxId);
-                }
-                if (service == null) {
-                    // Get the cached account
-                    Account account = getAccountById(c.getInt(Mailbox.CONTENT_ACCOUNT_KEY_COLUMN));
-                    if (account == null) continue;
-
-                    // Check whether we're in a hold (temporary or permanent)
-                    SyncError syncError = mSyncErrorMap.get(mailboxId);
-                    if (syncError != null) {
-                        // Nothing we can do about fatal errors
-                        if (syncError.fatal) continue;
-                        if (now < syncError.holdEndTime) {
-                            // If release time is earlier than next wait time,
-                            // move next wait time up to the release time
-                            if (syncError.holdEndTime < now + nextWait) {
-                                nextWait = syncError.holdEndTime - now;
-                                mNextWaitReason = "Release hold";
-                            }
-                            continue;
-                        } else {
-                            // Keep the error around, but clear the end time
-                            syncError.holdEndTime = 0;
-                        }
-                    }
-
-                    // We handle a few types of mailboxes specially
-                    final int mailboxType = c.getInt(Mailbox.CONTENT_TYPE_COLUMN);
-                    if (!isMailboxSyncable(account, mailboxType)) {
-                        // If there isn't an entry in the sync error map, in case of a security
-                        // hold, add one to allow the next sync to be deferred
-                        if (syncError == null && onSecurityHold(account)) {
-                            mSyncErrorMap.put(mailboxId,
-                                    new SyncError(AbstractSyncService.EXIT_SECURITY_FAILURE, true));
-                        }
-                        continue;
-                    }
-
-                    // Otherwise, we use the sync interval
-                    long syncInterval = c.getInt(Mailbox.CONTENT_SYNC_INTERVAL_COLUMN);
-                    if (syncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
-                        Mailbox m = EmailContent.getContent(c, Mailbox.class);
-                        requestSync(m, SYNC_PUSH, null);
-                    } else if (mailboxType == Mailbox.TYPE_OUTBOX) {
-                        if (hasSendableMessages(c)) {
-                            Mailbox m = EmailContent.getContent(c, Mailbox.class);
-                            startServiceThread(EasSyncService.getServiceForMailbox(this, m));
-                        }
-                    } else if (syncInterval > 0 && syncInterval <= ONE_DAY_MINUTES) {
-                        long lastSync = c.getLong(Mailbox.CONTENT_SYNC_TIME_COLUMN);
-                        long sinceLastSync = now - lastSync;
-                        long toNextSync = syncInterval*MINUTES - sinceLastSync;
-                        String name = c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN);
-                        if (toNextSync <= 0) {
-                            Mailbox m = EmailContent.getContent(c, Mailbox.class);
-                            requestSync(m, SYNC_SCHEDULED, null);
-                        } else if (toNextSync < nextWait) {
-                            nextWait = toNextSync;
-                            if (Eas.USER_LOG) {
-                                log("Next sync for " + name + " in " + nextWait/1000 + "s");
-                            }
-                            mNextWaitReason = "Scheduled sync, " + name;
-                        } else if (Eas.USER_LOG) {
-                            log("Next sync for " + name + " in " + toNextSync/1000 + "s");
-                        }
-                    }
-                } else {
-                    Thread thread = service.mThread;
-                    // Look for threads that have died and remove them from the map
-                    if (thread != null && !thread.isAlive()) {
-                        if (Eas.USER_LOG) {
-                            log("Dead thread, mailbox released: " +
-                                    c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN));
-                        }
-                        releaseMailbox(mailboxId);
-                        // Restart this if necessary
-                        if (nextWait > 3*SECONDS) {
-                            nextWait = 3*SECONDS;
-                            mNextWaitReason = "Clean up dead thread(s)";
-                        }
-                    } else {
-                        long requestTime = service.mRequestTime;
-                        if (requestTime > 0) {
-                            long timeToRequest = requestTime - now;
-                            if (timeToRequest <= 0) {
-                                service.mRequestTime = 0;
-                                service.alarm();
-                            } else if (requestTime > 0 && timeToRequest < nextWait) {
-                                if (timeToRequest < 11*MINUTES) {
-                                    nextWait = timeToRequest < 250 ? 250 : timeToRequest;
-                                    mNextWaitReason = "Sync data change";
-                                } else {
-                                    log("Illegal timeToRequest: " + timeToRequest);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        } finally {
-            c.close();
-        }
-        return nextWait;
-    }
-
-    static public void serviceRequest(long mailboxId, int reason) {
-        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
-     */
-    public static boolean isSyncable(Mailbox m) {
-        return m.loadsFromServer(HostAuth.SCHEME_EAS);
-    }
-
-    static public void serviceRequest(long mailboxId, long ms, int reason) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-        if (m == null || !isSyncable(m)) return;
-        try {
-            AbstractSyncService service = exchangeService.mServiceMap.get(mailboxId);
-            if (service != null) {
-                service.mRequestTime = System.currentTimeMillis() + ms;
-                kick("service request");
-            } else {
-                startManualSync(mailboxId, reason, null);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    static public void serviceRequestImmediate(long mailboxId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        AbstractSyncService service = exchangeService.mServiceMap.get(mailboxId);
-        if (service != null) {
-            service.mRequestTime = System.currentTimeMillis();
-            Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-            if (m != null) {
-                service.mAccount = Account.restoreAccountWithId(exchangeService, m.mAccountKey);
-                service.mMailbox = m;
-                kick("service request immediate");
-            }
-        }
-    }
-
-    static public void sendMessageRequest(Request req) {
-        ExchangeService exchangeService = INSTANCE;
-        Message msg = Message.restoreMessageWithId(exchangeService, req.mMessageId);
-        if (msg == null) return;
-        long mailboxId = msg.mMailboxKey;
-        Mailbox mailbox = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-        if (mailbox == null) return;
-
-        // If we're loading an attachment for Outbox, we want to look at the source message
-        // to find the loading mailbox
-        if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
-            long sourceId = Utility.getFirstRowLong(exchangeService, Body.CONTENT_URI,
-                    new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
-                    BodyColumns.MESSAGE_KEY + "=?",
-                    new String[] {Long.toString(msg.mId)}, null, 0, -1L);
-            if (sourceId != -1L) {
-                EmailContent.Message sourceMsg =
-                        EmailContent.Message.restoreMessageWithId(exchangeService, sourceId);
-                if (sourceMsg != null) {
-                    mailboxId = sourceMsg.mMailboxKey;
-                }
-            }
-        }
-
-        AbstractSyncService service = exchangeService.mServiceMap.get(mailboxId);
-        if (service == null) {
-            startManualSync(mailboxId, SYNC_SERVICE_PART_REQUEST, req);
-            kick("part request");
-        } else {
-            service.addRequest(req);
-        }
-    }
-
-    /**
-     * Determine whether a given Mailbox can be synced, i.e. is not already syncing and is not in
-     * an error state
-     *
-     * @param mailboxId
-     * @return whether or not the Mailbox is available for syncing (i.e. is a valid push target)
-     */
-    static public int pingStatus(long mailboxId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return PING_STATUS_OK;
-        // Already syncing...
-        if (exchangeService.mServiceMap.get(mailboxId) != null) {
-            return PING_STATUS_RUNNING;
-        }
-        // No errors or a transient error, don't ping...
-        SyncError error = exchangeService.mSyncErrorMap.get(mailboxId);
-        if (error != null) {
-            if (error.fatal) {
-                return PING_STATUS_UNABLE;
-            } else if (error.holdEndTime > 0) {
-                return PING_STATUS_WAITING;
-            }
-        }
-        return PING_STATUS_OK;
-    }
-
-    static public void startManualSync(long mailboxId, int reason, Request req) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        synchronized (sSyncLock) {
-            AbstractSyncService svc = exchangeService.mServiceMap.get(mailboxId);
-            if (svc == null) {
-                exchangeService.mSyncErrorMap.remove(mailboxId);
-                Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-                if (m != null) {
-                    log("Starting sync for " + m.mDisplayName);
-                    exchangeService.requestSync(m, reason, req);
-                }
-            } else {
-                // If this is a ui request, set the sync reason for the service
-                if (reason >= SYNC_CALLBACK_START) {
-                    svc.mSyncReason = reason;
-                }
-            }
-        }
-    }
-
-    // DO NOT CALL THIS IN A LOOP ON THE SERVICEMAP
-    static public void stopManualSync(long mailboxId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        synchronized (sSyncLock) {
-            AbstractSyncService svc = exchangeService.mServiceMap.get(mailboxId);
-            if (svc != null) {
-                log("Stopping sync for " + svc.mMailboxName);
-                svc.stop();
-                svc.mThread.interrupt();
-                exchangeService.releaseWakeLock(mailboxId);
-            }
-        }
-    }
-
-    /**
-     * Wake up ExchangeService to check for mailboxes needing service
-     */
-    static public void kick(String reason) {
-       ExchangeService exchangeService = INSTANCE;
-       if (exchangeService != null) {
-            synchronized (exchangeService) {
-                //INSTANCE.log("Kick: " + reason);
-                exchangeService.mKicked = true;
-                exchangeService.notify();
-            }
-        }
-        if (sConnectivityLock != null) {
-            synchronized (sConnectivityLock) {
-                sConnectivityLock.notify();
-            }
-        }
-    }
-
-    static public void accountUpdated(long acctId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        synchronized (sSyncLock) {
-            for (AbstractSyncService svc : exchangeService.mServiceMap.values()) {
-                if (svc.mAccount.mId == acctId) {
-                    svc.mAccount = Account.restoreAccountWithId(exchangeService, acctId);
-                }
-            }
-        }
-    }
-
-    /**
-     * Tell ExchangeService to remove the mailbox from the map of mailboxes with sync errors
-     * @param mailboxId the id of the mailbox
-     */
-    static public void removeFromSyncErrorMap(long mailboxId) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService != null) {
-            exchangeService.mSyncErrorMap.remove(mailboxId);
-        }
-    }
-
-    private boolean isRunningInServiceThread(long mailboxId) {
-        AbstractSyncService syncService = mServiceMap.get(mailboxId);
-        Thread thisThread = Thread.currentThread();
-        return syncService != null && syncService.mThread != null &&
-            thisThread == syncService.mThread;
-    }
-
-    /**
-     * Sent by services indicating that their thread is finished; action depends on the exitStatus
-     * of the service.
-     *
-     * @param svc the service that is finished
-     */
-    static public void done(AbstractSyncService svc) {
-        ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return;
-        synchronized(sSyncLock) {
-            long mailboxId = svc.mMailboxId;
-            // If we're no longer the syncing thread for the mailbox, just return
-            if (!exchangeService.isRunningInServiceThread(mailboxId)) {
-                return;
-            }
-            exchangeService.releaseMailbox(mailboxId);
-            exchangeService.setMailboxSyncStatus(mailboxId, EmailContent.SYNC_STATUS_NONE);
-
-            ConcurrentHashMap<Long, SyncError> errorMap = exchangeService.mSyncErrorMap;
-            SyncError syncError = errorMap.get(mailboxId);
-
-            int exitStatus = svc.mExitStatus;
-            Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
-            if (m == null) return;
-
-            if (exitStatus != AbstractSyncService.EXIT_LOGIN_FAILURE) {
-                long accountId = m.mAccountKey;
-                Account account = Account.restoreAccountWithId(exchangeService, accountId);
-                if (account == null) return;
-                if (exchangeService.releaseSyncHolds(exchangeService,
-                        AbstractSyncService.EXIT_LOGIN_FAILURE, account)) {
-                    new AccountServiceProxy(exchangeService).notifyLoginSucceeded(accountId);
-                }
-            }
-
-            int lastResult = EmailContent.LAST_SYNC_RESULT_SUCCESS;
-            // For error states, whether the error is fatal (won't automatically be retried)
-            boolean errorIsFatal = true;
-            try {
-                switch (exitStatus) {
-                    case AbstractSyncService.EXIT_DONE:
-                        if (svc.hasPendingRequests()) {
-                            // TODO Handle this case
-                        }
-                        errorMap.remove(mailboxId);
-                        // If we've had a successful sync, clear the shutdown count
-                        synchronized (ExchangeService.class) {
-                            sClientConnectionManagerShutdownCount = 0;
-                        }
-                        // Leave now; other statuses are errors
-                        return;
-                    // I/O errors get retried at increasing intervals
-                    case AbstractSyncService.EXIT_IO_ERROR:
-                        if (syncError != null) {
-                            syncError.escalate();
-                            log(m.mDisplayName + " held for " + syncError.holdDelay + "ms");
-                            return;
-                        } else {
-                            log(m.mDisplayName + " added to syncErrorMap, hold for 15s");
-                        }
-                        lastResult = EmailContent.LAST_SYNC_RESULT_CONNECTION_ERROR;
-                        errorIsFatal = false;
-                        break;
-                    // These errors are not retried automatically
-                    case AbstractSyncService.EXIT_LOGIN_FAILURE:
-                        new AccountServiceProxy(exchangeService).notifyLoginFailed(m.mAccountKey);
-                        lastResult = EmailContent.LAST_SYNC_RESULT_AUTH_ERROR;
-                        break;
-                    case AbstractSyncService.EXIT_SECURITY_FAILURE:
-                    case AbstractSyncService.EXIT_ACCESS_DENIED:
-                        lastResult = EmailContent.LAST_SYNC_RESULT_SECURITY_ERROR;
-                        break;
-                    case AbstractSyncService.EXIT_EXCEPTION:
-                        lastResult = EmailContent.LAST_SYNC_RESULT_INTERNAL_ERROR;
-                        break;
-                }
-                // Add this box to the error map
-                errorMap.put(mailboxId, exchangeService.new SyncError(exitStatus, errorIsFatal));
-            } finally {
-                // Always set the last result
-                exchangeService.setMailboxLastSyncResult(mailboxId, lastResult);
-                kick("sync completed");
-            }
-        }
-    }
-
-    /**
-     * Given the status string from a Mailbox, return the type code for the last sync
-     * @param status the syncStatus column of a Mailbox
-     * @return
-     */
-    static public int getStatusType(String status) {
-        if (status == null) {
-            return -1;
-        } else {
-            return status.charAt(STATUS_TYPE_CHAR) - '0';
-        }
-    }
-
-    /**
-     * Given the status string from a Mailbox, return the change count for the last sync
-     * The change count is the number of adds + deletes + changes in the last sync
-     * @param status the syncStatus column of a Mailbox
-     * @return
-     */
-    static public int getStatusChangeCount(String status) {
-        try {
-            String s = status.substring(STATUS_CHANGE_COUNT_OFFSET);
-            return Integer.parseInt(s);
-        } catch (RuntimeException e) {
-            return -1;
-        }
-    }
-
-    static public Context getContext() {
-        return INSTANCE;
-    }
-}

diff --git a/exchange2/src/com/android/exchange/MailboxAlarmReceiver.java b/exchange2/src/com/android/exchange/MailboxAlarmReceiver.java
deleted file mode 100644
index 7958c03..0000000
--- a/exchange2/src/com/android/exchange/MailboxAlarmReceiver.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*
- *  Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * MailboxAlarmReceiver is used to "wake up" the ExchangeService at the appropriate time(s).  It may
- * also be used for individual sync adapters, but this isn't implemented at the present time.
- *
- */
-public class MailboxAlarmReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        long mailboxId = intent.getLongExtra("mailbox", ExchangeService.EXTRA_MAILBOX_ID);
-        // EXCHANGE_SERVICE_MAILBOX_ID tells us that the service is asking to be started
-        if (mailboxId == ExchangeService.EXCHANGE_SERVICE_MAILBOX_ID) {
-            context.startService(new Intent(context, ExchangeService.class));
-        } else {
-            ExchangeService.alert(context, mailboxId);
-        }
-    }
-}
-

diff --git a/exchange2/src/com/android/exchange/PartRequest.java b/exchange2/src/com/android/exchange/PartRequest.java
deleted file mode 100644
index 23b4add..0000000
--- a/exchange2/src/com/android/exchange/PartRequest.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import com.android.emailcommon.provider.EmailContent.Attachment;
-
-/**
- * PartRequest is the EAS wrapper for attachment loading requests.  In addition to information about
- * the attachment to be loaded, it also contains the callback to be used for status/progress
- * updates to the UI.
- */
-public class PartRequest extends Request {
-    public final Attachment mAttachment;
-    public final String mDestination;
-    public final String mContentUriString;
-    public final String mLocation;
-
-    public PartRequest(Attachment _att, String _destination, String _contentUriString) {
-        super(_att.mMessageKey);
-        mAttachment = _att;
-        mLocation = mAttachment.mLocation;
-        mDestination = _destination;
-        mContentUriString = _contentUriString;
-    }
-
-    // PartRequests are unique by their attachment id (i.e. multiple attachments might be queued
-    // for a particular message, but any individual attachment can only be loaded once)
-    public boolean equals(Object o) {
-        if (!(o instanceof PartRequest)) return false;
-        return ((PartRequest)o).mAttachment.mId == mAttachment.mId;
-    }
-
-    public int hashCode() {
-        return (int)mAttachment.mId;
-    }
-}

diff --git a/exchange2/src/com/android/exchange/Request.java b/exchange2/src/com/android/exchange/Request.java
deleted file mode 100644
index 280a084..0000000
--- a/exchange2/src/com/android/exchange/Request.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-/**
- * Requests for mailbox actions are handled by subclasses of this abstract class.
- * Three subclasses are now defined: PartRequest (attachment load), MeetingResponseRequest
- * (respond to a meeting invitation), and MessageMoveRequest (move a message to another folder)
- */
-public abstract class Request {
-    public final long mTimeStamp = System.currentTimeMillis();
-    public final long mMessageId;
-
-    public Request(long messageId) {
-        mMessageId = messageId;
-    }
-
-    // Subclasses of Request may have different semantics regarding equality; therefore,
-    // we force them to implement the equals method
-    public abstract boolean equals(Object o);
-    public abstract int hashCode();
-}

diff --git a/exchange2/src/com/android/exchange/adapter/AttachmentLoader.java b/exchange2/src/com/android/exchange/adapter/AttachmentLoader.java
deleted file mode 100644
index 04cf555..0000000
--- a/exchange2/src/com/android/exchange/adapter/AttachmentLoader.java
+++ /dev/null

@@ -1,248 +0,0 @@
-/* Copyright (C) 2011 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.net.Uri;
-import android.os.RemoteException;
-
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.AttachmentColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.service.EmailServiceStatus;
-import com.android.emailcommon.utility.AttachmentUtilities;
-import com.android.exchange.Eas;
-import com.android.exchange.EasResponse;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.ExchangeService;
-import com.android.exchange.PartRequest;
-import com.android.exchange.utility.UriCodec;
-import com.android.mail.providers.UIProvider;
-import com.google.common.annotations.VisibleForTesting;
-
-import org.apache.http.HttpStatus;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Handle EAS attachment loading, regardless of protocol version
- */
-public class AttachmentLoader {
-    static private final int CHUNK_SIZE = 16*1024;
-
-    private final EasSyncService mService;
-    private final Context mContext;
-    private final ContentResolver mResolver;
-    private final Attachment mAttachment;
-    private final long mAttachmentId;
-    private final int mAttachmentSize;
-    private final long mMessageId;
-    private final Message mMessage;
-    private final long mAccountId;
-    private final Uri mAttachmentUri;
-
-    public AttachmentLoader(EasSyncService service, PartRequest req) {
-        mService = service;
-        mContext = service.mContext;
-        mResolver = service.mContentResolver;
-        mAttachment = req.mAttachment;
-        mAttachmentId = mAttachment.mId;
-        mAttachmentSize = (int)mAttachment.mSize;
-        mAccountId = mAttachment.mAccountKey;
-        mMessageId = mAttachment.mMessageKey;
-        mMessage = Message.restoreMessageWithId(mContext, mMessageId);
-        mAttachmentUri = AttachmentUtilities.getAttachmentUri(mAccountId, mAttachmentId);
-    }
-
-    private void doStatusCallback(int status) {
-        try {
-            ExchangeService.callback().loadAttachmentStatus(mMessageId, mAttachmentId, status, 0);
-        } catch (RemoteException e) {
-            // No danger if the client is no longer around
-        }
-    }
-
-    private void doProgressCallback(int progress) {
-        try {
-            ExchangeService.callback().loadAttachmentStatus(mMessageId, mAttachmentId,
-                    EmailServiceStatus.IN_PROGRESS, progress);
-        } catch (RemoteException e) {
-            // No danger if the client is no longer around
-        }
-    }
-
-    /**
-     * Save away the contentUri for this Attachment and notify listeners
-     */
-    private void finishLoadAttachment() {
-        ContentValues cv = new ContentValues();
-        cv.put(AttachmentColumns.CONTENT_URI, mAttachmentUri.toString());
-        cv.put(AttachmentColumns.UI_STATE, UIProvider.AttachmentState.SAVED);
-        mAttachment.update(mContext, cv);
-        doStatusCallback(EmailServiceStatus.SUCCESS);
-    }
-
-    /**
-     * Read the attachment data in chunks and write the data back out to our attachment file
-     * @param inputStream the InputStream we're reading the attachment from
-     * @param outputStream the OutputStream the attachment will be written to
-     * @param len the number of expected bytes we're going to read
-     * @throws IOException
-     */
-    public void readChunked(InputStream inputStream, OutputStream outputStream, int len)
-            throws IOException {
-        byte[] bytes = new byte[CHUNK_SIZE];
-        int length = len;
-        // Loop terminates 1) when EOF is reached or 2) IOException occurs
-        // One of these is guaranteed to occur
-        int totalRead = 0;
-        int lastCallbackPct = -1;
-        int lastCallbackTotalRead = 0;
-        mService.userLog("Expected attachment length: ", len);
-        while (true) {
-            int read = inputStream.read(bytes, 0, CHUNK_SIZE);
-            if (read < 0) {
-                // -1 means EOF
-                mService.userLog("Attachment load reached EOF, totalRead: ", totalRead);
-                break;
-            }
-
-            // Keep track of how much we've read for progress callback
-            totalRead += read;
-            // Write these bytes out
-            outputStream.write(bytes, 0, read);
-
-            // We can't report percentage if data is chunked; the length of incoming data is unknown
-            if (length > 0) {
-                int pct = (totalRead * 100) / length;
-                // Callback only if we've read at least 1% more and have read more than CHUNK_SIZE
-                // We don't want to spam the Email app
-                if ((pct > lastCallbackPct) && (totalRead > (lastCallbackTotalRead + CHUNK_SIZE))) {
-                    // Report progress back to the UI
-                    doProgressCallback(pct);
-                    lastCallbackTotalRead = totalRead;
-                    lastCallbackPct = pct;
-                }
-            }
-        }
-        if (totalRead > length) {
-            // Apparently, the length, as reported by EAS, isn't always accurate; let's log it
-            mService.userLog("Read more than expected: ", totalRead);
-        }
-    }
-
-    @VisibleForTesting
-    static String encodeForExchange2003(String str) {
-        AttachmentNameEncoder enc = new AttachmentNameEncoder();
-        StringBuilder sb = new StringBuilder(str.length() + 16);
-        enc.appendPartiallyEncoded(sb, str);
-        return sb.toString();
-    }
-
-    /**
-     * Encoder for Exchange 2003 attachment names.  They come from the server partially encoded,
-     * but there are still possible characters that need to be encoded (Why, MSFT, why?)
-     */
-    private static class AttachmentNameEncoder extends UriCodec {
-        @Override protected boolean isRetained(char c) {
-            // These four characters are commonly received in EAS 2.5 attachment names and are
-            // valid (verified by testing); we won't encode them
-            return c == '_' || c == ':' || c == '/' || c == '.';
-        }
-    }
-
-    /**
-     * Loads an attachment, based on the PartRequest passed in the constructor
-     * @throws IOException
-     */
-    public void loadAttachment() throws IOException {
-        if (mMessage == null) {
-            doStatusCallback(EmailServiceStatus.MESSAGE_NOT_FOUND);
-            return;
-        }
-        // Say we've started loading the attachment
-        doProgressCallback(0);
-
-        EasResponse resp;
-        boolean eas14 = mService.mProtocolVersionDouble >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE;
-        // The method of attachment loading is different in EAS 14.0 than in earlier versions
-        if (eas14) {
-            Serializer s = new Serializer();
-            s.start(Tags.ITEMS_ITEMS).start(Tags.ITEMS_FETCH);
-            s.data(Tags.ITEMS_STORE, "Mailbox");
-            s.data(Tags.BASE_FILE_REFERENCE, mAttachment.mLocation);
-            s.end().end().done(); // ITEMS_FETCH, ITEMS_ITEMS
-            resp = mService.sendHttpClientPost("ItemOperations", s.toByteArray());
-        } else {
-            String location = mAttachment.mLocation;
-            // For Exchange 2003 (EAS 2.5), we have to look for illegal characters in the file name
-            // that EAS sent to us!
-            if (mService.mProtocolVersionDouble < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
-                location = encodeForExchange2003(location);
-            }
-            String cmd = "GetAttachment&AttachmentName=" + location;
-            resp = mService.sendHttpClientPost(cmd, null, EasSyncService.COMMAND_TIMEOUT);
-        }
-
-        try {
-            int status = resp.getStatus();
-            if (status == HttpStatus.SC_OK) {
-                if (!resp.isEmpty()) {
-                    InputStream is = resp.getInputStream();
-                    OutputStream os = null;
-                    try {
-                        os = mResolver.openOutputStream(mAttachmentUri);
-                        if (eas14) {
-                            ItemOperationsParser p = new ItemOperationsParser(this, is, os,
-                                    mAttachmentSize);
-                            p.parse();
-                            if (p.getStatusCode() == 1 /* Success */) {
-                                finishLoadAttachment();
-                                return;
-                            }
-                        } else {
-                            int len = resp.getLength();
-                            if (len != 0) {
-                                // len > 0 means that Content-Length was set in the headers
-                                // len < 0 means "chunked" transfer-encoding
-                                readChunked(is, os, (len < 0) ? mAttachmentSize : len);
-                                finishLoadAttachment();
-                                return;
-                            }
-                        }
-                    } catch (FileNotFoundException e) {
-                        mService.errorLog("Can't get attachment; write file not found?");
-                    } finally {
-                        if (os != null) {
-                            os.flush();
-                            os.close();
-                        }
-                    }
-                }
-            }
-        } finally {
-            resp.close();
-        }
-
-        // All errors lead here...
-        doStatusCallback(EmailServiceStatus.ATTACHMENT_NOT_FOUND);
-    }
-}

diff --git a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java b/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
deleted file mode 100644
index 411c0f9..0000000
--- a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
+++ /dev/null

@@ -1,693 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.text.TextUtils;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.service.SyncWindow;
-import com.android.emailcommon.utility.AttachmentUtilities;
-import com.android.emailcommon.utility.Utility;
-import com.android.exchange.CommandStatusException;
-import com.android.exchange.CommandStatusException.CommandStatus;
-import com.android.exchange.Eas;
-import com.android.exchange.ExchangeService;
-import com.android.exchange.provider.MailboxUtilities;
-import com.google.common.annotations.VisibleForTesting;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Parse the result of a FolderSync command
- *
- * Handles the addition, deletion, and changes to folders in the user's Exchange account.
- **/
-
-public class FolderSyncParser extends AbstractSyncParser {
-
-    public static final String TAG = "FolderSyncParser";
-
-    // These are defined by the EAS protocol
-    public static final int USER_GENERIC_TYPE = 1;
-    public static final int INBOX_TYPE = 2;
-    public static final int DRAFTS_TYPE = 3;
-    public static final int DELETED_TYPE = 4;
-    public static final int SENT_TYPE = 5;
-    public static final int OUTBOX_TYPE = 6;
-    public static final int TASKS_TYPE = 7;
-    public static final int CALENDAR_TYPE = 8;
-    public static final int CONTACTS_TYPE = 9;
-    public static final int NOTES_TYPE = 10;
-    public static final int JOURNAL_TYPE = 11;
-    public static final int USER_MAILBOX_TYPE = 12;
-
-    // Chunk size for our mailbox commits
-    public final static int MAILBOX_COMMIT_SIZE = 20;
-
-    // EAS types that we are willing to consider valid folders for EAS sync
-    public static final List<Integer> VALID_EAS_FOLDER_TYPES = Arrays.asList(INBOX_TYPE,
-            DRAFTS_TYPE, DELETED_TYPE, SENT_TYPE, OUTBOX_TYPE, USER_MAILBOX_TYPE, CALENDAR_TYPE,
-            CONTACTS_TYPE, USER_GENERIC_TYPE);
-
-    public static final String ALL_BUT_ACCOUNT_MAILBOX = MailboxColumns.ACCOUNT_KEY + "=? and " +
-        MailboxColumns.TYPE + "!=" + Mailbox.TYPE_EAS_ACCOUNT_MAILBOX;
-
-    private static final String WHERE_SERVER_ID_AND_ACCOUNT = MailboxColumns.SERVER_ID + "=? and " +
-        MailboxColumns.ACCOUNT_KEY + "=?";
-
-    private static final String WHERE_DISPLAY_NAME_AND_ACCOUNT = MailboxColumns.DISPLAY_NAME +
-        "=? and " + MailboxColumns.ACCOUNT_KEY + "=?";
-
-    private static final String WHERE_PARENT_SERVER_ID_AND_ACCOUNT =
-        MailboxColumns.PARENT_SERVER_ID +"=? and " + MailboxColumns.ACCOUNT_KEY + "=?";
-
-    private static final String[] MAILBOX_ID_COLUMNS_PROJECTION =
-        new String[] {MailboxColumns.ID, MailboxColumns.SERVER_ID, MailboxColumns.PARENT_SERVER_ID};
-    private static final int MAILBOX_ID_COLUMNS_ID = 0;
-    private static final int MAILBOX_ID_COLUMNS_SERVER_ID = 1;
-    private static final int MAILBOX_ID_COLUMNS_PARENT_SERVER_ID = 2;
-
-    @VisibleForTesting
-    long mAccountId;
-    @VisibleForTesting
-    String mAccountIdAsString;
-    @VisibleForTesting
-    boolean mInUnitTest = false;
-
-    private String[] mBindArguments = new String[2];
-    private ArrayList<ContentProviderOperation> mOperations =
-        new ArrayList<ContentProviderOperation>();
-    private boolean mInitialSync;
-    private ArrayList<String> mParentFixupsNeeded = new ArrayList<String>();
-    private boolean mFixupUninitializedNeeded = false;
-    // If true, we only care about status (this is true when validating an account) and ignore
-    // other data
-    private final boolean mStatusOnly;
-
-    private static final ContentValues UNINITIALIZED_PARENT_KEY = new ContentValues();
-
-    {
-        UNINITIALIZED_PARENT_KEY.put(MailboxColumns.PARENT_KEY, Mailbox.PARENT_KEY_UNINITIALIZED);
-    }
-
-    public FolderSyncParser(InputStream in, AbstractSyncAdapter adapter) throws IOException {
-        this(in, adapter, false);
-    }
-
-    public FolderSyncParser(InputStream in, AbstractSyncAdapter adapter, boolean statusOnly)
-            throws IOException {
-        super(in, adapter);
-        mAccountId = mAccount.mId;
-        mAccountIdAsString = Long.toString(mAccountId);
-        mStatusOnly = statusOnly;
-    }
-
-    @Override
-    public boolean parse() throws IOException, CommandStatusException {
-        int status;
-        boolean res = false;
-        boolean resetFolders = false;
-        // Since we're now (potentially) committing mailboxes in chunks, ensure that we start with
-        // only the account mailbox
-        String key = mAccount.mSyncKey;
-        mInitialSync = (key == null) || "0".equals(key);
-        if (mInitialSync) {
-            mContentResolver.delete(Mailbox.CONTENT_URI, ALL_BUT_ACCOUNT_MAILBOX,
-                    new String[] {Long.toString(mAccountId)});
-        }
-        if (nextTag(START_DOCUMENT) != Tags.FOLDER_FOLDER_SYNC)
-            throw new EasParserException();
-        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
-            if (tag == Tags.FOLDER_STATUS) {
-                status = getValueInt();
-                if (status != Eas.FOLDER_STATUS_OK) {
-                    mService.errorLog("FolderSync failed: " + CommandStatus.toString(status));
-                    // If the account hasn't been saved, this is a validation attempt, so we don't
-                    // try reloading the folder list...
-                    if (CommandStatus.isDeniedAccess(status) ||
-                            CommandStatus.isNeedsProvisioning(status) ||
-                            (mAccount.mId == Account.NOT_SAVED)) {
-                        throw new CommandStatusException(status);
-                    // Note that we need to catch both old-style (Eas.FOLDER_STATUS_INVALID_KEY)
-                    // and EAS 14 style command status
-                    } else if (status == Eas.FOLDER_STATUS_INVALID_KEY ||
-                            CommandStatus.isBadSyncKey(status)) {
-                        mService.errorLog("Bad sync key; RESET and delete all folders");
-                        // Reset the sync key and save
-                        mAccount.mSyncKey = "0";
-                        ContentValues cv = new ContentValues();
-                        cv.put(AccountColumns.SYNC_KEY, mAccount.mSyncKey);
-                        mContentResolver.update(ContentUris.withAppendedId(Account.CONTENT_URI,
-                                mAccount.mId), cv, null, null);
-                        // Delete PIM data
-                        ExchangeService.deleteAccountPIMData(mAccountId);
-                        // Save away any mailbox sync information that is NOT default
-                        saveMailboxSyncOptions();
-                        // And only then, delete mailboxes
-                        mContentResolver.delete(Mailbox.CONTENT_URI, ALL_BUT_ACCOUNT_MAILBOX,
-                                new String[] {Long.toString(mAccountId)});
-                        // Stop existing syncs and reconstruct _main
-                        ExchangeService.stopNonAccountMailboxSyncsForAccount(mAccountId);
-                        res = true;
-                        resetFolders = true;
-                    } else {
-                        // Other errors are at the server, so let's throw an error that will
-                        // cause this sync to be retried at a later time
-                        mService.errorLog("Throwing IOException; will retry later");
-                        throw new EasParserException("Folder status error");
-                    }
-                }
-            } else if (tag == Tags.FOLDER_SYNC_KEY) {
-                String newKey = getValue();
-                if (!resetFolders) {
-                    mAccount.mSyncKey = newKey;
-                    userLog("New syncKey: ", newKey);
-                } else {
-                    userLog("Ignoring new syncKey: ", newKey);
-                }
-            } else if (tag == Tags.FOLDER_CHANGES) {
-                if (mStatusOnly) return res;
-                changesParser(mOperations, mInitialSync);
-            } else
-                skipTag();
-        }
-        if (mStatusOnly) return res;
-        synchronized (mService.getSynchronizer()) {
-            if (!mService.isStopped() || resetFolders) {
-                commit();
-                userLog("Leaving FolderSyncParser with Account syncKey=", mAccount.mSyncKey);
-            }
-        }
-        return res;
-    }
-
-    private Cursor getServerIdCursor(String serverId) {
-        mBindArguments[0] = serverId;
-        mBindArguments[1] = mAccountIdAsString;
-        return mContentResolver.query(Mailbox.CONTENT_URI, MAILBOX_ID_COLUMNS_PROJECTION,
-                WHERE_SERVER_ID_AND_ACCOUNT, mBindArguments, null);
-    }
-
-    public void deleteParser(ArrayList<ContentProviderOperation> ops) throws IOException {
-        while (nextTag(Tags.FOLDER_DELETE) != END) {
-            switch (tag) {
-                case Tags.FOLDER_SERVER_ID:
-                    String serverId = getValue();
-                    // Find the mailbox in this account with the given serverId
-                    Cursor c = getServerIdCursor(serverId);
-                    try {
-                        if (c.moveToFirst()) {
-                            userLog("Deleting ", serverId);
-                            ops.add(ContentProviderOperation.newDelete(
-                                    ContentUris.withAppendedId(Mailbox.CONTENT_URI,
-                                            c.getLong(MAILBOX_ID_COLUMNS_ID))).build());
-                            AttachmentUtilities.deleteAllMailboxAttachmentFiles(mContext,
-                                    mAccountId, mMailbox.mId);
-                            if (!mInitialSync) {
-                                String parentId = c.getString(MAILBOX_ID_COLUMNS_PARENT_SERVER_ID);
-                                if (!TextUtils.isEmpty(parentId)) {
-                                    mParentFixupsNeeded.add(parentId);
-                                }
-                            }
-                        }
-                    } finally {
-                        c.close();
-                    }
-                    break;
-                default:
-                    skipTag();
-            }
-        }
-    }
-
-    private static class SyncOptions {
-        private final int mInterval;
-        private final int mLookback;
-
-        private SyncOptions(int interval, int lookback) {
-            mInterval = interval;
-            mLookback = lookback;
-        }
-    }
-
-    private static final String MAILBOX_STATE_SELECTION =
-        MailboxColumns.ACCOUNT_KEY + "=? AND (" + MailboxColumns.SYNC_INTERVAL + "!=" +
-            Account.CHECK_INTERVAL_NEVER + " OR " + Mailbox.SYNC_LOOKBACK + "!=" +
-            SyncWindow.SYNC_WINDOW_UNKNOWN + ")";
-
-    private static final String[] MAILBOX_STATE_PROJECTION = new String[] {
-        MailboxColumns.SERVER_ID, MailboxColumns.SYNC_INTERVAL, MailboxColumns.SYNC_LOOKBACK};
-    private static final int MAILBOX_STATE_SERVER_ID = 0;
-    private static final int MAILBOX_STATE_INTERVAL = 1;
-    private static final int MAILBOX_STATE_LOOKBACK = 2;
-    @VisibleForTesting
-    final HashMap<String, SyncOptions> mSyncOptionsMap = new HashMap<String, SyncOptions>();
-
-    /**
-     * For every mailbox in this account that has a non-default interval or lookback, save those
-     * values.
-     */
-    @VisibleForTesting
-    void saveMailboxSyncOptions() {
-        // Shouldn't be necessary, but...
-        mSyncOptionsMap.clear();
-        Cursor c = mContentResolver.query(Mailbox.CONTENT_URI, MAILBOX_STATE_PROJECTION,
-                MAILBOX_STATE_SELECTION, new String[] {mAccountIdAsString}, null);
-        if (c != null) {
-            try {
-                while (c.moveToNext()) {
-                    mSyncOptionsMap.put(c.getString(MAILBOX_STATE_SERVER_ID),
-                            new SyncOptions(c.getInt(MAILBOX_STATE_INTERVAL),
-                                    c.getInt(MAILBOX_STATE_LOOKBACK)));
-                }
-            } finally {
-                c.close();
-            }
-        }
-    }
-
-    /**
-     * For every set of saved mailbox sync options, try to find and restore those values
-     */
-    @VisibleForTesting
-    void restoreMailboxSyncOptions() {
-        try {
-            ContentValues cv = new ContentValues();
-            mBindArguments[1] = mAccountIdAsString;
-            for (String serverId: mSyncOptionsMap.keySet()) {
-                SyncOptions options = mSyncOptionsMap.get(serverId);
-                cv.put(MailboxColumns.SYNC_INTERVAL, options.mInterval);
-                cv.put(MailboxColumns.SYNC_LOOKBACK, options.mLookback);
-                mBindArguments[0] = serverId;
-                // If we match account and server id, set the sync options
-                mContentResolver.update(Mailbox.CONTENT_URI, cv, WHERE_SERVER_ID_AND_ACCOUNT,
-                        mBindArguments);
-            }
-        } finally {
-            mSyncOptionsMap.clear();
-        }
-    }
-
-    public Mailbox addParser() throws IOException {
-        String name = null;
-        String serverId = null;
-        String parentId = null;
-        int type = 0;
-
-        while (nextTag(Tags.FOLDER_ADD) != END) {
-            switch (tag) {
-                case Tags.FOLDER_DISPLAY_NAME: {
-                    name = getValue();
-                    break;
-                }
-                case Tags.FOLDER_TYPE: {
-                    type = getValueInt();
-                    break;
-                }
-                case Tags.FOLDER_PARENT_ID: {
-                    parentId = getValue();
-                    break;
-                }
-                case Tags.FOLDER_SERVER_ID: {
-                    serverId = getValue();
-                    break;
-                }
-                default:
-                    skipTag();
-            }
-        }
-
-        if (VALID_EAS_FOLDER_TYPES.contains(type)) {
-            Mailbox mailbox = new Mailbox();
-            mailbox.mDisplayName = name;
-            mailbox.mServerId = serverId;
-            mailbox.mAccountKey = mAccountId;
-            mailbox.mType = Mailbox.TYPE_MAIL;
-            // Note that all mailboxes default to checking "never" (i.e. manual sync only)
-            // We set specific intervals for inbox, contacts, and (eventually) calendar
-            mailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_NEVER;
-            switch (type) {
-                case INBOX_TYPE:
-                    mailbox.mType = Mailbox.TYPE_INBOX;
-                    mailbox.mSyncInterval = mAccount.mSyncInterval;
-                    break;
-                case CONTACTS_TYPE:
-                    mailbox.mType = Mailbox.TYPE_CONTACTS;
-                    mailbox.mSyncInterval = mAccount.mSyncInterval;
-                    break;
-                case OUTBOX_TYPE:
-                    // TYPE_OUTBOX mailboxes are known by ExchangeService to sync whenever they
-                    // aren't empty.  The value of mSyncFrequency is ignored for this kind of
-                    // mailbox.
-                    mailbox.mType = Mailbox.TYPE_OUTBOX;
-                    break;
-                case SENT_TYPE:
-                    mailbox.mType = Mailbox.TYPE_SENT;
-                    break;
-                case DRAFTS_TYPE:
-                    mailbox.mType = Mailbox.TYPE_DRAFTS;
-                    break;
-                case DELETED_TYPE:
-                    mailbox.mType = Mailbox.TYPE_TRASH;
-                    break;
-                case CALENDAR_TYPE:
-                    mailbox.mType = Mailbox.TYPE_CALENDAR;
-                    mailbox.mSyncInterval = mAccount.mSyncInterval;
-                    break;
-                case USER_GENERIC_TYPE:
-                    mailbox.mType = Mailbox.TYPE_UNKNOWN;
-                    break;
-            }
-
-            // Make boxes like Contacts and Calendar invisible in the folder list
-            mailbox.mFlagVisible = (mailbox.mType < Mailbox.TYPE_NOT_EMAIL);
-
-            if (!parentId.equals("0")) {
-                mailbox.mParentServerId = parentId;
-                if (!mInitialSync) {
-                    mParentFixupsNeeded.add(parentId);
-                }
-            }
-            // At the least, we'll need to set flags
-            mFixupUninitializedNeeded = true;
-
-            return mailbox;
-        }
-        return null;
-    }
-
-    /**
-     * Determine whether a given mailbox holds mail, rather than other data.  We do this by first
-     * checking the type of the mailbox (if it's a known good type, great; if it's a known bad
-     * type, return false).  If it's unknown, we check the parent, first by trying to find it in
-     * the current set of newly synced items, and then by looking it up in EmailProvider.  If
-     * we can find the parent, we use the same rules to determine if it holds mail; if it does,
-     * then its children do as well, so that's a go.
-     *
-     * @param mailbox the mailbox we're checking
-     * @param mailboxMap a HashMap relating server id's of mailboxes in the current sync set to
-     * the corresponding mailbox structures
-     * @return whether or not the mailbox contains email (rather than PIM or unknown data)
-     */
-    /*package*/ boolean isValidMailFolder(Mailbox mailbox, HashMap<String, Mailbox> mailboxMap) {
-        int folderType = mailbox.mType;
-        // Automatically accept our email types
-        if (folderType < Mailbox.TYPE_NOT_EMAIL) return true;
-        // Automatically reject everything else but "unknown"
-        if (folderType != Mailbox.TYPE_UNKNOWN) return false;
-        // If this is TYPE_UNKNOWN, check the parent
-        Mailbox parent = mailboxMap.get(mailbox.mParentServerId);
-        // If the parent is in the map, then check it out; if not, it could be an existing saved
-        // Mailbox, so we'll have to query the database
-        if (parent == null) {
-            mBindArguments[0] = Long.toString(mAccount.mId);
-            long parentId = -1;
-            if (mailbox.mParentServerId != null) {
-                mBindArguments[1] = mailbox.mParentServerId;
-                parentId = Utility.getFirstRowInt(mContext, Mailbox.CONTENT_URI,
-                        EmailContent.ID_PROJECTION,
-                        MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.SERVER_ID + "=?",
-                        mBindArguments, null, EmailContent.ID_PROJECTION_COLUMN, -1);
-            }
-            if (parentId != -1) {
-                // Get the parent from the database
-                parent = Mailbox.restoreMailboxWithId(mContext, parentId);
-                if (parent == null) return false;
-            } else {
-                return false;
-            }
-        }
-        return isValidMailFolder(parent, mailboxMap);
-    }
-
-    public void updateParser(ArrayList<ContentProviderOperation> ops) throws IOException {
-        String serverId = null;
-        String displayName = null;
-        String parentId = null;
-        while (nextTag(Tags.FOLDER_UPDATE) != END) {
-            switch (tag) {
-                case Tags.FOLDER_SERVER_ID:
-                    serverId = getValue();
-                    break;
-                case Tags.FOLDER_DISPLAY_NAME:
-                    displayName = getValue();
-                    break;
-                case Tags.FOLDER_PARENT_ID:
-                    parentId = getValue();
-                    break;
-                default:
-                    skipTag();
-                    break;
-            }
-        }
-        // We'll make a change if one of parentId or displayName are specified
-        // serverId is required, but let's be careful just the same
-        if (serverId != null && (displayName != null || parentId != null)) {
-            Cursor c = getServerIdCursor(serverId);
-            try {
-                // If we find the mailbox (using serverId), make the change
-                if (c.moveToFirst()) {
-                    userLog("Updating ", serverId);
-                    // Fix up old and new parents, as needed
-                    if (!TextUtils.isEmpty(parentId)) {
-                        mParentFixupsNeeded.add(parentId);
-                    }
-                    String oldParentId = c.getString(MAILBOX_ID_COLUMNS_PARENT_SERVER_ID);
-                    if (!TextUtils.isEmpty(oldParentId)) {
-                        mParentFixupsNeeded.add(oldParentId);
-                    }
-                    // Set display name if we've got one
-                    ContentValues cv = new ContentValues();
-                    if (displayName != null) {
-                        cv.put(Mailbox.DISPLAY_NAME, displayName);
-                    }
-                    // Save away the server id and uninitialize the parent key
-                    cv.put(Mailbox.PARENT_SERVER_ID, parentId);
-                    // Clear the parent key; it will be fixed up after the commit
-                    cv.put(Mailbox.PARENT_KEY, Mailbox.PARENT_KEY_UNINITIALIZED);
-                    ops.add(ContentProviderOperation.newUpdate(
-                            ContentUris.withAppendedId(Mailbox.CONTENT_URI,
-                                    c.getLong(MAILBOX_ID_COLUMNS_ID))).withValues(cv).build());
-                    // Say we need to fixup uninitialized mailboxes
-                    mFixupUninitializedNeeded = true;
-                }
-            } finally {
-                c.close();
-            }
-        }
-    }
-
-    private boolean commitMailboxes(ArrayList<Mailbox> validMailboxes,
-            ArrayList<Mailbox> userMailboxes, HashMap<String, Mailbox> mailboxMap,
-            ArrayList<ContentProviderOperation> ops) {
-
-        // Go through the generic user mailboxes; we'll call them valid if any parent is valid
-        for (Mailbox m: userMailboxes) {
-            if (isValidMailFolder(m, mailboxMap)) {
-                m.mType = Mailbox.TYPE_MAIL;
-                validMailboxes.add(m);
-            } else {
-                userLog("Rejecting unknown type mailbox: " + m.mDisplayName);
-            }
-        }
-
-        // Add operations for all valid mailboxes
-        for (Mailbox m: validMailboxes) {
-            userLog("Adding mailbox: ", m.mDisplayName);
-            ops.add(ContentProviderOperation
-                    .newInsert(Mailbox.CONTENT_URI).withValues(m.toContentValues()).build());
-        }
-
-        // Commit the mailboxes
-        userLog("Applying ", mOperations.size(), " mailbox operations.");
-        // Execute the batch; throw IOExceptions if this fails, hoping the issue isn't repeatable
-        // If it IS repeatable, there's no good result, since the folder list will be invalid
-        try {
-            mContentResolver.applyBatch(EmailContent.AUTHORITY, mOperations);
-            return true;
-        } catch (RemoteException e) {
-            userLog("RemoteException in commitMailboxes");
-            return false;
-        } catch (OperationApplicationException e) {
-            userLog("OperationApplicationException in commitMailboxes");
-            return false;
-        }
-    }
-
-    public void changesParser(final ArrayList<ContentProviderOperation> ops,
-            final boolean initialSync) throws IOException {
-
-        // Array of added mailboxes
-        final ArrayList<Mailbox> addMailboxes = new ArrayList<Mailbox>();
-
-        // Indicate start of (potential) mailbox changes
-        MailboxUtilities.startMailboxChanges(mContext, mAccount.mId);
-
-        while (nextTag(Tags.FOLDER_CHANGES) != END) {
-            if (tag == Tags.FOLDER_ADD) {
-                Mailbox mailbox = addParser();
-                if (mailbox != null) {
-                    addMailboxes.add(mailbox);
-                }
-            } else if (tag == Tags.FOLDER_DELETE) {
-                deleteParser(ops);
-            } else if (tag == Tags.FOLDER_UPDATE) {
-                updateParser(ops);
-            } else if (tag == Tags.FOLDER_COUNT) {
-                getValueInt();
-            } else
-                skipTag();
-        }
-
-        // Synchronize on the parser to prevent this being run concurrently
-        // (an extremely unlikely event, but nonetheless possible)
-        synchronized (FolderSyncParser.this) {
-            // Mailboxes that we known contain email
-            ArrayList<Mailbox> validMailboxes = new ArrayList<Mailbox>();
-            // Mailboxes that we're unsure about
-            ArrayList<Mailbox> userMailboxes = new ArrayList<Mailbox>();
-
-            // Maps folder serverId to mailbox (used to validate user mailboxes)
-            HashMap<String, Mailbox> mailboxMap = new HashMap<String, Mailbox>();
-            for (Mailbox mailbox : addMailboxes) {
-                mailboxMap.put(mailbox.mServerId, mailbox);
-            }
-
-            int mailboxCommitCount = 0;
-            for (Mailbox mailbox : addMailboxes) {
-                // And add the mailbox to the proper list
-                if (mailbox.mType == Mailbox.TYPE_UNKNOWN) {
-                    userMailboxes.add(mailbox);
-                } else {
-                    validMailboxes.add(mailbox);
-                }
-                // On initial sync, we commit what we have every 20 mailboxes
-                if (initialSync && (++mailboxCommitCount == MAILBOX_COMMIT_SIZE)) {
-                    if (!commitMailboxes(validMailboxes, userMailboxes, mailboxMap,
-                            ops)) {
-                        mService.stop();
-                        return;
-                    }
-                    // Clear our arrays to prepare for more
-                    userMailboxes.clear();
-                    validMailboxes.clear();
-                    ops.clear();
-                    mailboxCommitCount = 0;
-                }
-            }
-            // Commit the sync key and mailboxes
-            ContentValues cv = new ContentValues();
-            cv.put(AccountColumns.SYNC_KEY, mAccount.mSyncKey);
-            ops.add(ContentProviderOperation
-                    .newUpdate(
-                            ContentUris.withAppendedId(Account.CONTENT_URI,
-                                    mAccount.mId))
-                            .withValues(cv).build());
-            if (!commitMailboxes(validMailboxes, userMailboxes, mailboxMap, ops)) {
-                mService.stop();
-                return;
-            }
-            String accountSelector = Mailbox.ACCOUNT_KEY + "=" + mAccount.mId;
-            // For new boxes, setup the parent key and flags
-            if (mFixupUninitializedNeeded) {
-                MailboxUtilities.fixupUninitializedParentKeys(mContext,
-                        accountSelector);
-            }
-            // For modified parents, reset the flags (and children's parent key)
-            for (String parentServerId: mParentFixupsNeeded) {
-                Cursor c = mContentResolver.query(Mailbox.CONTENT_URI,
-                        Mailbox.CONTENT_PROJECTION, Mailbox.PARENT_SERVER_ID + "=?",
-                        new String[] {parentServerId}, null);
-                try {
-                    if (c.moveToFirst()) {
-                        MailboxUtilities.setFlagsAndChildrensParentKey(mContext, c,
-                                accountSelector);
-                    }
-                } finally {
-                    c.close();
-                }
-            }
-
-            // Signal completion of mailbox changes
-            MailboxUtilities.endMailboxChanges(mContext, mAccount.mId);
-        }
-    }
-
-    /**
-     * Not needed for FolderSync parsing; everything is done within changesParser
-     */
-    @Override
-    public void commandsParser() throws IOException {
-    }
-
-    /**
-     * Clean up after sync
-     */
-    @Override
-    public void commit() throws IOException {
-        // Look for sync issues and its children and delete them
-        // I'm not aware of any other way to deal with this properly
-        mBindArguments[0] = "Sync Issues";
-        mBindArguments[1] = mAccountIdAsString;
-        Cursor c = mContentResolver.query(Mailbox.CONTENT_URI,
-                MAILBOX_ID_COLUMNS_PROJECTION, WHERE_DISPLAY_NAME_AND_ACCOUNT,
-                mBindArguments, null);
-        String parentServerId = null;
-        long id = 0;
-        try {
-            if (c.moveToFirst()) {
-                id = c.getLong(MAILBOX_ID_COLUMNS_ID);
-                parentServerId = c.getString(MAILBOX_ID_COLUMNS_SERVER_ID);
-            }
-        } finally {
-            c.close();
-        }
-        if (parentServerId != null) {
-            mContentResolver.delete(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id),
-                    null, null);
-            mBindArguments[0] = parentServerId;
-            mContentResolver.delete(Mailbox.CONTENT_URI, WHERE_PARENT_SERVER_ID_AND_ACCOUNT,
-                    mBindArguments);
-        }
-
-        // If we have saved options, restore them now
-        if (mInitialSync) {
-            restoreMailboxSyncOptions();
-        }
-    }
-
-    @Override
-    public void responsesParser() throws IOException {
-    }
-
-}

diff --git a/exchange2/src/com/android/exchange/adapter/ItemOperationsParser.java b/exchange2/src/com/android/exchange/adapter/ItemOperationsParser.java
deleted file mode 100644
index 5f412ad..0000000
--- a/exchange2/src/com/android/exchange/adapter/ItemOperationsParser.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/* Copyright (C) 2011 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Parse the result of an ItemOperations command; we use this to load attachments in EAS 14.0
- */
-public class ItemOperationsParser extends Parser {
-    private final AttachmentLoader mAttachmentLoader;
-    private int mStatusCode = 0;
-    private final OutputStream mAttachmentOutputStream;
-    private final int mAttachmentSize;
-
-    public ItemOperationsParser(AttachmentLoader loader, InputStream in, OutputStream out, int size)
-            throws IOException {
-        super(in);
-        mAttachmentLoader = loader;
-        mAttachmentOutputStream = out;
-        mAttachmentSize = size;
-    }
-
-    public int getStatusCode() {
-        return mStatusCode;
-    }
-
-    private void parseProperties() throws IOException {
-        while (nextTag(Tags.ITEMS_PROPERTIES) != END) {
-            if (tag == Tags.ITEMS_DATA) {
-                // Wrap the input stream in our custom base64 input stream
-                Base64InputStream bis = new Base64InputStream(getInput());
-                // Read the attachment
-                mAttachmentLoader.readChunked(bis, mAttachmentOutputStream, mAttachmentSize);
-            } else {
-                skipTag();
-            }
-        }
-    }
-
-    private void parseFetch() throws IOException {
-        while (nextTag(Tags.ITEMS_FETCH) != END) {
-            if (tag == Tags.ITEMS_PROPERTIES) {
-                parseProperties();
-            } else {
-                skipTag();
-            }
-        }
-    }
-
-    private void parseResponse() throws IOException {
-        while (nextTag(Tags.ITEMS_RESPONSE) != END) {
-            if (tag == Tags.ITEMS_FETCH) {
-                parseFetch();
-            } else {
-                skipTag();
-            }
-        }
-    }
-
-    @Override
-    public boolean parse() throws IOException {
-        boolean res = false;
-        if (nextTag(START_DOCUMENT) != Tags.ITEMS_ITEMS) {
-            throw new IOException();
-        }
-        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
-            if (tag == Tags.ITEMS_STATUS) {
-                // Save the status code
-                mStatusCode = getValueInt();
-            } else if (tag == Tags.ITEMS_RESPONSE) {
-                parseResponse();
-            } else {
-                skipTag();
-            }
-        }
-        return res;
-    }
-}

diff --git a/exchange2/src/com/android/exchange/adapter/PingParser.java b/exchange2/src/com/android/exchange/adapter/PingParser.java
deleted file mode 100644
index f061472..0000000
--- a/exchange2/src/com/android/exchange/adapter/PingParser.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/* Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import com.android.exchange.EasSyncService;
-import com.android.exchange.IllegalHeartbeatException;
-import com.android.exchange.StaleFolderListException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-/**
- * Parse the result of a Ping command.
- *
- * If there are folders with changes, add the serverId of those folders to the syncList array.
- * If the folder list needs to be reloaded, throw a StaleFolderListException, which will be caught
- * by the sync server, which will sync the updated folder list.
- */
-public class PingParser extends Parser {
-    private ArrayList<String> syncList = new ArrayList<String>();
-    private EasSyncService mService;
-    private int mSyncStatus = 0;
-
-    public ArrayList<String> getSyncList() {
-        return syncList;
-    }
-
-    public int getSyncStatus() {
-        return mSyncStatus;
-    }
-
-    public PingParser(InputStream in, EasSyncService service) throws IOException {
-        super(in);
-        mService = service;
-    }
-
-    public void parsePingFolders(ArrayList<String> syncList) throws IOException {
-        while (nextTag(Tags.PING_FOLDERS) != END) {
-            if (tag == Tags.PING_FOLDER) {
-                // Here we'll keep track of which mailboxes need syncing
-                String serverId = getValue();
-                syncList.add(serverId);
-                mService.userLog("Changes found in: ", serverId);
-            } else {
-                skipTag();
-            }
-        }
-    }
-
-    @Override
-    public boolean parse() throws IOException, StaleFolderListException, IllegalHeartbeatException {
-        boolean res = false;
-        if (nextTag(START_DOCUMENT) != Tags.PING_PING) {
-            throw new IOException();
-        }
-        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
-            if (tag == Tags.PING_STATUS) {
-                int status = getValueInt();
-                mSyncStatus = status;
-                mService.userLog("Ping completed, status = ", status);
-                if (status == 2) {
-                    res = true;
-                } else if (status == 7 || status == 4) {
-                    // Status of 7 or 4 indicate a stale folder list
-                    throw new StaleFolderListException();
-                } else if (status == 5) {
-                    // Status 5 means our heartbeat is beyond allowable limits
-                    // In this case, there will be a heartbeat interval set
-                }
-            } else if (tag == Tags.PING_FOLDERS) {
-                parsePingFolders(syncList);
-            } else if (tag == Tags.PING_HEARTBEAT_INTERVAL) {
-                // Throw an exception, saving away the legal heartbeat interval specified
-                throw new IllegalHeartbeatException(getValueInt());
-            } else {
-                skipTag();
-            }
-        }
-        return res;
-    }
-}
-

diff --git a/exchange2/src/com/android/exchange/provider/MailboxUtilities.java b/exchange2/src/com/android/exchange/provider/MailboxUtilities.java
deleted file mode 100644
index 093e3b8..0000000
--- a/exchange2/src/com/android/exchange/provider/MailboxUtilities.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-
-public class MailboxUtilities {
-    public static final String WHERE_PARENT_KEY_UNINITIALIZED =
-        "(" + MailboxColumns.PARENT_KEY + " isnull OR " + MailboxColumns.PARENT_KEY + "=" +
-        Mailbox.PARENT_KEY_UNINITIALIZED + ")";
-    // The flag we use in Account to indicate a mailbox change in progress
-    private static final int ACCOUNT_MAILBOX_CHANGE_FLAG = Account.FLAGS_SYNC_ADAPTER;
-
-    /**
-     * Recalculate a mailbox's flags and the parent key of any children
-     * @param context the caller's context
-     * @param parentCursor a cursor to a mailbox that requires fixup
-     */
-    public static void setFlagsAndChildrensParentKey(Context context, Cursor parentCursor,
-            String accountSelector) {
-        ContentResolver resolver = context.getContentResolver();
-        String[] selectionArgs = new String[1];
-        ContentValues parentValues = new ContentValues();
-        // Get the data we need first
-        long parentId = parentCursor.getLong(Mailbox.CONTENT_ID_COLUMN);
-        int parentFlags = 0;
-        int parentType = parentCursor.getInt(Mailbox.CONTENT_TYPE_COLUMN);
-        String parentServerId = parentCursor.getString(Mailbox.CONTENT_SERVER_ID_COLUMN);
-        // All email-type boxes hold mail
-        if (parentType <= Mailbox.TYPE_NOT_EMAIL) {
-            parentFlags |= Mailbox.FLAG_HOLDS_MAIL + Mailbox.FLAG_SUPPORTS_SETTINGS;
-        }
-        // Outbox, Drafts, and Sent don't allow mail to be moved to them
-        if (parentType == Mailbox.TYPE_MAIL || parentType == Mailbox.TYPE_TRASH ||
-                parentType == Mailbox.TYPE_JUNK || parentType == Mailbox.TYPE_INBOX) {
-            parentFlags |= Mailbox.FLAG_ACCEPTS_MOVED_MAIL;
-        }
-        // There's no concept of "append" in EAS so FLAG_ACCEPTS_APPENDED_MAIL is never used
-        // Mark parent mailboxes as parents & add parent key to children
-        // An example of a mailbox with a null serverId would be an Outbox that we create locally
-        // for hotmail accounts (which don't have a server-based Outbox)
-        if (parentServerId != null) {
-            selectionArgs[0] = parentServerId;
-            Cursor childCursor = resolver.query(Mailbox.CONTENT_URI,
-                    Mailbox.ID_PROJECTION, MailboxColumns.PARENT_SERVER_ID + "=? AND " +
-                    accountSelector, selectionArgs, null);
-            if (childCursor == null) return;
-            try {
-                while (childCursor.moveToNext()) {
-                    parentFlags |= Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE;
-                    ContentValues childValues = new ContentValues();
-                    childValues.put(Mailbox.PARENT_KEY, parentId);
-                    long childId = childCursor.getLong(Mailbox.ID_PROJECTION_COLUMN);
-                    resolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, childId),
-                            childValues, null, null);
-                }
-            } finally {
-                childCursor.close();
-            }
-        } else {
-            // Mark this is having no parent, so that we don't examine this mailbox again
-            parentValues.put(Mailbox.PARENT_KEY, Mailbox.NO_MAILBOX);
-            Log.w(Logging.LOG_TAG, "Mailbox with null serverId: " +
-                    parentCursor.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN) + ", type: " +
-                    parentType);
-        }
-        // Save away updated flags and parent key (if any)
-        parentValues.put(Mailbox.FLAGS, parentFlags);
-        resolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, parentId),
-                parentValues, null, null);
-    }
-
-    /**
-     * Recalculate a mailbox's flags and the parent key of any children
-     * @param context the caller's context
-     * @param accountSelector (see description below in fixupUninitializedParentKeys)
-     * @param serverId the server id of an individual mailbox
-     */
-    public static void setFlagsAndChildrensParentKey(Context context, String accountSelector,
-            String serverId) {
-        Cursor cursor = context.getContentResolver().query(Mailbox.CONTENT_URI,
-                Mailbox.CONTENT_PROJECTION, MailboxColumns.SERVER_ID + "=? AND " + accountSelector,
-                new String[] {serverId}, null);
-        if (cursor == null) return;
-        try {
-            if (cursor.moveToFirst()) {
-                setFlagsAndChildrensParentKey(context, cursor, accountSelector);
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    /**
-     * Given an account selector, specifying the account(s) on which to work, create the parentKey
-     * and flags for each mailbox in the account(s) that is uninitialized (parentKey = 0 or null)
-     *
-     * @param accountSelector a sqlite WHERE clause expression to be used in determining the
-     * mailboxes to be acted upon, e.g. accountKey IN (1, 2), accountKey = 12, etc.
-     */
-    public static void fixupUninitializedParentKeys(Context context, String accountSelector) {
-        // Sanity check first on our arguments
-        if (accountSelector == null) throw new IllegalArgumentException();
-        // The selection we'll use to find uninitialized parent key mailboxes
-        String noParentKeySelection = WHERE_PARENT_KEY_UNINITIALIZED + " AND " + accountSelector;
-
-        // We'll loop through mailboxes with an uninitialized parent key
-        ContentResolver resolver = context.getContentResolver();
-        Cursor noParentKeyMailboxCursor =
-                resolver.query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION,
-                        noParentKeySelection, null, null);
-        if (noParentKeyMailboxCursor == null) return;
-        try {
-            while (noParentKeyMailboxCursor.moveToNext()) {
-                setFlagsAndChildrensParentKey(context, noParentKeyMailboxCursor, accountSelector);
-                String parentServerId =
-                        noParentKeyMailboxCursor.getString(Mailbox.CONTENT_PARENT_SERVER_ID_COLUMN);
-                // Fixup the parent so that the children's parentKey is updated
-                if (parentServerId != null) {
-                    setFlagsAndChildrensParentKey(context, accountSelector, parentServerId);
-                }
-            }
-        } finally {
-            noParentKeyMailboxCursor.close();
-        }
-
-        // Any mailboxes without a parent key should have parentKey set to -1 (no parent)
-        ContentValues values = new ContentValues();
-        values.clear();
-        values.put(Mailbox.PARENT_KEY, Mailbox.NO_MAILBOX);
-        resolver.update(Mailbox.CONTENT_URI, values, noParentKeySelection, null);
-     }
-
-    private static void setAccountSyncAdapterFlag(Context context, long accountId, boolean start) {
-        Account account = Account.restoreAccountWithId(context, accountId);
-        if (account == null) return;
-        // Set temporary flag indicating state of update of mailbox list
-        ContentValues cv = new ContentValues();
-        cv.put(Account.FLAGS, start ? (account.mFlags | ACCOUNT_MAILBOX_CHANGE_FLAG) :
-            account.mFlags & ~ACCOUNT_MAILBOX_CHANGE_FLAG);
-        context.getContentResolver().update(
-                ContentUris.withAppendedId(Account.CONTENT_URI, account.mId), cv, null, null);
-    }
-
-    /**
-     * Indicate that the specified account is starting the process of changing its mailbox list
-     * @param context the caller's context
-     * @param accountId the account that is starting to change its mailbox list
-     */
-    public static void startMailboxChanges(Context context, long accountId) {
-        setAccountSyncAdapterFlag(context, accountId, true);
-    }
-
-    /**
-     * Indicate that the specified account is ending the process of changing its mailbox list
-     * @param context the caller's context
-     * @param accountId the account that is finished with changes to its mailbox list
-     */
-    public static void endMailboxChanges(Context context, long accountId) {
-        setAccountSyncAdapterFlag(context, accountId, false);
-    }
-
-    /**
-     * Check that we didn't leave the account's mailboxes in a (possibly) inconsistent state
-     * If we did, make them consistent again
-     * @param context the caller's context
-     * @param accountId the account whose mailboxes are to be checked
-     */
-    public static void checkMailboxConsistency(Context context, long accountId) {
-        // If our temporary flag is set, we were interrupted during an update
-        // First, make sure we're current (really fast w/ caching)
-        Account account = Account.restoreAccountWithId(context, accountId);
-        if (account == null) return;
-        if ((account.mFlags & ACCOUNT_MAILBOX_CHANGE_FLAG) != 0) {
-            Log.w(Logging.LOG_TAG, "Account " + account.mDisplayName +
-                    " has inconsistent mailbox data; fixing up...");
-            // Set all account mailboxes to uninitialized parent key
-            ContentValues values = new ContentValues();
-            values.put(Mailbox.PARENT_KEY, Mailbox.PARENT_KEY_UNINITIALIZED);
-            String accountSelector = Mailbox.ACCOUNT_KEY + "=" + account.mId;
-            ContentResolver resolver = context.getContentResolver();
-            resolver.update(Mailbox.CONTENT_URI, values, accountSelector, null);
-            // Fix up keys and flags
-            MailboxUtilities.fixupUninitializedParentKeys(context, accountSelector);
-            // Clear the temporary flag
-            endMailboxChanges(context, accountId);
-        }
-    }
-}

diff --git a/exchange2/src/com/android/exchange/service/ExchangeBroadcastProcessorService.java b/exchange2/src/com/android/exchange/service/ExchangeBroadcastProcessorService.java
deleted file mode 100644
index 8f88910..0000000
--- a/exchange2/src/com/android/exchange/service/ExchangeBroadcastProcessorService.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.service;
-
-import android.accounts.AccountManager;
-import android.app.IntentService;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.android.emailcommon.Logging;
-import com.android.exchange.Eas;
-import com.android.exchange.ExchangeService;
-
-/**
- * The service that really handles broadcast intents on a worker thread.
- *
- * We make it a service, because:
- * <ul>
- *   <li>So that it's less likely for the process to get killed.
- *   <li>Even if it does, the Intent that have started it will be re-delivered by the system,
- *   and we can start the process again.  (Using {@link #setIntentRedelivery}).
- * </ul>
- */
-public class ExchangeBroadcastProcessorService extends IntentService {
-    // Action used for BroadcastReceiver entry point
-    private static final String ACTION_BROADCAST = "broadcast_receiver";
-
-    public ExchangeBroadcastProcessorService() {
-        // Class name will be the thread name.
-        super(ExchangeBroadcastProcessorService.class.getName());
-        // Intent should be redelivered if the process gets killed before completing the job.
-        setIntentRedelivery(true);
-    }
-
-    /**
-     * Entry point for {@link ExchangeBroadcastReceiver}.
-     */
-    public static void processBroadcastIntent(Context context, Intent broadcastIntent) {
-        Intent i = new Intent(context, ExchangeBroadcastProcessorService.class);
-        i.setAction(ACTION_BROADCAST);
-        i.putExtra(Intent.EXTRA_INTENT, broadcastIntent);
-        context.startService(i);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        // Dispatch from entry point
-        final String action = intent.getAction();
-        if (ACTION_BROADCAST.equals(action)) {
-            final Intent broadcastIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT);
-            final String broadcastAction = broadcastIntent.getAction();
-
-            if (Intent.ACTION_BOOT_COMPLETED.equals(broadcastAction)) {
-                onBootCompleted();
-            } else if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(broadcastAction)) {
-                if (Eas.USER_LOG) {
-                    Log.d(Logging.LOG_TAG, "Login accounts changed; reconciling...");
-                }
-                ExchangeService.runAccountReconcilerSync(this);
-            }
-       }
-    }
-
-    /**
-     * Handles {@link Intent#ACTION_BOOT_COMPLETED}.  Called on a worker thread.
-     */
-    private void onBootCompleted() {
-        startService(new Intent(this, ExchangeService.class));
-    }
-}

diff --git a/exchange2/src/com/android/exchange/service/ExchangeBroadcastReceiver.java b/exchange2/src/com/android/exchange/service/ExchangeBroadcastReceiver.java
deleted file mode 100644
index e79eec0..0000000
--- a/exchange2/src/com/android/exchange/service/ExchangeBroadcastReceiver.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.service;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * The broadcast receiver.  The actual job is done in EmailBroadcastProcessor on a worker thread.
- */
-public class ExchangeBroadcastReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        ExchangeBroadcastProcessorService.processBroadcastIntent(context, intent);
-    }
-}

diff --git a/exchange2/tests/Android.mk b/exchange2/tests/Android.mk
deleted file mode 100644
index 0f36cd2..0000000
--- a/exchange2/tests/Android.mk
+++ /dev/null

@@ -1,34 +0,0 @@
-# Copyright 2008, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Notice that we don't have to include the src files of Exchange because, by
-# running the tests using an instrumentation targeting Exchange, we
-# automatically get all of its classes loaded into our environment.
-
-LOCAL_PACKAGE_NAME := Exchange2Tests
-
-LOCAL_INSTRUMENTATION_FOR := Exchange2
-
-include $(BUILD_PACKAGE)

diff --git a/exchange2/tests/AndroidManifest.xml b/exchange2/tests/AndroidManifest.xml
deleted file mode 100644
index 6511938..0000000
--- a/exchange2/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.exchange.tests"
-    >
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->    
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <!--
-    This declares that this app uses the instrumentation test runner targeting
-    the package of com.android.email.  To run the tests use the command:
-    "adb shell am instrument -w com.android.exchange.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.exchange"
-                     android:label="Tests for Exchange."/>
-
-</manifest>

diff --git a/exchange2/tests/src/com/android/exchange/CalendarSyncEnablerTest.java b/exchange2/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
deleted file mode 100644
index 4198c08..0000000
--- a/exchange2/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.app.NotificationManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.CalendarContract;
-import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.emailcommon.AccountManagerTypes;
-import com.android.emailcommon.Logging;
-import com.android.exchange.utility.ExchangeTestCase;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-@MediumTest
-public class CalendarSyncEnablerTest extends ExchangeTestCase {
-
-    protected static final String TEST_ACCOUNT_PREFIX = "__test";
-    protected static final String TEST_ACCOUNT_SUFFIX = "@android.com";
-
-    private HashMap<Account, Boolean> origCalendarSyncStates = new HashMap<Account, Boolean>();
-
-    // To make the rest of the code shorter thus more readable...
-    private static final String EAT = AccountManagerTypes.TYPE_EXCHANGE;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        // Delete any test accounts we might have created earlier
-        deleteTemporaryAccountManagerAccounts();
-
-        // Save the original calendar sync states.
-        for (Account account : AccountManager.get(getContext()).getAccounts()) {
-            origCalendarSyncStates.put(account,
-                    ContentResolver.getSyncAutomatically(account, CalendarContract.AUTHORITY));
-        }
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        // Delete any test accounts we might have created earlier
-        deleteTemporaryAccountManagerAccounts();
-
-        // Restore the original calendar sync states.
-        // Note we restore only for Exchange accounts.
-        // Other accounts should remain intact throughout the tests.  Plus we don't know if the
-        // Calendar.AUTHORITY is supported by other types of accounts.
-        for (Account account : getExchangeAccounts()) {
-            Boolean state = origCalendarSyncStates.get(account);
-            if (state == null) continue; // Shouldn't happen, but just in case.
-
-            ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, state);
-        }
-    }
-
-    public void testEnableEasCalendarSync() {
-        final Account[] baseAccounts = getExchangeAccounts();
-
-        String a1 = getTestAccountEmailAddress("1");
-        String a2 = getTestAccountEmailAddress("2");
-
-        // 1. Test with 1 account
-
-        CalendarSyncEnabler enabler = new CalendarSyncEnabler(getContext());
-
-        // Add exchange accounts
-        createAccountManagerAccount(a1);
-
-        String emailAddresses = enabler.enableEasCalendarSyncInternalForTest();
-
-        // Verify
-        verifyCalendarSyncState();
-
-        // There seems to be no good way to examine the contents of Notification, so let's verify
-        // we at least (tried to) show the correct email addresses.
-        checkNotificationEmailAddresses(emailAddresses, baseAccounts, a1);
-
-        // Delete added account.
-        deleteTemporaryAccountManagerAccounts();
-
-        // 2. Test with 2 accounts
-        enabler = new CalendarSyncEnabler(getContext());
-
-        // Add exchange accounts
-        createAccountManagerAccount(a1);
-        createAccountManagerAccount(a2);
-
-        emailAddresses = enabler.enableEasCalendarSyncInternalForTest();
-
-        // Verify
-        verifyCalendarSyncState();
-
-        // Check
-        checkNotificationEmailAddresses(emailAddresses, baseAccounts, a1, a2);
-    }
-
-    private static void checkNotificationEmailAddresses(String actual, Account[] baseAccounts,
-            String... addedAddresses) {
-        // Build and sort actual string array.
-        final String[] actualArray = TextUtils.split(actual, " ");
-        Arrays.sort(actualArray);
-
-        // Build and sort expected string array.
-        ArrayList<String> expected = new ArrayList<String>();
-        for (Account account : baseAccounts) {
-            expected.add(account.name);
-        }
-        for (String address : addedAddresses) {
-            expected.add(address);
-        }
-        final String[] expectedArray = new String[expected.size()];
-        expected.toArray(expectedArray);
-        Arrays.sort(expectedArray);
-
-        // Check!
-        MoreAsserts.assertEquals(expectedArray, actualArray);
-    }
-
-    /**
-     * For all {@link Account}, confirm that:
-     * <ol>
-     *   <li>Calendar sync is enabled if it's an Exchange account.<br>
-     *       Unfortunately setSyncAutomatically() doesn't take effect immediately, so we skip this
-     *       check for now.
-             TODO Find a stable way to check this.
-     *   <li>Otherwise, calendar sync state isn't changed.
-     * </ol>
-     */
-    private void verifyCalendarSyncState() {
-        // It's very unfortunate that setSyncAutomatically doesn't take effect immediately.
-        for (Account account : AccountManager.get(getContext()).getAccounts()) {
-            String message = "account=" + account.name + "(" + account.type + ")";
-            boolean enabled = ContentResolver.getSyncAutomatically(account,
-                    CalendarContract.AUTHORITY);
-            int syncable = ContentResolver.getIsSyncable(account, CalendarContract.AUTHORITY);
-
-            if (EAT.equals(account.type)) {
-                // Should be enabled.
-                // assertEquals(message, Boolean.TRUE, (Boolean) enabled);
-                // assertEquals(message, 1, syncable);
-            } else {
-                // Shouldn't change.
-                assertEquals(message, origCalendarSyncStates.get(account), (Boolean) enabled);
-            }
-        }
-    }
-
-    public void testEnableEasCalendarSyncWithNoExchangeAccounts() {
-        // This test can only meaningfully run when there's no exchange accounts
-        // set up on the device.  Otherwise there'll be no difference from
-        // testEnableEasCalendarSync.
-        if (AccountManager.get(getContext()).getAccountsByType(EAT).length > 0) {
-            Log.w(Logging.LOG_TAG, "testEnableEasCalendarSyncWithNoExchangeAccounts skipped:"
-                    + " It only runs when there's no Exchange account on the device.");
-            return;
-        }
-        CalendarSyncEnabler enabler = new CalendarSyncEnabler(getContext());
-        String emailAddresses = enabler.enableEasCalendarSyncInternalForTest();
-
-        // Verify (nothing should change)
-        verifyCalendarSyncState();
-
-        // No exchange accounts found.
-        assertEquals(0, emailAddresses.length());
-    }
-
-    public void testShowNotification() {
-        CalendarSyncEnabler enabler = new CalendarSyncEnabler(getContext());
-
-        // We can't really check the result, but at least we can make sure it won't crash....
-        enabler.showNotificationForTest("a@b.com");
-
-        // Remove the notification.  Comment it out when you want to know how it looks like.
-        // TODO If NotificationController supports this notification, we can just mock it out
-        // and remove this code.
-        ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE))
-                .cancel(CalendarSyncEnabler.NOTIFICATION_ID_EXCHANGE_CALENDAR_ADDED);
-    }
-
-    protected Account[] getExchangeAccounts() {
-        return AccountManager.get(getContext()).getAccountsByType(
-                AccountManagerTypes.TYPE_EXCHANGE);
-    }
-
-    protected Account makeAccountManagerAccount(String username) {
-        return new Account(username, AccountManagerTypes.TYPE_EXCHANGE);
-    }
-
-    protected void createAccountManagerAccount(String username) {
-        final Account account = makeAccountManagerAccount(username);
-        AccountManager.get(getContext()).addAccountExplicitly(account, "password", null);
-    }
-
-    protected com.android.emailcommon.provider.Account
-        setupProviderAndAccountManagerAccount(String username) {
-        // Note that setupAccount creates the email address username@android.com, so that's what
-        // we need to use for the account manager
-        createAccountManagerAccount(username + TEST_ACCOUNT_SUFFIX);
-        return setupTestAccount(username, true);
-    }
-
-    protected ArrayList<com.android.emailcommon.provider.Account> makeExchangeServiceAccountList() {
-        ArrayList<com.android.emailcommon.provider.Account> accountList =
-            new ArrayList<com.android.emailcommon.provider.Account>();
-        Cursor c = mProviderContext.getContentResolver().query(
-                com.android.emailcommon.provider.Account.CONTENT_URI,
-                com.android.emailcommon.provider.Account.CONTENT_PROJECTION, null, null, null);
-        try {
-            while (c.moveToNext()) {
-                com.android.emailcommon.provider.Account account =
-                    new com.android.emailcommon.provider.Account();
-                account.restore(c);
-                accountList.add(account);
-            }
-        } finally {
-            c.close();
-        }
-        return accountList;
-    }
-
-    protected void deleteAccountManagerAccount(Account account) {
-        AccountManagerFuture<Boolean> future =
-            AccountManager.get(getContext()).removeAccount(account, null, null);
-        try {
-            future.getResult();
-        } catch (OperationCanceledException e) {
-        } catch (AuthenticatorException e) {
-        } catch (IOException e) {
-        }
-    }
-
-    protected void deleteTemporaryAccountManagerAccounts() {
-        for (Account accountManagerAccount: getExchangeAccounts()) {
-            if (accountManagerAccount.name.startsWith(TEST_ACCOUNT_PREFIX) &&
-                    accountManagerAccount.name.endsWith(TEST_ACCOUNT_SUFFIX)) {
-                deleteAccountManagerAccount(accountManagerAccount);
-            }
-        }
-    }
-
-    protected String getTestAccountName(String name) {
-        return TEST_ACCOUNT_PREFIX + name;
-    }
-
-    protected String getTestAccountEmailAddress(String name) {
-        return TEST_ACCOUNT_PREFIX + name + TEST_ACCOUNT_SUFFIX;
-    }
-
-
-    /**
-     * Helper to retrieve account manager accounts *and* remove any preexisting accounts
-     * from the list, to "hide" them from the reconciler.
-     */
-    protected Account[] getAccountManagerAccounts(Account[] baseline) {
-        Account[] rawList = getExchangeAccounts();
-        if (baseline.length == 0) {
-            return rawList;
-        }
-        HashSet<Account> set = new HashSet<Account>();
-        for (Account addAccount : rawList) {
-            set.add(addAccount);
-        }
-        for (Account removeAccount : baseline) {
-            set.remove(removeAccount);
-        }
-        return set.toArray(new Account[0]);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/EasOutboxServiceTests.java b/exchange2/tests/src/com/android/exchange/EasOutboxServiceTests.java
deleted file mode 100644
index da995d1..0000000
--- a/exchange2/tests/src/com/android/exchange/EasOutboxServiceTests.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.EasOutboxService.OriginalMessageInfo;
-import com.android.exchange.utility.ExchangeTestCase;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.EasOutboxServiceTests exchange
- */
-@MediumTest
-public class EasOutboxServiceTests extends ExchangeTestCase {
-
-    public void testGenerateSmartSendCmd() {
-        EasOutboxService svc = new EasOutboxService(mProviderContext, new Mailbox());
-        // Test encoding of collection id; colon should be preserved
-        OriginalMessageInfo info = new OriginalMessageInfo("1339085683659694034", "Mail:^f", null);
-        String cmd = svc.generateSmartSendCmd(true, info);
-        assertEquals("SmartReply&ItemId=1339085683659694034&CollectionId=Mail:%5Ef", cmd);
-        // Test encoding of item id
-        info = new OriginalMessageInfo("14:&3", "6", null);
-        cmd = svc.generateSmartSendCmd(false, info);
-        assertEquals("SmartForward&ItemId=14:%263&CollectionId=6", cmd);
-        // Test use of long id
-        info = new OriginalMessageInfo("1339085683659694034", "Mail:^f", "3232323AAA");
-        cmd = svc.generateSmartSendCmd(false, info);
-        assertEquals("SmartForward&LongId=3232323AAA", cmd);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/EasSyncServiceTests.java b/exchange2/tests/src/com/android/exchange/EasSyncServiceTests.java
deleted file mode 100644
index 150b1f1..0000000
--- a/exchange2/tests/src/com/android/exchange/EasSyncServiceTests.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Base64;
-
-import com.android.emailcommon.provider.Account;
-
-import org.apache.http.Header;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-
-import java.io.IOException;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.EasSyncServiceTests exchange
- */
-@SmallTest
-public class EasSyncServiceTests extends AndroidTestCase {
-    static private final String USER = "user";
-    static private final String PASSWORD = "password";
-    static private final String HOST = "xxx.host.zzz";
-    static private final String ID = "id";
-
-    Context mMockContext;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mMockContext = getContext();
-    }
-
-    public void testAddHeaders() {
-        HttpRequestBase method = new HttpPost();
-        EasSyncService svc = new EasSyncService();
-        svc.mAuthString = "auth";
-        svc.mProtocolVersion = "12.1";
-        svc.mAccount = null;
-        // With second argument false, there should be no header
-        svc.setHeaders(method, false);
-        Header[] headers = method.getHeaders("X-MS-PolicyKey");
-        assertEquals(0, headers.length);
-        // With second argument true, there should always be a header
-        // The value will be "0" without an account
-        method.removeHeaders("X-MS-PolicyKey");
-        svc.setHeaders(method, true);
-        headers = method.getHeaders("X-MS-PolicyKey");
-        assertEquals(1, headers.length);
-        assertEquals("0", headers[0].getValue());
-        // With an account, but null security key, the header's value should be "0"
-        Account account = new Account();
-        account.mSecuritySyncKey = null;
-        svc.mAccount = account;
-        method.removeHeaders("X-MS-PolicyKey");
-        svc.setHeaders(method, true);
-        headers = method.getHeaders("X-MS-PolicyKey");
-        assertEquals(1, headers.length);
-        assertEquals("0", headers[0].getValue());
-        // With an account and security key, the header's value should be the security key
-        account.mSecuritySyncKey = "key";
-        svc.mAccount = account;
-        method.removeHeaders("X-MS-PolicyKey");
-        svc.setHeaders(method, true);
-        headers = method.getHeaders("X-MS-PolicyKey");
-        assertEquals(1, headers.length);
-        assertEquals("key", headers[0].getValue());
-    }
-
-    public void testGetProtocolVersionDouble() {
-        assertEquals(Eas.SUPPORTED_PROTOCOL_EX2003_DOUBLE,
-                Eas.getProtocolVersionDouble(Eas.SUPPORTED_PROTOCOL_EX2003));
-        assertEquals(Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE,
-                Eas.getProtocolVersionDouble(Eas.SUPPORTED_PROTOCOL_EX2007));
-        assertEquals(Eas.SUPPORTED_PROTOCOL_EX2007_SP1_DOUBLE,
-                Eas.getProtocolVersionDouble(Eas.SUPPORTED_PROTOCOL_EX2007_SP1));
-    }
-
-    private EasSyncService setupService(String user) {
-        EasSyncService svc = new EasSyncService();
-        svc.mUserName = user;
-        svc.mPassword = PASSWORD;
-        svc.mDeviceId = ID;
-        svc.mHostAddress = HOST;
-        return svc;
-    }
-
-    public void testMakeUriString() throws IOException {
-        // Simple user name and command
-        EasSyncService svc = setupService(USER);
-        String uriString = svc.makeUriString("Sync", null);
-        // These next two should now be cached
-        assertNotNull(svc.mAuthString);
-        assertNotNull(svc.mUserString);
-        assertEquals("Basic " + Base64.encodeToString((USER+":"+PASSWORD).getBytes(),
-                Base64.NO_WRAP), svc.mAuthString);
-        assertEquals("&User=" + USER + "&DeviceId=" + ID + "&DeviceType=" +
-                EasSyncService.DEVICE_TYPE, svc.mUserString);
-        assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=Sync" +
-                svc.mUserString, uriString);
-        // User name that requires encoding
-        String user = "name_with_underscore@foo%bar.com";
-        svc = setupService(user);
-        uriString = svc.makeUriString("Sync", null);
-        assertEquals("Basic " + Base64.encodeToString((user+":"+PASSWORD).getBytes(),
-                Base64.NO_WRAP), svc.mAuthString);
-        String safeUserName = "name_with_underscore%40foo%25bar.com";
-        assertEquals("&User=" + safeUserName + "&DeviceId=" + ID + "&DeviceType=" +
-                EasSyncService.DEVICE_TYPE, svc.mUserString);
-        assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=Sync" +
-                svc.mUserString, uriString);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/ExchangeServiceAccountTests.java b/exchange2/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
deleted file mode 100644
index 6b30b1d..0000000
--- a/exchange2/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.ExchangeService.SyncError;
-import com.android.exchange.provider.EmailContentSetupUtils;
-import com.android.exchange.utility.ExchangeTestCase;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.ExchangeServiceAccountTests exchange
- */
-@MediumTest
-public class ExchangeServiceAccountTests extends ExchangeTestCase {
-
-    public ExchangeServiceAccountTests() {
-        super();
-    }
-
-    public void testReleaseSyncHolds() {
-        ExchangeService exchangeService = new ExchangeService();
-        SyncError securityErrorAccount1 =
-            exchangeService.new SyncError(AbstractSyncService.EXIT_SECURITY_FAILURE, false);
-        SyncError ioError =
-            exchangeService.new SyncError(AbstractSyncService.EXIT_IO_ERROR, false);
-        SyncError securityErrorAccount2 =
-            exchangeService.new SyncError(AbstractSyncService.EXIT_SECURITY_FAILURE, false);
-        // Create account and two mailboxes
-        Account acct1 = setupTestAccount("acct1", true);
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", acct1.mId, true,
-                mProviderContext);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox("box2", acct1.mId, true,
-                mProviderContext);
-        Account acct2 = setupTestAccount("acct2", true);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox("box3", acct2.mId, true,
-                mProviderContext);
-        Mailbox box4 = EmailContentSetupUtils.setupMailbox("box4", acct2.mId, true,
-                mProviderContext);
-
-        ConcurrentHashMap<Long, SyncError> errorMap = exchangeService.mSyncErrorMap;
-        // Add errors into the map
-        errorMap.put(box1.mId, securityErrorAccount1);
-        errorMap.put(box2.mId, ioError);
-        errorMap.put(box3.mId, securityErrorAccount2);
-        errorMap.put(box4.mId, securityErrorAccount2);
-        // We should have 4
-        assertEquals(4, errorMap.keySet().size());
-        // Release the holds on acct2 (there are two of them)
-        assertTrue(exchangeService.releaseSyncHolds(mProviderContext,
-                AbstractSyncService.EXIT_SECURITY_FAILURE, acct2));
-        // There should be two left
-        assertEquals(2, errorMap.keySet().size());
-        // And these are the two...
-        assertNotNull(errorMap.get(box2.mId));
-        assertNotNull(errorMap.get(box1.mId));
-
-        // Put the two back
-        errorMap.put(box3.mId, securityErrorAccount2);
-        errorMap.put(box4.mId, securityErrorAccount2);
-        // We should have 4 again
-        assertEquals(4, errorMap.keySet().size());
-        // Release all of the security holds
-        assertTrue(exchangeService.releaseSyncHolds(mProviderContext,
-                AbstractSyncService.EXIT_SECURITY_FAILURE, null));
-        // There should be one left
-        assertEquals(1, errorMap.keySet().size());
-        // And this is the one
-        assertNotNull(errorMap.get(box2.mId));
-
-        // Release the i/o holds on account 2 (there aren't any)
-        assertFalse(exchangeService.releaseSyncHolds(mProviderContext,
-                AbstractSyncService.EXIT_IO_ERROR, acct2));
-        // There should still be one left
-        assertEquals(1, errorMap.keySet().size());
-
-        // Release the i/o holds on account 1 (there's one)
-        assertTrue(exchangeService.releaseSyncHolds(mProviderContext,
-                AbstractSyncService.EXIT_IO_ERROR, acct1));
-        // There should still be one left
-        assertEquals(0, errorMap.keySet().size());
-    }
-
-    public void testIsSyncable() {
-        Account acct1 = setupTestAccount("acct1", true);
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", acct1.mId, true,
-                mProviderContext, Mailbox.TYPE_DRAFTS);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox("box2", acct1.mId, true,
-                mProviderContext, Mailbox.TYPE_OUTBOX);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox("box2", acct1.mId, true,
-                mProviderContext, Mailbox.TYPE_ATTACHMENT);
-        Mailbox box4 = EmailContentSetupUtils.setupMailbox("box2", acct1.mId, true,
-                mProviderContext, Mailbox.TYPE_NOT_SYNCABLE + 64);
-        Mailbox box5 = EmailContentSetupUtils.setupMailbox("box2", acct1.mId, true,
-                mProviderContext, Mailbox.TYPE_MAIL);
-        assertFalse(ExchangeService.isSyncable(box1));
-        assertFalse(ExchangeService.isSyncable(box2));
-        assertFalse(ExchangeService.isSyncable(box3));
-        assertFalse(ExchangeService.isSyncable(box4));
-        assertTrue(ExchangeService.isSyncable(box5));
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/ExchangeServiceTest.java b/exchange2/tests/src/com/android/exchange/ExchangeServiceTest.java
deleted file mode 100644
index b4be23f..0000000
--- a/exchange2/tests/src/com/android/exchange/ExchangeServiceTest.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.io.File;
-@SmallTest
-public class ExchangeServiceTest extends AndroidTestCase {
-    private static class MyContext extends ContextWrapper {
-        public boolean isGetFileStreamPathCalled;
-
-        public MyContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public File getFileStreamPath(String name) {
-            isGetFileStreamPathCalled = true;
-            return super.getFileStreamPath(name);
-        }
-    }
-
-    public void testGetDeviceId() throws Exception {
-        final MyContext context = new MyContext(getContext());
-
-        final String id = ExchangeService.getDeviceId(context);
-
-        // Consists of alpha-numeric
-        assertTrue(id.matches("^[a-zA-Z0-9]+$"));
-
-        // getDeviceId may have been called in other tests, so we don't check
-        // isGetFileStreamPathCalled here.
-
-        context.isGetFileStreamPathCalled = false;
-        final String cachedId = ExchangeService.getDeviceId(context);
-
-        // Should be the same.
-        assertEquals(id, cachedId);
-        // Should be cached.  (If cached, this method won't be called.)
-        assertFalse(context.isGetFileStreamPathCalled);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/RequestTests.java b/exchange2/tests/src/com/android/exchange/RequestTests.java
deleted file mode 100644
index d736404..0000000
--- a/exchange2/tests/src/com/android/exchange/RequestTests.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import com.android.emailcommon.provider.EmailContent.Attachment;
-
-import android.test.AndroidTestCase;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.RequestTests exchange
- */
-public class RequestTests extends AndroidTestCase {
-
-    public void testPartRequestEquals() {
-        Attachment att1 = new Attachment();
-        att1.mId = 1;
-        Attachment att2 = new Attachment();
-        att2.mId = 2;
-        // For part requests, the attachment id's must be ==
-        PartRequest req1 = new PartRequest(att1, "dest1", "content1");
-        PartRequest req2 = new PartRequest(att2, "dest2", "content2");
-        assertFalse(req1.equals(req2));
-        Attachment att3 = new Attachment();
-        att3.mId = 1;
-        PartRequest req3 = new PartRequest(att3, "dest3", "content3");
-        assertTrue(req1.equals(req3));
-        MessageMoveRequest req4 = new MessageMoveRequest(10L, 12L);
-        assertFalse(req1.equals(req4));
-    }
-
-    public void testRequestEquals() {
-        // Only the messageId needs to be ==
-        MessageMoveRequest req1 = new MessageMoveRequest(1L, 10L);
-        MessageMoveRequest req2 = new MessageMoveRequest(1L, 11L);
-        assertTrue(req1.equals(req2));
-        MessageMoveRequest req3 = new MessageMoveRequest(2L, 11L);
-        assertFalse(req3.equals(req2));
-        MeetingResponseRequest req4 = new MeetingResponseRequest(1L, 3);
-        assertFalse(req4.equals(req1));
-        MeetingResponseRequest req5 = new MeetingResponseRequest(1L, 4);
-        assertTrue(req5.equals(req4));
-    }
-}
\ No newline at end of file

diff --git a/exchange2/tests/src/com/android/exchange/TagsTests.java b/exchange2/tests/src/com/android/exchange/TagsTests.java
deleted file mode 100644
index 55b27c0..0000000
--- a/exchange2/tests/src/com/android/exchange/TagsTests.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange;
-
-import com.android.exchange.adapter.Tags;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.HashMap;
-@SmallTest
-public class TagsTests extends AndroidTestCase {
-
-    // Make sure there are no duplicates in the tags table
-    // This test is no longer required - tags can be duplicated
-    public void disable_testNoDuplicates() {
-        String[][] allTags = Tags.pages;
-        HashMap<String, Boolean> map = new HashMap<String, Boolean>();
-        for (String[] page: allTags) {
-            for (String tag: page) {
-                assertTrue(tag, !map.containsKey(tag));
-                map.put(tag, true);
-            }
-        }
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/AttachmentLoaderTests.java b/exchange2/tests/src/com/android/exchange/adapter/AttachmentLoaderTests.java
deleted file mode 100644
index 2e16ac8..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/AttachmentLoaderTests.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/* Copyright (C) 2011 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.adapter.AttachmentLoaderTests exchange
- */
-package com.android.exchange.adapter;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-@SmallTest
-public class AttachmentLoaderTests extends AndroidTestCase {
-    private static final String TEST_LOCATION =
-        "Inbox/FW:%204G%20Netbook%20|%20Now%20Available%20for%20Order.EML/image012.jpg";
-
-    public void testEncodeForExchange2003() {
-        assertEquals("abc", AttachmentLoader.encodeForExchange2003("abc"));
-        // We don't encode the four characters after abc
-        assertEquals("abc_:/.", AttachmentLoader.encodeForExchange2003("abc_:/."));
-        // We don't re-encode escaped characters
-        assertEquals("%20%33", AttachmentLoader.encodeForExchange2003("%20%33"));
-        // Test with the location that failed in use
-        assertEquals(TEST_LOCATION.replace("|", "%7C"),
-                AttachmentLoader.encodeForExchange2003(TEST_LOCATION));
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java b/exchange2/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java
deleted file mode 100644
index 2e2f553..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java
+++ /dev/null

@@ -1,477 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import com.android.exchange.adapter.AbstractSyncAdapter.Operation;
-import com.android.exchange.adapter.CalendarSyncAdapter.CalendarOperations;
-import com.android.exchange.adapter.CalendarSyncAdapter.EasCalendarSyncParser;
-import com.android.exchange.provider.MockProvider;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.provider.CalendarContract.Attendees;
-import android.provider.CalendarContract.Events;
-import android.test.IsolatedContext;
-import android.test.RenamingDelegatingContext;
-import android.test.mock.MockContentResolver;
-import android.test.mock.MockContext;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.TimeZone;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.adapter.CalendarSyncAdapterTests exchange
- */
-@MediumTest
-public class CalendarSyncAdapterTests extends SyncAdapterTestCase<CalendarSyncAdapter> {
-    private static final String[] ATTENDEE_PROJECTION = new String[] {Attendees.ATTENDEE_EMAIL,
-            Attendees.ATTENDEE_NAME, Attendees.ATTENDEE_STATUS};
-    private static final int ATTENDEE_EMAIL = 0;
-    private static final int ATTENDEE_NAME = 1;
-    private static final int ATTENDEE_STATUS = 2;
-
-    private static final String SINGLE_ATTENDEE_EMAIL = "attendee@host.com";
-    private static final String SINGLE_ATTENDEE_NAME = "Bill Attendee";
-
-    private Context mMockContext;
-    private MockContentResolver mMockResolver;
-
-    // This is the US/Pacific time zone as a base64-encoded TIME_ZONE_INFORMATION structure, as
-    // it would appear coming from an Exchange server
-    private static final String TEST_TIME_ZONE = "4AEAAFAAYQBjAGkAZgBpAGMAIABTAHQAYQBuAGQAYQByA" +
-        "GQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAFAAY" +
-        "QBjAGkAZgBpAGMAIABEAGEAeQBsAGkAZwBoAHQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==";
-
-    private class MockContext2 extends MockContext {
-
-        @Override
-        public Resources getResources() {
-            return getContext().getResources();
-        }
-
-        @Override
-        public File getDir(String name, int mode) {
-            // name the directory so the directory will be separated from
-            // one created through the regular Context
-            return getContext().getDir("mockcontext2_" + name, mode);
-        }
-
-        @Override
-        public Context getApplicationContext() {
-            return this;
-        }
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        mMockResolver = new MockContentResolver();
-        final String filenamePrefix = "test.";
-        RenamingDelegatingContext targetContextWrapper = new
-        RenamingDelegatingContext(
-                new MockContext2(), // The context that most methods are delegated to
-                getContext(), // The context that file methods are delegated to
-                filenamePrefix);
-        mMockContext = new IsolatedContext(mMockResolver, targetContextWrapper);
-        mMockResolver.addProvider(MockProvider.AUTHORITY, new MockProvider(mMockContext));
-    }
-
-    public CalendarSyncAdapterTests() {
-        super();
-    }
-
-    public void testSetTimeRelatedValues_NonRecurring() throws IOException {
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-        EasCalendarSyncParser p = adapter.new EasCalendarSyncParser(getTestInputStream(), adapter);
-        ContentValues cv = new ContentValues();
-        // Basic, one-time meeting lasting an hour
-        GregorianCalendar startCalendar = new GregorianCalendar(2010, 5, 10, 8, 30);
-        Long startTime = startCalendar.getTimeInMillis();
-        GregorianCalendar endCalendar = new GregorianCalendar(2010, 5, 10, 9, 30);
-        Long endTime = endCalendar.getTimeInMillis();
-
-        p.setTimeRelatedValues(cv, startTime, endTime, 0);
-        assertNull(cv.getAsInteger(Events.DURATION));
-        assertEquals(startTime, cv.getAsLong(Events.DTSTART));
-        assertEquals(endTime, cv.getAsLong(Events.DTEND));
-        assertEquals(endTime, cv.getAsLong(Events.LAST_DATE));
-        assertNull(cv.getAsString(Events.EVENT_TIMEZONE));
-    }
-
-    public void testSetTimeRelatedValues_Recurring() throws IOException {
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-        EasCalendarSyncParser p = adapter.new EasCalendarSyncParser(getTestInputStream(), adapter);
-        ContentValues cv = new ContentValues();
-        // Recurring meeting lasting an hour
-        GregorianCalendar startCalendar = new GregorianCalendar(2010, 5, 10, 8, 30);
-        Long startTime = startCalendar.getTimeInMillis();
-        GregorianCalendar endCalendar = new GregorianCalendar(2010, 5, 10, 9, 30);
-        Long endTime = endCalendar.getTimeInMillis();
-        cv.put(Events.RRULE, "FREQ=DAILY");
-        p.setTimeRelatedValues(cv, startTime, endTime, 0);
-        assertEquals("P60M", cv.getAsString(Events.DURATION));
-        assertEquals(startTime, cv.getAsLong(Events.DTSTART));
-        assertNull(cv.getAsLong(Events.DTEND));
-        assertNull(cv.getAsLong(Events.LAST_DATE));
-        assertNull(cv.getAsString(Events.EVENT_TIMEZONE));
-    }
-
-    public void testSetTimeRelatedValues_AllDay() throws IOException {
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-        EasCalendarSyncParser p = adapter.new EasCalendarSyncParser(getTestInputStream(), adapter);
-        ContentValues cv = new ContentValues();
-        GregorianCalendar startCalendar = new GregorianCalendar(2010, 5, 10, 8, 30);
-        Long startTime = startCalendar.getTimeInMillis();
-        GregorianCalendar endCalendar = new GregorianCalendar(2010, 5, 11, 8, 30);
-        Long endTime = endCalendar.getTimeInMillis();
-        cv.put(Events.RRULE, "FREQ=WEEKLY;BYDAY=MO");
-        p.setTimeRelatedValues(cv, startTime, endTime, 1);
-
-        // The start time should have hour/min/sec zero'd out
-        startCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        startCalendar.set(2010, 5, 10, 0, 0, 0);
-        startCalendar.set(GregorianCalendar.MILLISECOND, 0);
-        startTime = startCalendar.getTimeInMillis();
-        assertEquals(startTime, cv.getAsLong(Events.DTSTART));
-
-        // The duration should be in days
-        assertEquals("P1D", cv.getAsString(Events.DURATION));
-        assertNull(cv.getAsLong(Events.DTEND));
-        assertNull(cv.getAsLong(Events.LAST_DATE));
-        // There must be a timezone
-        assertNotNull(cv.getAsString(Events.EVENT_TIMEZONE));
-    }
-
-    public void testSetTimeRelatedValues_Recurring_AllDay_Exception () throws IOException {
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-        EasCalendarSyncParser p = adapter.new EasCalendarSyncParser(getTestInputStream(), adapter);
-        ContentValues cv = new ContentValues();
-
-        // Recurrence exception for all-day event; the exception is NOT all-day
-        GregorianCalendar startCalendar = new GregorianCalendar(2010, 5, 17, 8, 30);
-        Long startTime = startCalendar.getTimeInMillis();
-        GregorianCalendar endCalendar = new GregorianCalendar(2010, 5, 17, 9, 30);
-        Long endTime = endCalendar.getTimeInMillis();
-        cv.put(Events.ORIGINAL_ALL_DAY, 1);
-        GregorianCalendar instanceCalendar = new GregorianCalendar(2010, 5, 17, 8, 30);
-        cv.put(Events.ORIGINAL_INSTANCE_TIME, instanceCalendar.getTimeInMillis());
-        p.setTimeRelatedValues(cv, startTime, endTime, 0);
-
-        // The original instance time should have hour/min/sec zero'd out
-        GregorianCalendar testCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        testCalendar.set(2010, 5, 17, 0, 0, 0);
-        testCalendar.set(GregorianCalendar.MILLISECOND, 0);
-        Long testTime = testCalendar.getTimeInMillis();
-        assertEquals(testTime, cv.getAsLong(Events.ORIGINAL_INSTANCE_TIME));
-
-        // The exception isn't all-day, so we should have DTEND and LAST_DATE and no EVENT_TIMEZONE
-        assertNull(cv.getAsString(Events.DURATION));
-        assertEquals(endTime, cv.getAsLong(Events.DTEND));
-        assertEquals(endTime, cv.getAsLong(Events.LAST_DATE));
-        assertNull(cv.getAsString(Events.EVENT_TIMEZONE));
-    }
-
-    public void testIsValidEventValues() throws IOException {
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-        EasCalendarSyncParser p = adapter.new EasCalendarSyncParser(getTestInputStream(), adapter);
-
-        long validTime = System.currentTimeMillis();
-        String validData = "foo-bar-bletch";
-        String validDuration = "P30M";
-        String validRrule = "FREQ=DAILY";
-
-        ContentValues cv = new ContentValues();
-
-        cv.put(Events.DTSTART, validTime);
-        // Needs _SYNC_DATA and DTEND/DURATION
-        assertFalse(p.isValidEventValues(cv));
-        cv.put(Events.SYNC_DATA2, validData);
-        // Needs DTEND/DURATION since not an exception
-        assertFalse(p.isValidEventValues(cv));
-        cv.put(Events.DURATION, validDuration);
-        // Valid (DTSTART, _SYNC_DATA, DURATION)
-        assertTrue(p.isValidEventValues(cv));
-        cv.remove(Events.DURATION);
-        cv.put(Events.ORIGINAL_INSTANCE_TIME, validTime);
-        // Needs DTEND since it's an exception
-        assertFalse(p.isValidEventValues(cv));
-        cv.put(Events.DTEND, validTime);
-        // Valid (DTSTART, DTEND, ORIGINAL_INSTANCE_TIME)
-        cv.remove(Events.ORIGINAL_INSTANCE_TIME);
-        // Valid (DTSTART, _SYNC_DATA, DTEND)
-        assertTrue(p.isValidEventValues(cv));
-        cv.remove(Events.DTSTART);
-        // Needs DTSTART
-        assertFalse(p.isValidEventValues(cv));
-        cv.put(Events.DTSTART, validTime);
-        cv.put(Events.RRULE, validRrule);
-        // With RRULE, needs DURATION
-        assertFalse(p.isValidEventValues(cv));
-        cv.put(Events.DURATION, "P30M");
-        // Valid (DTSTART, RRULE, DURATION)
-        assertTrue(p.isValidEventValues(cv));
-        cv.put(Events.ALL_DAY, "1");
-        // Needs DURATION in the form P<n>D
-        assertFalse(p.isValidEventValues(cv));
-        // Valid (DTSTART, RRULE, ALL_DAY, DURATION(P<n>D)
-        cv.put(Events.DURATION, "P1D");
-        assertTrue(p.isValidEventValues(cv));
-    }
-
-    private void addAttendeesToSerializer(Serializer s, int num) throws IOException {
-        for (int i = 0; i < num; i++) {
-            s.start(Tags.CALENDAR_ATTENDEE);
-            s.data(Tags.CALENDAR_ATTENDEE_EMAIL, "frederick" + num +
-                    ".flintstone@this.that.verylongservername.com");
-            s.data(Tags.CALENDAR_ATTENDEE_TYPE, "1");
-            s.data(Tags.CALENDAR_ATTENDEE_NAME, "Frederick" + num + " Flintstone, III");
-            s.end();
-        }
-    }
-
-    private void addAttendeeToSerializer(Serializer s, String email, String name)
-            throws IOException {
-        s.start(Tags.CALENDAR_ATTENDEE);
-        s.data(Tags.CALENDAR_ATTENDEE_EMAIL, email);
-        s.data(Tags.CALENDAR_ATTENDEE_TYPE, "1");
-        s.data(Tags.CALENDAR_ATTENDEE_NAME, name);
-        s.end();
-    }
-
-    private int countInsertOperationsForTable(CalendarOperations ops, String tableName) {
-        int cnt = 0;
-        for (Operation op: ops) {
-            ContentProviderOperation cpo =
-                    AbstractSyncAdapter.operationToContentProviderOperation(op, 0);
-            List<String> segments = cpo.getUri().getPathSegments();
-            if (segments.get(0).equalsIgnoreCase(tableName) &&
-                    cpo.getType() == ContentProviderOperation.TYPE_INSERT) {
-                cnt++;
-            }
-        }
-        return cnt;
-    }
-
-    class TestEvent extends Serializer {
-        CalendarSyncAdapter mAdapter;
-        EasCalendarSyncParser mParser;
-        Serializer mSerializer;
-
-        TestEvent() throws IOException {
-            super(false);
-            mAdapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-            mParser = mAdapter.new EasCalendarSyncParser(getTestInputStream(), mAdapter);
-        }
-
-        void setUserEmailAddress(String addr) {
-            mAdapter.mAccount.mEmailAddress = addr;
-            mAdapter.mEmailAddress = addr;
-        }
-
-        EasCalendarSyncParser getParser() throws IOException {
-            // Set up our parser's input and eat the initial tag
-            mParser.resetInput(new ByteArrayInputStream(toByteArray()));
-            mParser.nextTag(0);
-            return mParser;
-        }
-
-        // setupPreAttendees and setupPostAttendees initialize calendar data in the order in which
-        // they would appear in an actual EAS session.  Between these two calls, we initialize
-        // attendee data, which varies between the following tests
-        TestEvent setupPreAttendees() throws IOException {
-            start(Tags.SYNC_APPLICATION_DATA);
-            data(Tags.CALENDAR_TIME_ZONE, TEST_TIME_ZONE);
-            data(Tags.CALENDAR_DTSTAMP, "20100518T213156Z");
-            data(Tags.CALENDAR_START_TIME, "20100518T220000Z");
-            data(Tags.CALENDAR_SUBJECT, "Documentation");
-            data(Tags.CALENDAR_UID, "4417556B-27DE-4ECE-B679-A63EFE1F9E85");
-            data(Tags.CALENDAR_ORGANIZER_NAME, "Fred Squatibuquitas");
-            data(Tags.CALENDAR_ORGANIZER_EMAIL, "fred.squatibuquitas@prettylongdomainname.com");
-            return this;
-        }
-
-        TestEvent setupPostAttendees()throws IOException {
-            data(Tags.CALENDAR_LOCATION, "CR SF 601T2/North Shore Presentation Self Service (16)");
-            data(Tags.CALENDAR_END_TIME, "20100518T223000Z");
-            start(Tags.BASE_BODY);
-            data(Tags.BASE_BODY_PREFERENCE, "1");
-            data(Tags.BASE_ESTIMATED_DATA_SIZE, "69105"); // The number is ignored by the parser
-            data(Tags.BASE_DATA,
-                    "This is the event description; we should probably make it longer");
-            end(); // BASE_BODY
-            start(Tags.CALENDAR_RECURRENCE);
-            data(Tags.CALENDAR_RECURRENCE_TYPE, "1"); // weekly
-            data(Tags.CALENDAR_RECURRENCE_INTERVAL, "1");
-            data(Tags.CALENDAR_RECURRENCE_OCCURRENCES, "10");
-            data(Tags.CALENDAR_RECURRENCE_DAYOFWEEK, "12"); // tue, wed
-            data(Tags.CALENDAR_RECURRENCE_UNTIL, "2005-04-14T00:00:00.000Z");
-            end();  // CALENDAR_RECURRENCE
-            data(Tags.CALENDAR_SENSITIVITY, "0");
-            data(Tags.CALENDAR_BUSY_STATUS, "2");
-            data(Tags.CALENDAR_ALL_DAY_EVENT, "0");
-            data(Tags.CALENDAR_MEETING_STATUS, "3");
-            data(Tags.BASE_NATIVE_BODY_TYPE, "3");
-            end().done(); // SYNC_APPLICATION_DATA
-            return this;
-        }
-    }
-
-    public void testAddEvent() throws IOException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 10);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        // There should be 1 event
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
-        // Two attendees (organizer and 10 attendees)
-        assertEquals(11, countInsertOperationsForTable(p.mOps, "attendees"));
-        // dtstamp, meeting status, attendees, attendees redacted, and upsync prohibited
-        assertEquals(5, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
-
-    public void testAddEventIllegal() throws IOException {
-        // We don't send a start time; the event is illegal and nothing should be added
-        TestEvent event = new TestEvent();
-        event.start(Tags.SYNC_APPLICATION_DATA);
-        event.data(Tags.CALENDAR_TIME_ZONE, TEST_TIME_ZONE);
-        event.data(Tags.CALENDAR_DTSTAMP, "20100518T213156Z");
-        event.data(Tags.CALENDAR_SUBJECT, "Documentation");
-        event.data(Tags.CALENDAR_UID, "4417556B-27DE-4ECE-B679-A63EFE1F9E85");
-        event.data(Tags.CALENDAR_ORGANIZER_NAME, "Fred Squatibuquitas");
-        event.data(Tags.CALENDAR_ORGANIZER_EMAIL, "fred.squatibuquitas@prettylongdomainname.com");
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 10);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "events"));
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "attendees"));
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
-
-    public void testAddEventRedactedAttendees() throws IOException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 100);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        // There should be 1 event
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
-        // One attendees (organizer; all others are redacted)
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "attendees"));
-        // dtstamp, meeting status, and attendees redacted
-        assertEquals(3, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
-
-    /**
-     * Setup for the following three tests, which check attendee status of an added event
-     * @param userEmail the email address of the user
-     * @param update whether or not the event is an update (rather than new)
-     * @return a Cursor to the Attendee records added to our MockProvider
-     * @throws IOException
-     * @throws RemoteException
-     * @throws OperationApplicationException
-     */
-    private Cursor setupAddEventOneAttendee(String userEmail, boolean update)
-            throws IOException, RemoteException, OperationApplicationException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeeToSerializer(event, SINGLE_ATTENDEE_EMAIL, SINGLE_ATTENDEE_NAME);
-        event.setUserEmailAddress(userEmail);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", update);
-        // Send the CPO's to the mock provider
-        ArrayList<ContentProviderOperation> cpos = new ArrayList<ContentProviderOperation>();
-        for (Operation op: p.mOps) {
-            cpos.add(AbstractSyncAdapter.operationToContentProviderOperation(op, 0));
-        }
-        mMockResolver.applyBatch(MockProvider.AUTHORITY, cpos);
-        return mMockResolver.query(MockProvider.uri(Attendees.CONTENT_URI), ATTENDEE_PROJECTION,
-                null, null, null);
-    }
-
-    public void testAddEventOneAttendee() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee("foo@bar.com", false);
-        assertEquals(2, c.getCount());
-        // The organizer should be "accepted", the unknown attendee "none"
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
-
-    public void testAddEventSelfAttendee() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, false);
-        // The organizer should be "accepted", and our user/attendee should be "done" even though
-        // the busy status = 2 (because we can't tell from a status of 2 on new events)
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
-
-    public void testAddEventSelfAttendeeUpdate() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, true);
-        // The organizer should be "accepted", and our user/attendee should be "accepted" (because
-        // busy status = 2 and this is an update
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java b/exchange2/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
deleted file mode 100644
index 1ee64fe..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
+++ /dev/null

@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Body;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.provider.EmailContent.SyncColumns;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
-import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser.ServerChange;
-import com.android.exchange.provider.EmailContentSetupUtils;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-@SmallTest
-public class EmailSyncAdapterTests extends SyncAdapterTestCase<EmailSyncAdapter> {
-
-    private static final String WHERE_ACCOUNT_KEY = Message.ACCOUNT_KEY + "=?";
-    private static final String[] ACCOUNT_ARGUMENT = new String[1];
-
-    // A server id that is guaranteed to be test-related
-    private static final String TEST_SERVER_ID = "__1:22";
-
-    public EmailSyncAdapterTests() {
-        super();
-    }
-
-    /**
-     * Check functionality for getting mime type from a file name (using its extension)
-     * The default for all unknown files is application/octet-stream
-     */
-    public void testGetMimeTypeFromFileName() throws IOException {
-        EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
-        EasEmailSyncParser p = adapter.new EasEmailSyncParser(getTestInputStream(), adapter);
-        // Test a few known types
-        String mimeType = p.getMimeTypeFromFileName("foo.jpg");
-        assertEquals("image/jpeg", mimeType);
-        // Make sure this is case insensitive
-        mimeType = p.getMimeTypeFromFileName("foo.JPG");
-        assertEquals("image/jpeg", mimeType);
-        mimeType = p.getMimeTypeFromFileName("this_is_a_weird_filename.gif");
-        assertEquals("image/gif", mimeType);
-        // Test an illegal file name ending with the extension prefix
-        mimeType = p.getMimeTypeFromFileName("foo.");
-        assertEquals("application/octet-stream", mimeType);
-        // Test a really awful name
-        mimeType = p.getMimeTypeFromFileName(".....");
-        assertEquals("application/octet-stream", mimeType);
-        // Test a bare file name (no extension)
-        mimeType = p.getMimeTypeFromFileName("foo");
-        assertEquals("application/octet-stream", mimeType);
-        // And no name at all (null isn't a valid input)
-        mimeType = p.getMimeTypeFromFileName("");
-        assertEquals("application/octet-stream", mimeType);
-    }
-
-    public void testFormatDateTime() throws IOException {
-        EmailSyncAdapter adapter = getTestSyncAdapter(EmailSyncAdapter.class);
-        GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
-        // Calendar is odd, months are zero based, so the first 11 below is December...
-        calendar.set(2008, 11, 11, 18, 19, 20);
-        String date = adapter.formatDateTime(calendar);
-        assertEquals("2008-12-11T18:19:20.000Z", date);
-        calendar.clear();
-        calendar.set(2012, 0, 2, 23, 0, 1);
-        date = adapter.formatDateTime(calendar);
-        assertEquals("2012-01-02T23:00:01.000Z", date);
-    }
-
-    public void testSendDeletedItems() throws IOException {
-        setupAccountMailboxAndMessages(0);
-        // Setup our adapter and parser
-        setupSyncParserAndAdapter(mAccount, mMailbox);
-
-        Serializer s = new Serializer();
-        ArrayList<Long> ids = new ArrayList<Long>();
-        ArrayList<Long> deletedIds = new ArrayList<Long>();
-
-        // Create account and two mailboxes
-        mSyncAdapter.mAccount = mAccount;
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, true,
-                mProviderContext);
-        mSyncAdapter.mMailbox = box1;
-
-        // Create 3 messages
-        Message msg1 = EmailContentSetupUtils.setupMessage("message1", mAccount.mId, box1.mId,
-                true, true, mProviderContext);
-        ids.add(msg1.mId);
-        Message msg2 = EmailContentSetupUtils.setupMessage("message2", mAccount.mId, box1.mId,
-                true, true, mProviderContext);
-        ids.add(msg2.mId);
-        Message msg3 = EmailContentSetupUtils.setupMessage("message3", mAccount.mId, box1.mId,
-                true, true, mProviderContext);
-        ids.add(msg3.mId);
-        assertEquals(3, EmailContent.count(mProviderContext, Message.CONTENT_URI, WHERE_ACCOUNT_KEY,
-                getAccountArgument(mAccount.mId)));
-
-        // Delete them
-        for (long id: ids) {
-            mResolver.delete(ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI, id),
-                    null, null);
-        }
-
-        // Confirm that the messages are in the proper table
-        assertEquals(0, EmailContent.count(mProviderContext, Message.CONTENT_URI, WHERE_ACCOUNT_KEY,
-                getAccountArgument(mAccount.mId)));
-        assertEquals(3, EmailContent.count(mProviderContext, Message.DELETED_CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-
-        // Call code to send deletions; the id's of the ones actually deleted will be in the
-        // deletedIds list
-        mSyncAdapter.sendDeletedItems(s, deletedIds, true);
-        assertEquals(3, deletedIds.size());
-
-        // Clear this out for the next test
-        deletedIds.clear();
-
-        // Create a new message
-        Message msg4 = EmailContentSetupUtils.setupMessage("message4", mAccount.mId, box1.mId,
-                true, true, mProviderContext);
-        assertEquals(1, EmailContent.count(mProviderContext, Message.CONTENT_URI, WHERE_ACCOUNT_KEY,
-                getAccountArgument(mAccount.mId)));
-        // Find the body for this message
-        Body body = Body.restoreBodyWithMessageId(mProviderContext, msg4.mId);
-        // Set its source message to msg2's id
-        ContentValues values = new ContentValues();
-        values.put(Body.SOURCE_MESSAGE_KEY, msg2.mId);
-        body.update(mProviderContext, values);
-
-        // Now send deletions again; this time only two should get deleted; msg2 should NOT be
-        // deleted as it's referenced by msg4
-        mSyncAdapter.sendDeletedItems(s, deletedIds, true);
-        assertEquals(2, deletedIds.size());
-        assertFalse(deletedIds.contains(msg2.mId));
-    }
-
-    private String[] getAccountArgument(long id) {
-        ACCOUNT_ARGUMENT[0] = Long.toString(id);
-        return ACCOUNT_ARGUMENT;
-    }
-
-    void setupSyncParserAndAdapter(Account account, Mailbox mailbox) throws IOException {
-        EasSyncService service = getTestService(account, mailbox);
-        mSyncAdapter = new EmailSyncAdapter(service);
-        mSyncParser = mSyncAdapter.new EasEmailSyncParser(getTestInputStream(), mSyncAdapter);
-    }
-
-    ArrayList<Long> setupAccountMailboxAndMessages(int numMessages) {
-        ArrayList<Long> ids = new ArrayList<Long>();
-
-        // Create account and two mailboxes
-        mAccount = EmailContentSetupUtils.setupAccount("account", true, mProviderContext);
-        mMailbox = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, true,
-                mProviderContext);
-
-        for (int i = 0; i < numMessages; i++) {
-            Message msg = EmailContentSetupUtils.setupMessage("message" + i, mAccount.mId,
-                    mMailbox.mId, true, true, mProviderContext);
-            ids.add(msg.mId);
-        }
-
-        assertEquals(numMessages, EmailContent.count(mProviderContext, Message.CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-        return ids;
-    }
-
-    public void testDeleteParser() throws IOException {
-        // Setup some messages
-        ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
-        ContentValues cv = new ContentValues();
-        cv.put(SyncColumns.SERVER_ID, TEST_SERVER_ID);
-        long deleteMessageId = messageIds.get(1);
-        mResolver.update(ContentUris.withAppendedId(Message.CONTENT_URI, deleteMessageId), cv,
-                null, null);
-
-        // Setup our adapter and parser
-        setupSyncParserAndAdapter(mAccount, mMailbox);
-
-        // Set up an input stream with a delete command
-        Serializer s = new Serializer(false);
-        s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, TEST_SERVER_ID).end().done();
-        byte[] bytes = s.toByteArray();
-        mSyncParser.resetInput(new ByteArrayInputStream(bytes));
-        mSyncParser.nextTag(0);
-
-        // Run the delete parser
-        ArrayList<Long> deleteList = new ArrayList<Long>();
-        mSyncParser.deleteParser(deleteList, Tags.SYNC_DELETE);
-        // It should have found the message
-        assertEquals(1, deleteList.size());
-        long id = deleteList.get(0);
-        // And the id's should match
-        assertEquals(deleteMessageId, id);
-    }
-
-    public void testChangeParser() throws IOException {
-        // Setup some messages
-        ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
-        ContentValues cv = new ContentValues();
-        int randomFlags = Message.FLAG_INCOMING_MEETING_CANCEL | Message.FLAG_TYPE_FORWARD;
-        cv.put(SyncColumns.SERVER_ID, TEST_SERVER_ID);
-        cv.put(MessageColumns.FLAGS, randomFlags);
-        long changeMessageId = messageIds.get(1);
-        mResolver.update(ContentUris.withAppendedId(Message.CONTENT_URI, changeMessageId), cv,
-                null, null);
-
-        // Setup our adapter and parser
-        setupSyncParserAndAdapter(mAccount, mMailbox);
-
-        // Set up an input stream with a change command (marking TEST_SERVER_ID unread)
-        // Note that the test message creation code sets read to "true"
-        Serializer s = new Serializer(false);
-        s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, TEST_SERVER_ID);
-        s.start(Tags.SYNC_APPLICATION_DATA);
-        s.data(Tags.EMAIL_READ, "0");
-        s.data(Tags.EMAIL2_LAST_VERB_EXECUTED,
-                Integer.toString(EmailSyncAdapter.LAST_VERB_FORWARD));
-        s.end().end().done();
-        byte[] bytes = s.toByteArray();
-        mSyncParser.resetInput(new ByteArrayInputStream(bytes));
-        mSyncParser.nextTag(0);
-
-        // Run the delete parser
-        ArrayList<ServerChange> changeList = new ArrayList<ServerChange>();
-        mSyncParser.changeParser(changeList);
-        // It should have found the message
-        assertEquals(1, changeList.size());
-        // And the id's should match
-        ServerChange change = changeList.get(0);
-        assertEquals(changeMessageId, change.id);
-        assertNotNull(change.read);
-        assertFalse(change.read);
-        // Make sure we see the forwarded flag AND that the original flags are preserved
-        assertEquals((Integer)(randomFlags | Message.FLAG_FORWARDED), change.flags);
-    }
-
-    public void testCleanup() throws IOException {
-        // Setup some messages
-        ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
-        // Setup our adapter and parser
-        setupSyncParserAndAdapter(mAccount, mMailbox);
-
-        // Delete two of the messages, change one
-        long id = messageIds.get(0);
-        mResolver.delete(ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI, id),
-                null, null);
-        mSyncAdapter.mDeletedIdList.add(id);
-        id = messageIds.get(1);
-        mResolver.delete(ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI,
-                id), null, null);
-        mSyncAdapter.mDeletedIdList.add(id);
-        id = messageIds.get(2);
-        ContentValues cv = new ContentValues();
-        cv.put(Message.FLAG_READ, 0);
-        mResolver.update(ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI,
-                id), cv, null, null);
-        mSyncAdapter.mUpdatedIdList.add(id);
-
-        // The changed message should still exist
-        assertEquals(1, EmailContent.count(mProviderContext, Message.CONTENT_URI, WHERE_ACCOUNT_KEY,
-                getAccountArgument(mAccount.mId)));
-
-        // As well, the two deletions and one update
-        assertEquals(2, EmailContent.count(mProviderContext, Message.DELETED_CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-        assertEquals(1, EmailContent.count(mProviderContext, Message.UPDATED_CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-
-        // Cleanup (i.e. after sync); should remove items from delete/update tables
-        mSyncAdapter.cleanup();
-
-        // The three should be gone
-        assertEquals(0, EmailContent.count(mProviderContext, Message.DELETED_CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-        assertEquals(0, EmailContent.count(mProviderContext, Message.UPDATED_CONTENT_URI,
-                WHERE_ACCOUNT_KEY, getAccountArgument(mAccount.mId)));
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java b/exchange2/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
deleted file mode 100644
index dc5d15b..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
+++ /dev/null

@@ -1,418 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentResolver;
-import android.content.res.AssetManager;
-import android.database.Cursor;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.service.SyncWindow;
-import com.android.exchange.CommandStatusException;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.provider.EmailContentSetupUtils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.adapter.FolderSyncParserTests exchange
- */
-@MediumTest
-public class FolderSyncParserTests extends SyncAdapterTestCase<EmailSyncAdapter> {
-
-    // We increment this to generate unique server id's
-    private int mServerIdCount = 0;
-    private final long mCreationTime = System.currentTimeMillis();
-    private final String[] mMailboxQueryArgs = new String[2];
-
-    public FolderSyncParserTests() {
-        super();
-    }
-
-    public void testIsValidMailFolder() throws IOException {
-        EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
-        FolderSyncParser parser = new FolderSyncParser(getTestInputStream(), adapter);
-        HashMap<String, Mailbox> mailboxMap = new HashMap<String, Mailbox>();
-        // The parser needs the mAccount set
-        parser.mAccount = mAccount;
-        mAccount.save(getContext());
-
-        // Don't save the box; just create it, and give it a server id
-        Mailbox boxMailType = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_MAIL);
-        boxMailType.mServerId = "__1:1";
-        // Automatically valid since TYPE_MAIL
-        assertTrue(parser.isValidMailFolder(boxMailType, mailboxMap));
-
-        Mailbox boxCalendarType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_CALENDAR);
-        Mailbox boxContactsType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_CONTACTS);
-        Mailbox boxTasksType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_TASKS);
-        // Automatically invalid since TYPE_CALENDAR and TYPE_CONTACTS
-        assertFalse(parser.isValidMailFolder(boxCalendarType, mailboxMap));
-        assertFalse(parser.isValidMailFolder(boxContactsType, mailboxMap));
-        assertFalse(parser.isValidMailFolder(boxTasksType, mailboxMap));
-
-        // Unknown boxes are invalid unless they have a parent that's valid
-        Mailbox boxUnknownType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_UNKNOWN);
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        boxUnknownType.mParentServerId = boxMailType.mServerId;
-        // We shouldn't find the parent yet
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        // Put the mailbox in the map; the unknown box should now be valid
-        mailboxMap.put(boxMailType.mServerId, boxMailType);
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-
-        // Clear the map, but save away the parent box
-        mailboxMap.clear();
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        boxMailType.save(mProviderContext);
-        // The box should now be valid
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-
-        // Somewhat harder case.  The parent will be in the map, but also unknown.  The parent's
-        // parent will be in the database.
-        Mailbox boxParentUnknownType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId,
-                false, mProviderContext, Mailbox.TYPE_UNKNOWN);
-        assertFalse(parser.isValidMailFolder(boxParentUnknownType, mailboxMap));
-        // Give the unknown type parent a parent (boxMailType)
-        boxParentUnknownType.mServerId = "__1:2";
-        boxParentUnknownType.mParentServerId = boxMailType.mServerId;
-        // Give our unknown box an unknown parent
-        boxUnknownType.mParentServerId = boxParentUnknownType.mServerId;
-        // Confirm the box is still invalid
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        // Put the unknown type parent into the mailbox map
-        mailboxMap.put(boxParentUnknownType.mServerId, boxParentUnknownType);
-        // Our unknown box should now be valid, because 1) the parent is unknown, BUT 2) the
-        // parent's parent is a mail type
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-    }
-
-    private Mailbox setupBoxSync(int interval, int lookback, String serverId) {
-        // Don't save the box; just create it, and give it a server id
-        Mailbox box = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_MAIL);
-        box.mSyncInterval = interval;
-        box.mSyncLookback = lookback;
-        if (serverId != null) {
-            box.mServerId = serverId;
-        } else {
-            box.mServerId = "serverId-" + mCreationTime + '-' + mServerIdCount++;
-        }
-        box.save(mProviderContext);
-        return box;
-    }
-
-    private boolean syncOptionsSame(Mailbox a, Mailbox b) {
-        if (a.mSyncInterval != b.mSyncInterval) return false;
-        if (a.mSyncLookback != b.mSyncLookback) return false;
-        return true;
-    }
-
-    public void testSaveAndRestoreMailboxSyncOptions() throws IOException {
-        EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
-        FolderSyncParser parser = new FolderSyncParser(getTestInputStream(), adapter);
-        mAccount.save(mProviderContext);
-
-        parser.mAccount = mAccount;
-        parser.mAccountId = mAccount.mId;
-        parser.mAccountIdAsString = Long.toString(mAccount.mId);
-        parser.mContext = mProviderContext;
-        parser.mContentResolver = mProviderContext.getContentResolver();
-
-        // Don't save the box; just create it, and give it a server id
-        Mailbox box1 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                null);
-        Mailbox box2 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                null);
-        Mailbox boxa = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_1_MONTH,
-                null);
-        Mailbox boxb = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_2_WEEKS,
-                null);
-        Mailbox boxc = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                null);
-        Mailbox boxd = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                null);
-        Mailbox boxe = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_1_DAY,
-                null);
-
-        // Save the options (for a, b, c, d, e);
-        parser.saveMailboxSyncOptions();
-        // There should be 5 entries in the map, and they should be the correct ones
-        assertNotNull(parser.mSyncOptionsMap.get(boxa.mServerId));
-        assertNotNull(parser.mSyncOptionsMap.get(boxb.mServerId));
-        assertNotNull(parser.mSyncOptionsMap.get(boxc.mServerId));
-        assertNotNull(parser.mSyncOptionsMap.get(boxd.mServerId));
-        assertNotNull(parser.mSyncOptionsMap.get(boxe.mServerId));
-
-        // Delete all the mailboxes in the account
-        ContentResolver cr = mProviderContext.getContentResolver();
-        cr.delete(Mailbox.CONTENT_URI, Mailbox.ACCOUNT_KEY + "=?",
-                new String[] {parser.mAccountIdAsString});
-
-        // Create new boxes, all with default values for interval & window
-        Mailbox box1x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                box1.mServerId);
-        Mailbox box2x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                box2.mServerId);
-        Mailbox boxax = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                boxa.mServerId);
-        Mailbox boxbx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                boxb.mServerId);
-        Mailbox boxcx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                boxc.mServerId);
-        Mailbox boxdx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                boxd.mServerId);
-        Mailbox boxex = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
-                boxe.mServerId);
-
-        // Restore the sync options
-        parser.restoreMailboxSyncOptions();
-        box1x = Mailbox.restoreMailboxWithId(mProviderContext, box1x.mId);
-        box2x = Mailbox.restoreMailboxWithId(mProviderContext, box2x.mId);
-        boxax = Mailbox.restoreMailboxWithId(mProviderContext, boxax.mId);
-        boxbx = Mailbox.restoreMailboxWithId(mProviderContext, boxbx.mId);
-        boxcx = Mailbox.restoreMailboxWithId(mProviderContext, boxcx.mId);
-        boxdx = Mailbox.restoreMailboxWithId(mProviderContext, boxdx.mId);
-        boxex = Mailbox.restoreMailboxWithId(mProviderContext, boxex.mId);
-
-        assertTrue(syncOptionsSame(box1, box1x));
-        assertTrue(syncOptionsSame(box2, box2x));
-        assertTrue(syncOptionsSame(boxa, boxax));
-        assertTrue(syncOptionsSame(boxb, boxbx));
-        assertTrue(syncOptionsSame(boxc, boxcx));
-        assertTrue(syncOptionsSame(boxd, boxdx));
-        assertTrue(syncOptionsSame(boxe, boxex));
-    }
-
-    private static class MockFolderSyncParser extends FolderSyncParser {
-        private BufferedReader mReader;
-        private int mDepth = 0;
-        private String[] mStack = new String[32];
-        private HashMap<String, Integer> mTagMap;
-
-
-        public MockFolderSyncParser(String fileName, AbstractSyncAdapter adapter)
-                throws IOException {
-            super(null, adapter);
-            AssetManager am = mContext.getAssets();
-            InputStream is = am.open(fileName);
-            if (is != null) {
-                mReader = new BufferedReader(new InputStreamReader(is));
-            }
-            mInUnitTest = true;
-        }
-
-        private void initTagMap() {
-            mTagMap = new HashMap<String, Integer>();
-            int pageNum = 0;
-            for (String[] page: Tags.pages) {
-                int tagNum = 5;
-                for (String tag: page) {
-                    if (mTagMap.containsKey(tag)) {
-                        System.err.println("Duplicate tag: " + tag);
-                    }
-                    int val = (pageNum << Tags.PAGE_SHIFT) + tagNum;
-                    mTagMap.put(tag, val);
-                    tagNum++;
-                }
-                pageNum++;
-            }
-        }
-
-        private int lookupTag(String tagName) {
-            if (mTagMap == null) {
-                initTagMap();
-            }
-            int res = mTagMap.get(tagName);
-            return res;
-        }
-
-        private String getLine() throws IOException {
-            while (true) {
-                String line = mReader.readLine();
-                if (line == null) {
-                    return null;
-                }
-                int start = line.indexOf("| ");
-                if (start > 2) {
-                    return line.substring(start + 2);
-                }
-                // Keep looking for a suitable line
-            }
-        }
-
-        @Override
-        public int getValueInt() throws IOException {
-            return Integer.parseInt(getValue());
-        }
-
-        @Override
-        public String getValue() throws IOException {
-            String line = getLine();
-            if (line == null) throw new IOException();
-            int start = line.indexOf(": ");
-            if (start < 0) throw new IOException("Line has no value: " + line);
-            try {
-                return line.substring(start + 2).trim();
-            } finally {
-                if (nextTag(0) != END) {
-                    throw new IOException("Value not followed by end tag: " + name);
-                }
-            }
-        }
-
-        @Override
-        public void skipTag() throws IOException {
-            if (nextTag(0) == -1) {
-                nextTag(0);
-            }
-        }
-
-        @Override
-        public int nextTag(int endingTag) throws IOException {
-            String line = getLine();
-            if (line == null) {
-                return DONE;
-            }
-            if (line.startsWith("</")) {
-                int end = line.indexOf('>');
-                String tagName = line.substring(2, end).trim();
-                if (!tagName.equals(mStack[--mDepth])) {
-                    throw new IOException("Tag end doesn't match tag");
-                }
-                mStack[mDepth] = null;
-                return END;
-            } else if (line.startsWith("<")) {
-                int end = line.indexOf('>');
-                String tagName = line.substring(1, end).trim();
-                mStack[mDepth++] = tagName;
-                tag = lookupTag(tagName);
-                return tag;
-            } else {
-                return -1;
-            }
-        }
-    }
-
-    private Mailbox getMailboxWithName(String folderName) {
-        mMailboxQueryArgs[1] = folderName;
-        Cursor c = mResolver.query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION,
-                Mailbox.ACCOUNT_KEY + "=? AND " + Mailbox.DISPLAY_NAME + "=?", mMailboxQueryArgs,
-                null);
-        try {
-            assertTrue(c.getCount() == 1);
-            c.moveToFirst();
-            Mailbox m = new Mailbox();
-            m.restore(c);
-            return m;
-        } finally {
-            c.close();
-        }
-    }
-
-    private boolean isTopLevel(String folderName) {
-        Mailbox m = getMailboxWithName(folderName);
-        assertNotNull(m);
-        return m.mParentKey == Mailbox.NO_MAILBOX;
-    }
-
-    private boolean isSubfolder(String parentName, String childName) {
-        Mailbox parent = getMailboxWithName(parentName);
-        Mailbox child = getMailboxWithName(childName);
-        assertNotNull(parent);
-        assertNotNull(child);
-        assertTrue((parent.mFlags & Mailbox.FLAG_HAS_CHILDREN) != 0);
-        return child.mParentKey == parent.mId;
-    }
-
-    /**
-     * Parse a set of EAS FolderSync commands and create the Mailbox tree accordingly
-     *
-     * @param fileName the name of the file containing emaillog data for folder sync
-     * @throws IOException
-     * @throws CommandStatusException
-     */
-    private void testComplexFolderListParse(String fileName) throws IOException,
-    CommandStatusException {
-        EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
-        FolderSyncParser parser = new MockFolderSyncParser(fileName, adapter);
-        mAccount.save(mProviderContext);
-        mMailboxQueryArgs[0] = Long.toString(mAccount.mId);
-        parser.mAccount = mAccount;
-        parser.mAccountId = mAccount.mId;
-        parser.mAccountIdAsString = Long.toString(mAccount.mId);
-        parser.mContext = mProviderContext;
-        parser.mContentResolver = mResolver;
-
-        parser.parse();
-
-        assertTrue(isTopLevel("Inbox"));
-        assertTrue(isSubfolder("Inbox", "Gecko"));
-        assertTrue(isSubfolder("Inbox", "Wombat"));
-        assertTrue(isSubfolder("Inbox", "Laslo"));
-        assertTrue(isSubfolder("Inbox", "Tomorrow"));
-        assertTrue(isSubfolder("Inbox", "Vader"));
-        assertTrue(isSubfolder("Inbox", "Personal"));
-        assertTrue(isSubfolder("Laslo", "Lego"));
-        assertTrue(isSubfolder("Tomorrow", "HomeRun"));
-        assertTrue(isSubfolder("Tomorrow", "Services"));
-        assertTrue(isSubfolder("HomeRun", "Review"));
-        assertTrue(isSubfolder("Vader", "Max"));
-        assertTrue(isSubfolder("Vader", "Parser"));
-        assertTrue(isSubfolder("Vader", "Scott"));
-        assertTrue(isSubfolder("Vader", "Surfing"));
-        assertTrue(isSubfolder("Max", "Thomas"));
-        assertTrue(isSubfolder("Personal", "Famine"));
-        assertTrue(isSubfolder("Personal", "Bar"));
-        assertTrue(isSubfolder("Personal", "Bill"));
-        assertTrue(isSubfolder("Personal", "Boss"));
-        assertTrue(isSubfolder("Personal", "Houston"));
-        assertTrue(isSubfolder("Personal", "Mistake"));
-        assertTrue(isSubfolder("Personal", "Online"));
-        assertTrue(isSubfolder("Personal", "Sports"));
-        assertTrue(isSubfolder("Famine", "Buffalo"));
-        assertTrue(isSubfolder("Famine", "CornedBeef"));
-        assertTrue(isSubfolder("Houston", "Rebar"));
-        assertTrue(isSubfolder("Mistake", "Intro"));
-    }
-
-    // FolderSyncParserTest.txt is based on customer data (all names changed) that failed to
-    // properly create the Mailbox list
-    public void testComplexFolderListParse1() throws CommandStatusException, IOException {
-        testComplexFolderListParse("FolderSyncParserTest.txt");
-    }
-
-    // As above, with the order changed (putting children before parents; a more difficult case
-    public void testComplexFolderListParse2() throws CommandStatusException, IOException {
-        testComplexFolderListParse("FolderSyncParserTest2.txt");
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/ProvisionParserTests.java b/exchange2/tests/src/com/android/exchange/adapter/ProvisionParserTests.java
deleted file mode 100644
index 95b76a6..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/ProvisionParserTests.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import com.android.emailcommon.provider.Policy;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.adapter.ProvisionParserTests exchange
- */
-@SmallTest
-public class ProvisionParserTests extends SyncAdapterTestCase {
-    private final ByteArrayInputStream mTestInputStream =
-        new ByteArrayInputStream("ABCDEFG".getBytes());
-
-    // A good sample of an Exchange 2003 (WAP) provisioning document for end-to-end testing
-    private String mWapProvisioningDoc1 =
-        "<wap-provisioningdoc>" +
-            "<characteristic type=\"SecurityPolicy\"><parm name=\"4131\" value=\"0\"/>" +
-            "</characteristic>" +
-            "<characteristic type=\"Registry\">" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\AE\\" +
-                        "{50C13377-C66D-400C-889E-C316FC4AB374}\">" +
-                    "<parm name=\"AEFrequencyType\" value=\"1\"/>" +
-                    "<parm name=\"AEFrequencyValue\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"DeviceWipeThreshold\" value=\"20\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"CodewordFrequency\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"MinimumPasswordLength\" value=\"8\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"PasswordComplexity\" value=\"0\"/>" +
-                "</characteristic>" +
-            "</characteristic>" +
-        "</wap-provisioningdoc>";
-
-    // Provisioning document with passwords turned off
-    private String mWapProvisioningDoc2 =
-        "<wap-provisioningdoc>" +
-            "<characteristic type=\"SecurityPolicy\"><parm name=\"4131\" value=\"1\"/>" +
-            "</characteristic>" +
-            "<characteristic type=\"Registry\">" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\AE\\" +
-                        "{50C13377-C66D-400C-889E-C316FC4AB374}\">" +
-                    "<parm name=\"AEFrequencyType\" value=\"0\"/>" +
-                    "<parm name=\"AEFrequencyValue\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"DeviceWipeThreshold\" value=\"20\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"CodewordFrequency\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"MinimumPasswordLength\" value=\"8\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"PasswordComplexity\" value=\"0\"/>" +
-                "</characteristic>" +
-            "</characteristic>" +
-        "</wap-provisioningdoc>";
-
-    // Provisioning document with simple password, 4 chars, 5 failures
-    private String mWapProvisioningDoc3 =
-        "<wap-provisioningdoc>" +
-            "<characteristic type=\"SecurityPolicy\"><parm name=\"4131\" value=\"0\"/>" +
-            "</characteristic>" +
-            "<characteristic type=\"Registry\">" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\AE\\" +
-                        "{50C13377-C66D-400C-889E-C316FC4AB374}\">" +
-                    "<parm name=\"AEFrequencyType\" value=\"1\"/>" +
-                    "<parm name=\"AEFrequencyValue\" value=\"2\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"DeviceWipeThreshold\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\">" +
-                    "<parm name=\"CodewordFrequency\" value=\"5\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"MinimumPasswordLength\" value=\"4\"/>" +
-                "</characteristic>" +
-                "<characteristic type=\"HKLM\\Comm\\Security\\Policy\\LASSD\\LAP\\lap_pw\">" +
-                    "<parm name=\"PasswordComplexity\" value=\"1\"/>" +
-                "</characteristic>" +
-            "</characteristic>" +
-        "</wap-provisioningdoc>";
-
-    public void testWapProvisionParser1() throws IOException {
-         ProvisionParser parser = new ProvisionParser(mTestInputStream, getTestService());
-        parser.parseProvisionDocXml(mWapProvisioningDoc1);
-        Policy policy = parser.getPolicy();
-        assertNotNull(policy);
-        // Check the settings to make sure they were parsed correctly
-        assertEquals(5*60, policy.mMaxScreenLockTime);  // Screen lock time is in seconds
-        assertEquals(8, policy.mPasswordMinLength);
-        assertEquals(Policy.PASSWORD_MODE_STRONG, policy.mPasswordMode);
-        assertEquals(20, policy.mPasswordMaxFails);
-        assertTrue(policy.mRequireRemoteWipe);
-    }
-
-    public void testWapProvisionParser2() throws IOException {
-        ProvisionParser parser = new ProvisionParser(mTestInputStream, getTestService());
-        parser.parseProvisionDocXml(mWapProvisioningDoc2);
-        Policy policy = parser.getPolicy();
-        assertNotNull(policy);
-        // Password should be set to none; others are ignored in this case.
-        assertEquals(Policy.PASSWORD_MODE_NONE, policy.mPasswordMode);
-    }
-
-    public void testWapProvisionParser3() throws IOException {
-        ProvisionParser parser = new ProvisionParser(mTestInputStream, getTestService());
-        parser.parseProvisionDocXml(mWapProvisioningDoc3);
-        Policy policy = parser.getPolicy();
-        assertNotNull(policy);
-        // Password should be set to simple
-        assertEquals(2*60, policy.mMaxScreenLockTime);  // Screen lock time is in seconds
-        assertEquals(4, policy.mPasswordMinLength);
-        assertEquals(Policy.PASSWORD_MODE_SIMPLE, policy.mPasswordMode);
-        assertEquals(5, policy.mPasswordMaxFails);
-        assertTrue(policy.mRequireRemoteWipe);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/SerializerTests.java b/exchange2/tests/src/com/android/exchange/adapter/SerializerTests.java
deleted file mode 100644
index c26bcab..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/SerializerTests.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentValues;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/** You can run this entire test case with:
- *   runtest -c com.android.exchange.adapter.SerializerTests exchange
- */
-public class SerializerTests extends AndroidTestCase {
-
-    private static final byte[] BYTE_ARRAY = new byte[] {1, 2, 3, 4, 5};
-    private static final int BYTE_ARRAY_LENGTH = 5;
-    private static final String ID = "ID";
-    private static final String KEY = "Key";
-
-    // Basic test for use of start, end, tag, data, opaque, and done
-    public void testSerializer() throws IOException {
-        ContentValues values = new ContentValues();
-        // Create a test stream
-        Serializer s = new Serializer();
-        s.start(Tags.COMPOSE_SEND_MAIL);
-
-        // Test writeStringValue without and with data
-        s.writeStringValue(values, KEY, Tags.COMPOSE_ACCOUNT_ID);
-        values.put(KEY, ID);
-        s.writeStringValue(values, KEY, Tags.COMPOSE_ACCOUNT_ID);
-
-        s.data(Tags.COMPOSE_CLIENT_ID, ID);
-        s.tag(Tags.COMPOSE_SAVE_IN_SENT_ITEMS);
-        s.start(Tags.COMPOSE_MIME);
-        s.opaque(new ByteArrayInputStream(BYTE_ARRAY), BYTE_ARRAY_LENGTH);
-        s.end();  // COMPOSE_MIME
-        s.end();  // COMPOSE_SEND_MAIL
-        s.done(); // DOCUMENT
-        // Get the bytes for the stream
-        byte[] bytes = s.toByteArray();
-        // These are the expected bytes (self-explanatory)
-        byte[] expectedBytes = new byte[] {
-                3,      // Version 1.3
-                1,      // unknown or missing public identifier
-                106,    // UTF-8
-                0,      // String array length
-                Wbxml.SWITCH_PAGE,
-                Tags.COMPOSE,
-                Tags.COMPOSE_SEND_MAIL - Tags.COMPOSE_PAGE + Wbxml.WITH_CONTENT,
-                Tags.COMPOSE_ACCOUNT_ID - Tags.COMPOSE_PAGE,
-                Tags.COMPOSE_ACCOUNT_ID - Tags.COMPOSE_PAGE + Wbxml.WITH_CONTENT,
-                Wbxml.STR_I,    // 0-terminated string
-                (byte)ID.charAt(0),
-                (byte)ID.charAt(1),
-                0,
-                Wbxml.END,  // COMPOSE_ACCOUNT_ID
-                Tags.COMPOSE_CLIENT_ID - Tags.COMPOSE_PAGE + Wbxml.WITH_CONTENT,
-                Wbxml.STR_I,    // 0-terminated string
-                (byte)ID.charAt(0),
-                (byte)ID.charAt(1),
-                0,
-                Wbxml.END,  // COMPOSE_CLIENT_ID
-                Tags.COMPOSE_SAVE_IN_SENT_ITEMS - Tags.COMPOSE_PAGE,
-                Tags.COMPOSE_MIME - Tags.COMPOSE_PAGE + Wbxml.WITH_CONTENT,
-                (byte)Wbxml.OPAQUE,
-                BYTE_ARRAY_LENGTH,
-                BYTE_ARRAY[0],
-                BYTE_ARRAY[1],
-                BYTE_ARRAY[2],
-                BYTE_ARRAY[3],
-                BYTE_ARRAY[4],
-                Wbxml.END,  // COMPOSE_MIME
-                Wbxml.END   // COMPOSE_SEND_MAIL
-         };
-        // Make sure we get what's expected
-        MoreAsserts.assertEquals("Serializer mismatch", bytes, expectedBytes);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java b/exchange2/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java
deleted file mode 100644
index e8553ca..0000000
--- a/exchange2/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.adapter;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.adapter.AbstractSyncAdapter;
-import com.android.exchange.adapter.EmailSyncAdapter;
-import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-public class SyncAdapterTestCase<T extends AbstractSyncAdapter> extends AndroidTestCase {
-    public Context mContext;
-    public Context mProviderContext;
-    public ContentResolver mResolver;
-    public Mailbox mMailbox;
-    public Account mAccount;
-    public EmailSyncAdapter mSyncAdapter;
-    public EasEmailSyncParser mSyncParser;
-
-    public SyncAdapterTestCase() {
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
-        // This could be used with a MockContext if we switch over
-        mProviderContext = mContext;
-        mResolver = mContext.getContentResolver();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        // If we've created and saved an account, delete it
-        if (mAccount != null && mAccount.mId > 0) {
-            mResolver.delete(ContentUris.withAppendedId(Account.CONTENT_URI, mAccount.mId), null,
-                    null);
-        }
-    }
-
-    /**
-     * Create and return a short, simple InputStream that has at least four bytes, which is all
-     * that's required to initialize an EasParser (the parent class of EasEmailSyncParser)
-     * @return the InputStream
-     */
-    public InputStream getTestInputStream() {
-        return new ByteArrayInputStream(new byte[] {0, 0, 0, 0, 0});
-    }
-
-    EasSyncService getTestService() {
-        mAccount = new Account();
-        mAccount.mEmailAddress = "__test__@android.com";
-        mAccount.mId = -1;
-        Mailbox mailbox = new Mailbox();
-        mailbox.mId = -1;
-        return getTestService(mAccount, mailbox);
-    }
-
-    EasSyncService getTestService(Account account, Mailbox mailbox) {
-        EasSyncService service = new EasSyncService();
-        service.mContext = mContext;
-        service.mMailbox = mailbox;
-        service.mAccount = account;
-        service.mContentResolver = mContext.getContentResolver();
-        return service;
-    }
-
-    protected T getTestSyncAdapter(Class<T> klass) {
-        EasSyncService service = getTestService();
-        Constructor<T> c;
-        try {
-            c = klass.getDeclaredConstructor(new Class[] {EasSyncService.class});
-            return c.newInstance(service);
-        } catch (SecurityException e) {
-        } catch (NoSuchMethodException e) {
-        } catch (IllegalArgumentException e) {
-        } catch (InstantiationException e) {
-        } catch (IllegalAccessException e) {
-        } catch (InvocationTargetException e) {
-        }
-        return null;
-    }
-
-}

diff --git a/exchange2/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java b/exchange2/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java
deleted file mode 100644
index c302b02..0000000
--- a/exchange2/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.Mailbox;
-
-import android.content.Context;
-
-/**
- * Simplified EmailContent class setup (condensed from ProviderTestUtils in com.android.email)
- */
-public class EmailContentSetupUtils {
-
-    /**
-     * No constructor - statics only
-     */
-    private EmailContentSetupUtils() {
-    }
-
-    /**
-     * Create an account for test purposes
-     */
-    public static Account setupAccount(String name, boolean saveIt, Context context) {
-        Account account = new Account();
-
-        account.mDisplayName = name;
-        account.mEmailAddress = name + "@android.com";
-        account.mProtocolVersion = "2.5" + name;
-        if (saveIt) {
-            account.save(context);
-        }
-        return account;
-    }
-
-    /**
-     * Create a mailbox for test purposes
-     */
-    public static Mailbox setupMailbox(String name, long accountId, boolean saveIt,
-            Context context) {
-        return setupMailbox(name, accountId, saveIt, context, Mailbox.TYPE_MAIL, null);
-    }
-
-    public static Mailbox setupMailbox(String name, long accountId, boolean saveIt,
-            Context context, int type) {
-        return setupMailbox(name, accountId, saveIt, context, type, null);
-    }
-
-    public static Mailbox setupMailbox(String name, long accountId, boolean saveIt,
-            Context context, int type, Mailbox parentBox) {
-        Mailbox box = new Mailbox();
-
-        box.mDisplayName = name;
-        box.mAccountKey = accountId;
-        box.mSyncKey = "sync-key-" + name;
-        box.mSyncLookback = 2;
-        box.mSyncInterval = Account.CHECK_INTERVAL_NEVER;
-        box.mType = type;
-        box.mServerId = "serverid-" + name;
-        box.mParentServerId = parentBox != null ? parentBox.mServerId : "parent-serverid-" + name;
-
-        if (saveIt) {
-            box.save(context);
-        }
-        return box;
-    }
-
-    /**
-     * Create a message for test purposes
-     */
-    public static Message setupMessage(String name, long accountId, long mailboxId,
-            boolean addBody, boolean saveIt, Context context) {
-        // Default starred, read,  (backword compatibility)
-        return setupMessage(name, accountId, mailboxId, addBody, saveIt, context, true, true);
-    }
-
-    /**
-     * Create a message for test purposes
-     */
-    public static Message setupMessage(String name, long accountId, long mailboxId,
-            boolean addBody, boolean saveIt, Context context, boolean starred, boolean read) {
-        Message message = new Message();
-
-        message.mDisplayName = name;
-        message.mMailboxKey = mailboxId;
-        message.mAccountKey = accountId;
-        message.mFlagRead = read;
-        message.mFlagLoaded = Message.FLAG_LOADED_UNLOADED;
-        message.mFlagFavorite = starred;
-        message.mServerId = "serverid " + name;
-
-        if (addBody) {
-            message.mText = "body text " + name;
-            message.mHtml = "body html " + name;
-        }
-
-        if (saveIt) {
-            message.save(context);
-        }
-        return message;
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java b/exchange2/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
deleted file mode 100644
index e4bd791..0000000
--- a/exchange2/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import com.android.emailcommon.mail.PackedString;
-import com.android.emailcommon.provider.Account;
-import com.android.exchange.provider.GalResult.GalData;
-import com.android.exchange.utility.ExchangeTestCase;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Contacts;
-import android.test.suitebuilder.annotation.SmallTest;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.provider.ExchangeDirectoryProviderTests exchange
- */
-@SmallTest
-public class ExchangeDirectoryProviderTests extends ExchangeTestCase {
-
-    public ExchangeDirectoryProviderTests() {
-    }
-
-    // Create a test projection; we should only get back values for display name and email address
-    private static final String[] GAL_RESULT_PROJECTION =
-        new String[] {Contacts.DISPLAY_NAME, CommonDataKinds.Email.ADDRESS, Contacts.CONTENT_TYPE,
-            Contacts.LOOKUP_KEY};
-    private static final int GAL_RESULT_COLUMN_DISPLAY_NAME = 0;
-    private static final int GAL_RESULT_COLUMN_EMAIL_ADDRESS = 1;
-    private static final int GAL_RESULT_COLUMN_CONTENT_TYPE = 2;
-    private static final int GAL_RESULT_COLUMN_LOOKUP_KEY = 3;
-
-    public void testBuildSimpleGalResultCursor() {
-        GalResult result = new GalResult();
-        result.addGalData(1, "Alice Aardvark", "alice@aardvark.com");
-        result.addGalData(2, "Bob Badger", "bob@badger.com");
-        result.addGalData(3, "Clark Cougar", "clark@cougar.com");
-        result.addGalData(4, "Dan Dolphin", "dan@dolphin.com");
-        // Make sure our returned cursor has the expected contents
-        ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
-        Cursor c = provider.buildGalResultCursor(GAL_RESULT_PROJECTION, result);
-        assertNotNull(c);
-        assertEquals(MatrixCursor.class, c.getClass());
-        assertEquals(4, c.getCount());
-        for (int i = 0; i < 4; i++) {
-            GalData data = result.galData.get(i);
-            assertTrue(c.moveToNext());
-            assertEquals(data.displayName, c.getString(GAL_RESULT_COLUMN_DISPLAY_NAME));
-            assertEquals(data.emailAddress, c.getString(GAL_RESULT_COLUMN_EMAIL_ADDRESS));
-            assertNull(c.getString(GAL_RESULT_COLUMN_CONTENT_TYPE));
-        }
-    }
-
-    private static final String[][] DISPLAY_NAME_TEST_FIELDS = {
-        {"Alice", "Aardvark", "Another Name"},
-        {"Alice", "Aardvark", null},
-        {"Alice", null, null},
-        {null, "Aardvark", null},
-        {null, null, null}
-    };
-    private static final int TEST_FIELD_FIRST_NAME = 0;
-    private static final int TEST_FIELD_LAST_NAME = 1;
-    private static final int TEST_FIELD_DISPLAY_NAME = 2;
-    private static final String[] EXPECTED_DISPLAY_NAMES = new String[] {"Another Name",
-        "Alice Aardvark", "Alice", "Aardvark", null};
-
-    private GalResult getTestDisplayNameResult() {
-        GalResult result = new GalResult();
-        for (int i = 0; i < DISPLAY_NAME_TEST_FIELDS.length; i++) {
-            GalData galData = new GalData();
-            String[] names = DISPLAY_NAME_TEST_FIELDS[i];
-            galData.put(GalData.FIRST_NAME, names[TEST_FIELD_FIRST_NAME]);
-            galData.put(GalData.LAST_NAME, names[TEST_FIELD_LAST_NAME]);
-            galData.put(GalData.DISPLAY_NAME, names[TEST_FIELD_DISPLAY_NAME]);
-            result.addGalData(galData);
-        }
-        return result;
-    }
-
-    public void testDisplayNameLogic() {
-        GalResult result = getTestDisplayNameResult();
-        // Make sure our returned cursor has the expected contents
-        ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
-        Cursor c = provider.buildGalResultCursor(GAL_RESULT_PROJECTION, result);
-        assertNotNull(c);
-        assertEquals(MatrixCursor.class, c.getClass());
-        assertEquals(DISPLAY_NAME_TEST_FIELDS.length, c.getCount());
-        for (int i = 0; i < EXPECTED_DISPLAY_NAMES.length; i++) {
-            assertTrue(c.moveToNext());
-            assertEquals(EXPECTED_DISPLAY_NAMES[i], c.getString(GAL_RESULT_COLUMN_DISPLAY_NAME));
-        }
-    }
-
-    public void testLookupKeyLogic() {
-        GalResult result = getTestDisplayNameResult();
-        // Make sure our returned cursor has the expected contents
-        ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
-        Cursor c = provider.buildGalResultCursor(GAL_RESULT_PROJECTION, result);
-        assertNotNull(c);
-        assertEquals(MatrixCursor.class, c.getClass());
-        assertEquals(DISPLAY_NAME_TEST_FIELDS.length, c.getCount());
-        for (int i = 0; i < EXPECTED_DISPLAY_NAMES.length; i++) {
-            assertTrue(c.moveToNext());
-            PackedString ps =
-                new PackedString(Uri.decode(c.getString(GAL_RESULT_COLUMN_LOOKUP_KEY)));
-            String[] testFields = DISPLAY_NAME_TEST_FIELDS[i];
-            assertEquals(testFields[TEST_FIELD_FIRST_NAME], ps.get(GalData.FIRST_NAME));
-            assertEquals(testFields[TEST_FIELD_LAST_NAME], ps.get(GalData.LAST_NAME));
-            assertEquals(EXPECTED_DISPLAY_NAMES[i], ps.get(GalData.DISPLAY_NAME));
-        }
-    }
-
-    public void testGetAccountIdByName() {
-        Context context = getContext(); //getMockContext();
-        ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
-        // Nothing up my sleeve
-        assertNull(provider.mAccountIdMap.get("foo@android.com"));
-        assertNull(provider.mAccountIdMap.get("bar@android.com"));
-        // Create accounts; the email addresses will be the first argument + "@android.com"
-        Account acctFoo = setupTestAccount("foo", true);
-        Account acctBar = setupTestAccount("bar", true);
-        // Make sure we can retrieve them, and that the map is populated
-        assertEquals(acctFoo.mId, provider.getAccountIdByName(context, "foo@android.com"));
-        assertEquals(acctBar.mId, provider.getAccountIdByName(context, "bar@android.com"));
-        assertEquals((Long)acctFoo.mId, provider.mAccountIdMap.get("foo@android.com"));
-        assertEquals((Long)acctBar.mId, provider.mAccountIdMap.get("bar@android.com"));
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java b/exchange2/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
deleted file mode 100644
index a7425d7..0000000
--- a/exchange2/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
+++ /dev/null

@@ -1,762 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.utility.ExchangeTestCase;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.test.suitebuilder.annotation.MediumTest;
-
-/**
- * Tests of MailboxUtilities.
- *
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.provider.MailboxUtilitiesTests exchange
- */
-@MediumTest
-public class MailboxUtilitiesTests extends ExchangeTestCase {
-
-    // All tests must build their accounts in mAccount so it will be deleted from live data
-    private Account mAccount;
-    private ContentResolver mResolver;
-    private ContentValues mNullParentKey;
-
-    // Flag sets found in regular email folders that are parents or children
-    private static final int PARENT_FLAGS =
-            Mailbox.FLAG_ACCEPTS_MOVED_MAIL | Mailbox.FLAG_HOLDS_MAIL |
-            Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE;
-    private static final int CHILD_FLAGS =
-            Mailbox.FLAG_ACCEPTS_MOVED_MAIL | Mailbox.FLAG_HOLDS_MAIL;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mAccount = null;
-        mResolver = mProviderContext.getContentResolver();
-        mNullParentKey = new ContentValues();
-        mNullParentKey.putNull(Mailbox.PARENT_KEY);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        // If we've created and saved an account, delete it
-        if (mAccount != null && mAccount.mId > 0) {
-            mResolver.delete(
-                    ContentUris.withAppendedId(Account.CONTENT_URI, mAccount.mId), null, null);
-        }
-    }
-
-    public void testSetupParentKeyAndFlag() {
-        // Set up account and various mailboxes with/without parents
-        mAccount = setupTestAccount("acct1", true);
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, true,
-                mProviderContext, Mailbox.TYPE_DRAFTS);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox("box2", mAccount.mId, true,
-                mProviderContext, Mailbox.TYPE_OUTBOX, box1);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox("box3", mAccount.mId, true,
-                mProviderContext, Mailbox.TYPE_ATTACHMENT, box1);
-        Mailbox box4 = EmailContentSetupUtils.setupMailbox("box4", mAccount.mId, true,
-                mProviderContext, Mailbox.TYPE_NOT_SYNCABLE + 64, box3);
-        Mailbox box5 = EmailContentSetupUtils.setupMailbox("box5", mAccount.mId, true,
-                mProviderContext, Mailbox.TYPE_MAIL, box3);
-
-        // To make this work, we need to manually set parentKey to null for all mailboxes
-        // This simulates an older database needing update
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Hand-create the account selector for our account
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Fix up the database and restore the mailboxes
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-        box4 = Mailbox.restoreMailboxWithId(mProviderContext, box4.mId);
-        box5 = Mailbox.restoreMailboxWithId(mProviderContext, box5.mId);
-
-        // Test that flags and parent key are set properly
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_HAS_CHILDREN |
-                Mailbox.FLAG_CHILDREN_VISIBLE, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE, box3.mFlags);
-        assertEquals(box1.mId, box3.mParentKey);
-
-        assertEquals(0, box4.mFlags);
-        assertEquals(box3.mId, box4.mParentKey);
-
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_ACCEPTS_MOVED_MAIL, box5.mFlags);
-        assertEquals(box3.mId, box5.mParentKey);
-    }
-
-    private void simulateFolderSyncChangeHandling(String accountSelector, Mailbox...mailboxes) {
-        // Run the parent key analyzer and reload the mailboxes
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        for (Mailbox mailbox: mailboxes) {
-            String serverId = mailbox.mServerId;
-            MailboxUtilities.setFlagsAndChildrensParentKey(mProviderContext, accountSelector,
-                    serverId);
-        }
-    }
-
-    /**
-     * Test three cases of adding a folder to an existing hierarchy.  Case 1:  Add to parent.
-     */
-    public void testParentKeyAddFolder1() {
-        // Set up account and various mailboxes with/without parents
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Run the parent key analyzer to set up the initial hierarchy.
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        // The specific test:  Create a 3rd mailbox and attach it to box1 (already a parent)
-
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        box3.mParentKey = Mailbox.PARENT_KEY_UNINITIALIZED;
-        box3.save(mProviderContext);
-        simulateFolderSyncChangeHandling(accountSelector, box1 /*box3's parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(box1.mId, box3.mParentKey);
-    }
-
-    /**
-     * Test three cases of adding a folder to an existing hierarchy.  Case 2:  Add to child.
-     */
-    public void testParentKeyAddFolder2() {
-        // Set up account and various mailboxes with/without parents
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Run the parent key analyzer to set up the initial hierarchy.
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-
-        // Skipping tests of initial hierarchy - see testParentKeyAddFolder1()
-
-        // The specific test:  Create a 3rd mailbox and attach it to box2 (currently a child)
-
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box2);
-        box3.mParentKey = Mailbox.PARENT_KEY_UNINITIALIZED;
-        box3.save(mProviderContext);
-        simulateFolderSyncChangeHandling(accountSelector, box3 /*box3's parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box2.mFlags);    // should become a parent
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);     // should be child of box2
-        assertEquals(box2.mId, box3.mParentKey);
-    }
-
-    /**
-     * Test three cases of adding a folder to an existing hierarchy.  Case 3:  Add to root.
-     */
-    public void testParentKeyAddFolder3() {
-        // Set up account and various mailboxes with/without parents
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Run the parent key analyzer to set up the initial hierarchy.
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-
-        // Skipping tests of initial hierarchy - see testParentKeyAddFolder1()
-
-        // The specific test:  Create a 3rd mailbox and give it no parent (it's top-level).
-
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL);
-        box3.mParentKey = Mailbox.PARENT_KEY_UNINITIALIZED;
-        box3.save(mProviderContext);
-
-        simulateFolderSyncChangeHandling(accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(-1, box3.mParentKey);
-    }
-
-    /**
-     * Test three cases of removing a folder from the hierarchy.  Case 1:  Remove from parent.
-     */
-    public void testParentKeyRemoveFolder1() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has two children.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(box1.mId, box3.mParentKey);
-
-        // The specific test:  Delete box3 and check remaining configuration
-        mResolver.delete(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box3.mId), null, null);
-        simulateFolderSyncChangeHandling(accountSelector, box1 /*box3's parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);        // Should still be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertNull(box3);
-    }
-
-    /**
-     * Test three cases of removing a folder from the hierarchy.  Case 2:  Remove from child.
-     */
-    public void testParentKeyRemoveFolder2() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has box2 and box2 has box3.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box2);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box2.mFlags);    // becomes a parent
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(box2.mId, box3.mParentKey);
-
-        // The specific test:  Delete box3 and check remaining configuration
-        mResolver.delete(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box3.mId), null, null);
-        simulateFolderSyncChangeHandling(accountSelector, box2 /*box3's parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);        // Should still be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);         // Becomes a child
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertNull(box3);
-    }
-
-    /**
-     * Test three cases of removing a folder from the hierarchy.  Case 3:  Remove from root.
-     */
-    public void testParentKeyRemoveFolder3() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has box2, box3 is also at root.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(-1, box3.mParentKey);
-
-        // The specific test:  Delete box3 and check remaining configuration
-        mResolver.delete(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box3.mId), null, null);
-        simulateFolderSyncChangeHandling(accountSelector);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);        // Should still be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);         // Should still be a child
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertNull(box3);
-    }
-
-    /**
-     * Test changing a parent from none
-     */
-    public void testChangeFromNoParentToParent() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has box2, box3 is also at root.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(-1, box3.mParentKey);
-
-        // The specific test:  Give box 3 a new parent (box 2) and check remaining configuration
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.PARENT_SERVER_ID, box2.mServerId);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box3.mId), values,
-                null, null);
-        simulateFolderSyncChangeHandling(accountSelector, box2 /*box3's new parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);        // Should still be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box2.mFlags);        // Should now be a parent
-        assertEquals(box1.mId, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);         // Should still be a child (of box2)
-        assertEquals(box2.mId, box3.mParentKey);
-    }
-
-    /**
-     * Test changing to no parent from a parent
-     */
-    public void testChangeFromParentToNoParent() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has box2, box3 is also at root.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(box1.mId, box2.mParentKey);
-
-        // The specific test:  Remove the parent from box2 and check remaining configuration
-        ContentValues values = new ContentValues();
-        values.putNull(Mailbox.PARENT_SERVER_ID);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box2.mId), values,
-                null, null);
-        // Note: FolderSync handling of changed folder would cause parent key to be uninitialized
-        // so we do so here
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box2.mId), mNullParentKey,
-                null, null);
-        simulateFolderSyncChangeHandling(accountSelector, box1 /*box2's old parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(CHILD_FLAGS, box1.mFlags);        // Should no longer be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);        // Should still be a child (no parent)
-        assertEquals(-1, box2.mParentKey);
-    }
-
-    /**
-     * Test a mailbox that has no server id (Hotmail Outbox is an example of this)
-     */
-    public void testNoServerId() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has no serverId, box2 is a child of box1
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL);
-        box1.mServerId = null;
-        box1.save(mProviderContext);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_OUTBOX, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-
-        // Box 1 should be a child, even though it is defined as the parent of box2, because it
-        // has no serverId (presumably, this case can't happen, because a child stores the parent's
-        // serverId, but it's nice to know it's handled properly). Box 1 should have no parent.
-        assertEquals(Mailbox.NO_MAILBOX, box1.mParentKey);
-        assertEquals(CHILD_FLAGS, box1.mFlags);
-        // Box 2 should be a child with no parent (see above).  Since it's an outbox, the flags are
-        // only "holds mail".
-        assertEquals(Mailbox.NO_MAILBOX, box2.mParentKey);
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL, box2.mFlags);
-    }
-
-    /**
-     * Test changing a parent from one mailbox to another
-     */
-    public void testChangeParent() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-
-        // Initial configuration for this test:  box1 has box2, box3 is also at root.
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, true, mProviderContext, Mailbox.TYPE_MAIL, box1);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(-1, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(box1.mId, box3.mParentKey);
-
-        // The specific test:  Give box 3 a new parent (box 2) and check remaining configuration
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.PARENT_SERVER_ID, box2.mServerId);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box3.mId), values,
-                null, null);
-        // Changes to old and new parent
-        simulateFolderSyncChangeHandling(accountSelector, box2 /*box3's new parent*/,
-                box1 /*box3's old parent*/);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(CHILD_FLAGS, box1.mFlags);        // Should no longer be a parent
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box2.mFlags);        // Should now be a parent
-        assertEquals(-1, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);         // Should still be a child (of box2)
-        assertEquals(box2.mId, box3.mParentKey);
-    }
-
-
-    /**
-     * Tests the proper separation of two accounts using the methodology from the previous test.
-     * This test will fail if MailboxUtilities fails to distinguish between mailboxes in different
-     * accounts that happen to have the same serverId
-     */
-    public void testChangeParentTwoAccounts() {
-        // Set up account and mailboxes
-        mAccount = setupTestAccount("acct1", true);
-        Account acct2 = setupTestAccount("acct2", true);
-
-        String accountSelector1 = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
-        String accountSelector2 = MailboxColumns.ACCOUNT_KEY + " IN (" + acct2.mId + ")";
-
-        // Box3 is in Box1
-        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
-                "box1", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL);
-        box1.mServerId = "1:1";
-        box1.save(mProviderContext);
-        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
-                "box2", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL);
-        box2.mServerId = "1:2";
-        box2.save(mProviderContext);
-        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
-                "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box1);
-        box3.mServerId = "1:3";
-        box3.save(mProviderContext);
-
-        // Box5 is in Box4; Box 6 is in Box5
-        // Note that the three serverId's are identical to those in acct1; we want to make sure
-        // that children get associated only with boxes in their own account
-        Mailbox box4 = EmailContentSetupUtils.setupMailbox(
-                "box4", acct2.mId, false, mProviderContext, Mailbox.TYPE_MAIL, null);
-        box4.mServerId = "1:1";
-        box4.save(mProviderContext);
-        Mailbox box5 = EmailContentSetupUtils.setupMailbox(
-                "box5", acct2.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box4);
-        box5.mServerId = "1:2";
-        box5.save(mProviderContext);
-        Mailbox box6 = EmailContentSetupUtils.setupMailbox(
-                "box6", acct2.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box5);
-        box6.mServerId = "1:3";
-        box6.save(mProviderContext);
-
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-
-        // Confirm initial configuration as expected for mAccount
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector1);
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(-1, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(box1.mId, box3.mParentKey);
-
-        // Confirm initial configuration as expected for acct2
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector2);
-        box4 = Mailbox.restoreMailboxWithId(mProviderContext, box4.mId);
-        box5 = Mailbox.restoreMailboxWithId(mProviderContext, box5.mId);
-        box6 = Mailbox.restoreMailboxWithId(mProviderContext, box6.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(PARENT_FLAGS, box4.mFlags);
-        assertEquals(-1, box4.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box5.mFlags);
-        assertEquals(box4.mId, box5.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box6.mFlags);
-        assertEquals(box5.mId, box6.mParentKey);
-
-        // The specific test:  Change box1 to have a different serverId
-        ContentValues values = new ContentValues();
-        values.put(MailboxColumns.SERVER_ID, "1:4");
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, box1.mId), values,
-                null, null);
-        // Manually set parentKey to null for all mailboxes, as if an initial sync or post-upgrade
-        mResolver.update(Mailbox.CONTENT_URI, mNullParentKey, null, null);
-        // Fix up the parent keys
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector1);
-
-        // Make sure that box1 reflects the change properly AND that other boxes remain correct
-        // The reason for all of the seemingly-duplicated tests is to make sure that the fixup of
-        // any account doesn't end up affecting the other account's mailboxes
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(CHILD_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(-1, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(-1, box3.mParentKey);
-
-        // Fix up the 2nd account now, and check that ALL boxes are correct
-        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector2);
-
-        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
-        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
-        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
-
-        // Confirm flags and parent key(s) as expected
-        assertEquals(CHILD_FLAGS, box1.mFlags);
-        assertEquals(-1, box1.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box2.mFlags);
-        assertEquals(-1, box2.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box3.mFlags);
-        assertEquals(-1, box3.mParentKey);
-
-        box4 = Mailbox.restoreMailboxWithId(mProviderContext, box4.mId);
-        box5 = Mailbox.restoreMailboxWithId(mProviderContext, box5.mId);
-        box6 = Mailbox.restoreMailboxWithId(mProviderContext, box6.mId);
-
-        assertEquals(PARENT_FLAGS, box4.mFlags);
-        assertEquals(-1, box4.mParentKey);
-
-        assertEquals(PARENT_FLAGS, box5.mFlags);
-        assertEquals(box4.mId, box5.mParentKey);
-
-        assertEquals(CHILD_FLAGS, box6.mFlags);
-        assertEquals(box5.mId, box6.mParentKey);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/provider/MockProvider.java b/exchange2/tests/src/com/android/exchange/provider/MockProvider.java
deleted file mode 100644
index 177ec55..0000000
--- a/exchange2/tests/src/com/android/exchange/provider/MockProvider.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.Map.Entry;
-
-/**
- * MockProvider is a ContentProvider that can be used to simulate the storage and retrieval of
- * records from any ContentProvider, even if that ContentProvider does not exist in the caller's
- * package.  It is specifically designed to enable testing of sync adapters that create
- * ContentProviderOperations (CPOs) that are then executed using ContentResolver.applyBatch()
- *
- * Why is this useful?  Because we can't instantiate CalendarProvider or ContactsProvider from our
- * package, as required by MockContentResolver.addProvider()
- *
- * Usage:
- *     ContentResolver.applyBatch(MockProvider.AUTHORITY, batch) will cause the CPOs to be executed,
- *     returning an array of ContentProviderResult; in the case of inserts, the result will include
- *     a Uri that can be used via query().  Note that the CPOs in the batch can contain references
- *     to any authority.
- *
- *     query() does not allow non-null selection, selectionArgs, or sortOrder arguments; the
- *     presence of these will result in an UnsupportedOperationException
- *
- *     insert() acts as expected, returning a Uri that can be directly used in a query
- *
- *     delete() and update() do not allow non-null selection or selectionArgs arguments; the
- *     presence of these will result in an UnsupportedOperationException
- *
- *     NOTE: When using any operation other than applyBatch, the Uri to be used must be created
- *     with MockProvider.uri(yourUri).  This guarantees that the operation is sent to MockProvider
- *
- *     NOTE: MockProvider only simulates direct storage/retrieval of rows; it does not (and can not)
- *     simulate other actions (e.g. creation of ancillary data) that the actual provider might
- *     perform
- *
- *     NOTE: See MockProviderTests for usage examples
- **/
-public class MockProvider extends ContentProvider {
-    public static final String AUTHORITY = "com.android.exchange.mock.provider";
-    /*package*/ static final UriMatcher sURIMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
-    /*package*/ static final int TABLE = 100;
-    /*package*/ static final int RECORD = 101;
-
-    public static final String ID_COLUMN = "_id";
-
-    public MockProvider(Context context) {
-        super(context, null, null, null);
-    }
-
-    public MockProvider() {
-        super();
-    }
-
-    // We'll store our values here
-    private HashMap<String, ContentValues> mMockStore = new HashMap<String, ContentValues>();
-    // And we'll generate new id's from here
-    long mMockId = 1;
-
-    /**
-     * Create a Uri for MockProvider from a given Uri
-     * @param uri the Uri from which the MockProvider Uri will be created
-     * @return a Uri that can be used with MockProvider
-     */
-    public static Uri uri(Uri uri) {
-        return new Uri.Builder().scheme("content").authority(AUTHORITY)
-            .path(uri.getPath().substring(1)).build();
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        if (selection != null || selectionArgs != null) {
-            throw new UnsupportedOperationException();
-        }
-        String path = uri.getPath();
-        if (mMockStore.containsKey(path)) {
-            mMockStore.remove(path);
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        // Remove the leading slash
-        String table = uri.getPath().substring(1);
-        long id = mMockId++;
-        Uri newUri = new Uri.Builder().scheme("content").authority(AUTHORITY).path(table)
-            .appendPath(Long.toString(id)).build();
-        // Remember to store the _id
-        values.put(ID_COLUMN, id);
-        mMockStore.put(newUri.getPath(), values);
-        int match = sURIMatcher.match(uri);
-        if (match == UriMatcher.NO_MATCH) {
-            sURIMatcher.addURI(AUTHORITY, table, TABLE);
-            sURIMatcher.addURI(AUTHORITY, table + "/#", RECORD);
-        }
-        return newUri;
-    }
-
-    @Override
-    public boolean onCreate() {
-        return false;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        if (selection != null || selectionArgs != null || sortOrder != null || projection == null) {
-            throw new UnsupportedOperationException();
-        }
-        final int match = sURIMatcher.match(uri(uri));
-        ArrayList<ContentValues> valuesList = new ArrayList<ContentValues>();
-        switch(match) {
-            case TABLE:
-                Set<Entry<String, ContentValues>> entrySet = mMockStore.entrySet();
-                String prefix = uri.getPath() + "/";
-                for (Entry<String, ContentValues> entry: entrySet) {
-                    if (entry.getKey().startsWith(prefix)) {
-                        valuesList.add(entry.getValue());
-                    }
-                }
-                break;
-            case RECORD:
-                ContentValues values = mMockStore.get(uri.getPath());
-                if (values != null) {
-                    valuesList.add(values);
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        MatrixCursor cursor = new MatrixCursor(projection, 1);
-        for (ContentValues cv: valuesList) {
-            Object[] rowValues = new Object[projection.length];
-            int i = 0;
-            for (String column: projection) {
-                rowValues[i++] = cv.get(column);
-            }
-            cursor.addRow(rowValues);
-        }
-        return cursor;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues newValues, String selection, String[] selectionArgs) {
-        if (selection != null || selectionArgs != null) {
-            throw new UnsupportedOperationException();
-        }
-        final int match = sURIMatcher.match(uri(uri));
-        ArrayList<ContentValues> updateValuesList = new ArrayList<ContentValues>();
-        String path = uri.getPath();
-        switch(match) {
-            case TABLE:
-                Set<Entry<String, ContentValues>> entrySet = mMockStore.entrySet();
-                String prefix = path + "/";
-                for (Entry<String, ContentValues> entry: entrySet) {
-                    if (entry.getKey().startsWith(prefix)) {
-                        updateValuesList.add(entry.getValue());
-                    }
-                }
-                break;
-            case RECORD:
-                ContentValues cv = mMockStore.get(path);
-                if (cv != null) {
-                    updateValuesList.add(cv);
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        Set<Entry<String, Object>> newValuesSet = newValues.valueSet();
-        for (Entry<String, Object> entry: newValuesSet) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            for (ContentValues targetValues: updateValuesList) {
-                if (value instanceof Integer) {
-                    targetValues.put(key, (Integer)value);
-                } else if (value instanceof Long) {
-                    targetValues.put(key, (Long)value);
-                } else if (value instanceof String) {
-                    targetValues.put(key, (String)value);
-                } else if (value instanceof Boolean) {
-                    targetValues.put(key, (Boolean)value);
-                } else {
-                    throw new IllegalArgumentException();
-                }
-            }
-        }
-        for (ContentValues targetValues: updateValuesList) {
-            mMockStore.put(path + "/" + targetValues.getAsLong(ID_COLUMN), targetValues);
-        }
-        return updateValuesList.size();
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/provider/MockProviderTests.java b/exchange2/tests/src/com/android/exchange/provider/MockProviderTests.java
deleted file mode 100644
index 897f0d8..0000000
--- a/exchange2/tests/src/com/android/exchange/provider/MockProviderTests.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.provider;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.test.ProviderTestCase2;
-import android.test.mock.MockContentResolver;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.ArrayList;
-
-/**
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.provider.MockProviderTests exchange
- */
-@SmallTest
-public class MockProviderTests extends ProviderTestCase2<MockProvider> {
-    Context mMockContext;
-    MockContentResolver mMockResolver;
-
-    private static final String CANHAZ_AUTHORITY = "com.android.canhaz";
-    private static final String PONY_TABLE = "pony";
-    private static final String PONY_COLUMN_NAME = "name";
-    private static final String PONY_COLUMN_TYPE = "type";
-    private static final String PONY_COLUMN_LEGS= "legs";
-    private static final String PONY_COLUMN_CAN_RIDE = "canRide";
-    private static final String[] PONY_PROJECTION = {MockProvider.ID_COLUMN, PONY_COLUMN_NAME,
-        PONY_COLUMN_TYPE, PONY_COLUMN_LEGS, PONY_COLUMN_CAN_RIDE};
-    private static final int PONY_ID = 0;
-    private static final int PONY_NAME = 1;
-    private static final int PONY_TYPE = 2;
-    private static final int PONY_LEGS = 3;
-    private static final int PONY_CAN_RIDE = 4;
-
-    public MockProviderTests() {
-        super(MockProvider.class, MockProvider.AUTHORITY);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mMockContext = getMockContext();
-        mMockResolver = (MockContentResolver)mMockContext.getContentResolver();
-        mMockResolver.addProvider(CANHAZ_AUTHORITY, new MockProvider(mMockContext));
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    private ContentValues ponyValues(String name, String type, int legs, boolean canRide) {
-        ContentValues cv = new ContentValues();
-        cv.put(PONY_COLUMN_NAME, name);
-        cv.put(PONY_COLUMN_TYPE, type);
-        cv.put(PONY_COLUMN_LEGS, legs);
-        cv.put(PONY_COLUMN_CAN_RIDE, canRide ? 1 : 0);
-        return cv;
-    }
-
-    private ContentProviderResult[] setupPonies() throws RemoteException,
-            OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        Uri uri = new Uri.Builder().scheme("content").authority(CANHAZ_AUTHORITY)
-            .path(PONY_TABLE).build();
-        // Our array of CPO's to be used with applyBatch
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-
-        // Insert two ponies
-        ContentValues pony1 = ponyValues("Flicka", "wayward", 4, true);
-        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony1).build());
-        ContentValues pony2 = ponyValues("Elise", "dastardly", 3, false);
-        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony2).build());
-        // Apply the batch with one insert operation
-        return mMockResolver.applyBatch(MockProvider.AUTHORITY, ops);
-    }
-
-    private Uri getPonyUri() {
-        return new Uri.Builder().scheme("content").authority(CANHAZ_AUTHORITY)
-            .path(PONY_TABLE).build();
-    }
-
-    public void testInsertQueryandDelete() throws RemoteException, OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        ContentProviderResult[] results = setupPonies();
-        Uri uri = getPonyUri();
-
-        // Check the results
-        assertNotNull(results);
-        assertEquals(2, results.length);
-        // Make sure that we've created matcher entries for pony and pony/#
-        assertEquals(MockProvider.TABLE, MockProvider.sURIMatcher.match(MockProvider.uri(uri)));
-        assertEquals(MockProvider.RECORD,
-                MockProvider.sURIMatcher.match(MockProvider.uri(results[0].uri)));
-        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        assertEquals(2, c.getCount());
-        long eliseId = -1;
-        long flickaId = -1;
-        while (c.moveToNext()) {
-            String name = c.getString(PONY_NAME);
-            if ("Flicka".equals(name)) {
-                assertEquals("Flicka", c.getString(PONY_NAME));
-                assertEquals("wayward", c.getString(PONY_TYPE));
-                assertEquals(4, c.getInt(PONY_LEGS));
-                assertEquals(1, c.getInt(PONY_CAN_RIDE));
-                flickaId = c.getLong(PONY_ID);
-            } else if ("Elise".equals(name)) {
-                assertEquals("dastardly", c.getString(PONY_TYPE));
-                assertEquals(3, c.getInt(PONY_LEGS));
-                assertEquals(0, c.getInt(PONY_CAN_RIDE));
-                eliseId = c.getLong(PONY_ID);
-            } else {
-                fail("Wrong record: " + name);
-            }
-        }
-
-        // eliseId and flickaId should have been set
-        assertNotSame(-1, eliseId);
-        assertNotSame(-1, flickaId);
-        // Delete the elise record
-        assertEquals(1, mMockResolver.delete(ContentUris.withAppendedId(MockProvider.uri(uri),
-                eliseId), null, null));
-        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        // There should be one left (Flicka)
-        assertEquals(1, c.getCount());
-        assertTrue(c.moveToNext());
-        assertEquals("Flicka", c.getString(PONY_NAME));
-    }
-
-    public void testUpdate() throws RemoteException, OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        Uri uri = getPonyUri();
-        setupPonies();
-        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        assertEquals(2, c.getCount());
-        // Give all the ponies 5 legs
-        ContentValues cv = new ContentValues();
-        cv.put(PONY_COLUMN_LEGS, 5);
-        assertEquals(2, mMockResolver.update(MockProvider.uri(uri), cv, null, null));
-        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        // We should still have two records, and each should have 5 legs, but otherwise be the same
-        assertEquals(2, c.getCount());
-        long eliseId = -1;
-        long flickaId = -1;
-        while (c.moveToNext()) {
-            String name = c.getString(PONY_NAME);
-            if ("Flicka".equals(name)) {
-                assertEquals("Flicka", c.getString(PONY_NAME));
-                assertEquals("wayward", c.getString(PONY_TYPE));
-                assertEquals(5, c.getInt(PONY_LEGS));
-                assertEquals(1, c.getInt(PONY_CAN_RIDE));
-                flickaId = c.getLong(PONY_ID);
-            } else if ("Elise".equals(name)) {
-                assertEquals("dastardly", c.getString(PONY_TYPE));
-                assertEquals(5, c.getInt(PONY_LEGS));
-                assertEquals(0, c.getInt(PONY_CAN_RIDE));
-                eliseId = c.getLong(PONY_ID);
-            } else {
-                fail("Wrong record: " + name);
-            }
-        }
-        // eliseId and flickaId should have been set
-        assertNotSame(-1, eliseId);
-        assertNotSame(-1, flickaId);
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/exchange2/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
deleted file mode 100644
index 0ecdb8f..0000000
--- a/exchange2/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ /dev/null

@@ -1,1003 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.utility;
-
-import android.content.ContentValues;
-import android.content.Entity;
-import android.content.res.Resources;
-import android.provider.CalendarContract.Attendees;
-import android.provider.CalendarContract.Events;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-
-import com.android.emailcommon.mail.Address;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.utility.Utility;
-import com.android.exchange.R;
-import com.android.exchange.adapter.CalendarSyncAdapter;
-import com.android.exchange.adapter.CalendarSyncAdapter.EasCalendarSyncParser;
-import com.android.exchange.adapter.Parser;
-import com.android.exchange.adapter.Serializer;
-import com.android.exchange.adapter.SyncAdapterTestCase;
-import com.android.exchange.adapter.Tags;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.TimeZone;
-
-/**
- * Tests of EAS Calendar Utilities
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.utility.CalendarUtilitiesTests exchange
- *
- * Please see RFC2445 for RRULE definition
- * http://www.ietf.org/rfc/rfc2445.txt
- */
-@MediumTest
-public class CalendarUtilitiesTests extends SyncAdapterTestCase<CalendarSyncAdapter> {
-
-    // Some prebuilt time zones, Base64 encoded (as they arrive from EAS)
-    // More time zones to be added over time
-
-    // Not all time zones are appropriate for testing.  For example, ISRAEL_STANDARD_TIME cannot be
-    // used because DST is determined from year to year in a non-standard way (related to the lunar
-    // calendar); therefore, the test would only work during the year in which it was created
-
-    // This time zone has no DST
-    private static final String ASIA_CALCUTTA_TIME =
-        "tv7//0kAbgBkAGkAYQAgAFMAdABhAG4AZABhAHIAZAAgAFQAaQBtAGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEkAbgBkAGkAYQAgAEQAYQB5AGwAaQBnAGgAdAAgAFQAaQBtAGUA" +
-        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==";
-
-    // This time zone is equivalent to PST and uses DST
-    private static final String AMERICA_DAWSON_TIME =
-        "4AEAAFAAYQBjAGkAZgBpAGMAIABTAHQAYQBuAGQAYQByAGQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAFAAYQBjAGkAZgBpAGMAIABEAGEAeQBsAGkAZwBoAHQAIABUAGkA" +
-        "bQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==";
-
-    // Test a southern hemisphere time zone w/ DST
-    private static final String AUSTRALIA_ACT_TIME =
-        "qP3//0EAVQBTACAARQBhAHMAdABlAHIAbgAgAFMAdABhAG4AZABhAHIAZAAgAFQAaQBtAGUAAAAAAAAAAAAA" +
-        "AAAAAAAAAAQAAAABAAMAAAAAAAAAAAAAAEEAVQBTACAARQBhAHMAdABlAHIAbgAgAEQAYQB5AGwAaQBnAGgA" +
-        "dAAgAFQAaQBtAGUAAAAAAAAAAAAAAAAAAAAAAAoAAAABAAIAAAAAAAAAxP///w==";
-
-    // Test a timezone with GMT bias but bogus DST parameters (there is no equivalent time zone
-    // in the database)
-    private static final String GMT_UNKNOWN_DAYLIGHT_TIME =
-        "AAAAACgARwBNAFQAKwAwADAAOgAwADAAKQAgAFQAaQBtAGUAIABaAG8AbgBlAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAEAAAABAAAAAAAAAAAAAAAAACgARwBNAFQAKwAwADAAOgAwADAAKQAgAFQAaQBtAGUAIABaAG8A" +
-        "bgBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAEAAAAAAAAAxP///w==";
-
-    // This time zone has no DST, but earlier, buggy code retrieved a TZ WITH DST
-    private static final String ARIZONA_TIME =
-        "pAEAAFUAUwAgAE0AbwB1AG4AdABhAGkAbgAgAFMAdABhAG4AZABhAHIAZAAgAFQAaQBtAGUAAAAAAAAAAAAA" +
-        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFUAUwAgAE0AbwB1AG4AdABhAGkAbgAgAEQAYQB5AGwAaQBnAGgA" +
-        "dAAgAFQAaQBtAGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==";
-
-    private static final String HAWAII_TIME =
-        "WAIAAEgAYQB3AGEAaQBpAGEAbgAgAFMAdABhAG4AZABhAHIAZAAgAFQAaQBtAGUAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAYQB3AGEAaQBpAGEAbgAgAEQAYQB5AGwAaQBnAGgAdAAgAFQA" +
-        "aQBtAGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==";
-
-    // This is time zone sent by Exchange 2007, apparently; the start time of DST for the eastern
-    // time zone (EST) is off by two hours, which we should correct in our new "lenient" code
-    private static final String LENIENT_EASTERN_TIME =
-        "LAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAAAAAAAAAAAxP///w==";
-
-    private static final String ORGANIZER = "organizer@server.com";
-    private static final String ATTENDEE = "attendee@server.com";
-
-    public void testGetSet() {
-        byte[] bytes = new byte[] {0, 1, 2, 3, 4, 5, 6, 7};
-
-        // First, check that getWord/Long are properly little endian
-        assertEquals(0x0100, CalendarUtilities.getWord(bytes, 0));
-        assertEquals(0x03020100, CalendarUtilities.getLong(bytes, 0));
-        assertEquals(0x07060504, CalendarUtilities.getLong(bytes, 4));
-
-        // Set some words and longs
-        CalendarUtilities.setWord(bytes, 0, 0xDEAD);
-        CalendarUtilities.setLong(bytes, 2, 0xBEEFBEEF);
-        CalendarUtilities.setWord(bytes, 6, 0xCEDE);
-
-        // Retrieve them
-        assertEquals(0xDEAD, CalendarUtilities.getWord(bytes, 0));
-        assertEquals(0xBEEFBEEF, CalendarUtilities.getLong(bytes, 2));
-        assertEquals(0xCEDE, CalendarUtilities.getWord(bytes, 6));
-    }
-
-    public void testParseTimeZoneEndToEnd() {
-        TimeZone tz = CalendarUtilities.tziStringToTimeZone(AMERICA_DAWSON_TIME);
-        assertEquals("America/Dawson", tz.getID());
-        tz = CalendarUtilities.tziStringToTimeZone(ASIA_CALCUTTA_TIME);
-        assertEquals("Asia/Calcutta", tz.getID());
-        tz = CalendarUtilities.tziStringToTimeZone(AUSTRALIA_ACT_TIME);
-        assertEquals("Australia/ACT", tz.getID());
-
-        // Test peculiar MS sent EST data with and without lenient precision; send standard
-        // precision + 1 (i.e. 1ms) to make sure the code doesn't automatically flip to lenient
-        // when the tz isn't found
-        tz = CalendarUtilities.tziStringToTimeZoneImpl(LENIENT_EASTERN_TIME,
-                CalendarUtilities.STANDARD_DST_PRECISION+1);
-        assertEquals("America/Atikokan", tz.getID());
-        tz = CalendarUtilities.tziStringToTimeZoneImpl(LENIENT_EASTERN_TIME,
-                CalendarUtilities.LENIENT_DST_PRECISION);
-        assertEquals("America/Detroit", tz.getID());
-
-        tz = CalendarUtilities.tziStringToTimeZone(GMT_UNKNOWN_DAYLIGHT_TIME);
-        int bias = tz.getOffset(System.currentTimeMillis());
-        assertEquals(0, bias);
-        // Make sure non-DST TZ's work properly when the tested zone is the default zone
-        TimeZone.setDefault(TimeZone.getTimeZone("America/Phoenix"));
-        tz = CalendarUtilities.tziStringToTimeZone(ARIZONA_TIME);
-        assertEquals("America/Phoenix", tz.getID());
-        TimeZone.setDefault(TimeZone.getTimeZone("Pacific/Honolulu"));
-        tz = CalendarUtilities.tziStringToTimeZone(HAWAII_TIME);
-        assertEquals("Pacific/Honolulu", tz.getID());
-        // Make sure non-DST TZ's get the proper offset and DST status otherwise
-        CalendarUtilities.clearTimeZoneCache();
-        TimeZone azTime = TimeZone.getTimeZone("America/Phoenix");
-        TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
-        tz = CalendarUtilities.tziStringToTimeZone(ARIZONA_TIME);
-        assertFalse("America/Phoenix".equals(tz.getID()));
-        assertFalse(tz.useDaylightTime());
-        // It doesn't matter what time is passed in, since neither TZ has dst
-        long now = System.currentTimeMillis();
-        assertEquals(azTime.getOffset(now), tz.getOffset(now));
-    }
-
-    public void testGenerateEasDayOfWeek() {
-        String byDay = "TU,WE,SA";
-        // TU = 4, WE = 8; SA = 64;
-        assertEquals("76", CalendarUtilities.generateEasDayOfWeek(byDay));
-        // MO = 2, TU = 4; WE = 8; TH = 16; FR = 32
-        byDay = "MO,TU,WE,TH,FR";
-        assertEquals("62", CalendarUtilities.generateEasDayOfWeek(byDay));
-        // SU = 1
-        byDay = "SU";
-        assertEquals("1", CalendarUtilities.generateEasDayOfWeek(byDay));
-    }
-
-    public void testTokenFromRrule() {
-        String rrule = "FREQ=DAILY;INTERVAL=1;BYDAY=WE,TH,SA;BYMONTHDAY=17";
-        assertEquals("DAILY", CalendarUtilities.tokenFromRrule(rrule, "FREQ="));
-        assertEquals("1", CalendarUtilities.tokenFromRrule(rrule, "INTERVAL="));
-        assertEquals("17", CalendarUtilities.tokenFromRrule(rrule, "BYMONTHDAY="));
-        assertEquals("WE,TH,SA", CalendarUtilities.tokenFromRrule(rrule, "BYDAY="));
-        assertNull(CalendarUtilities.tokenFromRrule(rrule, "UNTIL="));
-    }
-
-    public void testRecurrenceUntilToEasUntil() {
-        TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
-        // Case where local time crosses into next day in GMT
-        assertEquals("20110730T000000Z",
-                CalendarUtilities.recurrenceUntilToEasUntil("20110731T025959Z"));
-        // Case where local time does not cross into next day in GMT
-        assertEquals("20110730T000000Z",
-                CalendarUtilities.recurrenceUntilToEasUntil("20110730T235959Z"));
-    }
-
-    public void testParseEmailDateTimeToMillis(String date) {
-        // Format for email date strings is 2010-02-23T16:00:00.000Z
-        String dateString = "2010-02-23T15:16:17.000Z";
-        long dateTime = Utility.parseEmailDateTimeToMillis(dateString);
-        GregorianCalendar cal = new GregorianCalendar();
-        cal.setTimeInMillis(dateTime);
-        cal.setTimeZone(TimeZone.getTimeZone("GMT"));
-        assertEquals(cal.get(Calendar.YEAR), 2010);
-        assertEquals(cal.get(Calendar.MONTH), 1);  // 0 based
-        assertEquals(cal.get(Calendar.DAY_OF_MONTH), 23);
-        assertEquals(cal.get(Calendar.HOUR_OF_DAY), 16);
-        assertEquals(cal.get(Calendar.MINUTE), 16);
-        assertEquals(cal.get(Calendar.SECOND), 17);
-    }
-
-    public void testParseDateTimeToMillis(String date) {
-        // Format for calendar date strings is 20100223T160000000Z
-        String dateString = "20100223T151617000Z";
-        long dateTime = Utility.parseDateTimeToMillis(dateString);
-        GregorianCalendar cal = new GregorianCalendar();
-        cal.setTimeInMillis(dateTime);
-        cal.setTimeZone(TimeZone.getTimeZone("GMT"));
-        assertEquals(cal.get(Calendar.YEAR), 2010);
-        assertEquals(cal.get(Calendar.MONTH), 1);  // 0 based
-        assertEquals(cal.get(Calendar.DAY_OF_MONTH), 23);
-        assertEquals(cal.get(Calendar.HOUR_OF_DAY), 16);
-        assertEquals(cal.get(Calendar.MINUTE), 16);
-        assertEquals(cal.get(Calendar.SECOND), 17);
-    }
-
-    private Entity setupTestEventEntity(String organizer, String attendee, String title) {
-        // Create an Entity for an Event
-        ContentValues entityValues = new ContentValues();
-        Entity entity = new Entity(entityValues);
-
-        // Set up values for the Event
-        String location = "Meeting Location";
-
-        // Fill in times, location, title, and organizer
-        entityValues.put("DTSTAMP",
-                CalendarUtilities.convertEmailDateTimeToCalendarDateTime("2010-04-05T14:30:51Z"));
-        entityValues.put(Events.DTSTART,
-                Utility.parseEmailDateTimeToMillis("2010-04-12T18:30:00Z"));
-        entityValues.put(Events.DTEND,
-                Utility.parseEmailDateTimeToMillis("2010-04-12T19:30:00Z"));
-        entityValues.put(Events.EVENT_LOCATION, location);
-        entityValues.put(Events.TITLE, title);
-        entityValues.put(Events.ORGANIZER, organizer);
-        entityValues.put(Events.SYNC_DATA2, "31415926535");
-
-        // Add the attendee
-        ContentValues attendeeValues = new ContentValues();
-        attendeeValues.put(Attendees.ATTENDEE_RELATIONSHIP, Attendees.RELATIONSHIP_ATTENDEE);
-        attendeeValues.put(Attendees.ATTENDEE_EMAIL, attendee);
-        entity.addSubValue(Attendees.CONTENT_URI, attendeeValues);
-
-        // Add the organizer
-        ContentValues organizerValues = new ContentValues();
-        organizerValues.put(Attendees.ATTENDEE_RELATIONSHIP, Attendees.RELATIONSHIP_ORGANIZER);
-        organizerValues.put(Attendees.ATTENDEE_EMAIL, organizer);
-        entity.addSubValue(Attendees.CONTENT_URI, organizerValues);
-        return entity;
-    }
-
-    private Entity setupTestExceptionEntity(String organizer, String attendee, String title) {
-        Entity entity = setupTestEventEntity(organizer, attendee, title);
-        ContentValues entityValues = entity.getEntityValues();
-        entityValues.put(Events.ORIGINAL_SYNC_ID, 69);
-        // The exception will be on April 26th
-        entityValues.put(Events.ORIGINAL_INSTANCE_TIME,
-                Utility.parseEmailDateTimeToMillis("2010-04-26T18:30:00Z"));
-        return entity;
-    }
-
-    public void testCreateMessageForEntity_Reply() {
-        // Set up the "event"
-        String title = "Discuss Unit Tests";
-        Entity entity = setupTestEventEntity(ORGANIZER, ATTENDEE, title);
-
-        // Create a dummy account for the attendee
-        Account account = new Account();
-        account.mEmailAddress = ATTENDEE;
-
-        // The uid is required, but can be anything
-        String uid = "31415926535";
-
-        // Create the outgoing message
-        Message msg = CalendarUtilities.createMessageForEntity(mContext, entity,
-                Message.FLAG_OUTGOING_MEETING_ACCEPT, uid, account);
-
-        // First, we should have a message
-        assertNotNull(msg);
-
-        // Now check some of the fields of the message
-        assertEquals(Address.pack(new Address[] {new Address(ORGANIZER)}), msg.mTo);
-        Resources resources = getContext().getResources();
-        String accept = resources.getString(R.string.meeting_accepted, title);
-        assertEquals(accept, msg.mSubject);
-        assertNotNull(msg.mText);
-        assertTrue(msg.mText.contains(resources.getString(R.string.meeting_where, "")));
-
-        // And make sure we have an attachment
-        assertNotNull(msg.mAttachments);
-        assertEquals(1, msg.mAttachments.size());
-        Attachment att = msg.mAttachments.get(0);
-        // And that the attachment has the correct elements
-        assertEquals("invite.ics", att.mFileName);
-        assertEquals(Attachment.FLAG_ICS_ALTERNATIVE_PART,
-                att.mFlags & Attachment.FLAG_ICS_ALTERNATIVE_PART);
-        assertEquals("text/calendar; method=REPLY", att.mMimeType);
-        assertNotNull(att.mContentBytes);
-        assertEquals(att.mSize, att.mContentBytes.length);
-
-        //TODO Check the contents of the attachment using an iCalendar parser
-    }
-
-    public void testCreateMessageForEntity_Invite_AllDay() throws IOException {
-        // Set up the "event"
-        String title = "Discuss Unit Tests";
-        Entity entity = setupTestEventEntity(ORGANIZER, ATTENDEE, title);
-        ContentValues entityValues = entity.getEntityValues();
-        entityValues.put(Events.ALL_DAY, 1);
-        entityValues.put(Events.DURATION, "P1D");
-        entityValues.remove(Events.DTEND);
-
-        // Create a dummy account for the attendee
-        Account account = new Account();
-        account.mEmailAddress = ORGANIZER;
-
-        // The uid is required, but can be anything
-        String uid = "31415926535";
-
-        // Create the outgoing message
-        Message msg = CalendarUtilities.createMessageForEntity(mContext, entity,
-                Message.FLAG_OUTGOING_MEETING_INVITE, uid, account);
-
-        // First, we should have a message
-        assertNotNull(msg);
-
-        // Now check some of the fields of the message
-        assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo);
-        assertEquals(title, msg.mSubject);
-
-        // And make sure we have an attachment
-        assertNotNull(msg.mAttachments);
-        assertEquals(1, msg.mAttachments.size());
-        Attachment att = msg.mAttachments.get(0);
-        // And that the attachment has the correct elements
-        assertEquals("invite.ics", att.mFileName);
-        assertEquals(Attachment.FLAG_ICS_ALTERNATIVE_PART,
-                att.mFlags & Attachment.FLAG_ICS_ALTERNATIVE_PART);
-        assertEquals("text/calendar; method=REQUEST", att.mMimeType);
-        assertNotNull(att.mContentBytes);
-        assertEquals(att.mSize, att.mContentBytes.length);
-
-        // We'll check the contents of the ics file here
-        BlockHash vcalendar = parseIcsContent(att.mContentBytes);
-        assertNotNull(vcalendar);
-
-        // We should have a VCALENDAR with a REQUEST method
-        assertEquals("VCALENDAR", vcalendar.name);
-        assertEquals("REQUEST", vcalendar.get("METHOD"));
-
-        // We should have one block under VCALENDAR
-        assertEquals(1, vcalendar.blocks.size());
-        BlockHash vevent = vcalendar.blocks.get(0);
-        // It's a VEVENT with the following fields
-        assertEquals("VEVENT", vevent.name);
-        assertEquals("Meeting Location", vevent.get("LOCATION"));
-        assertEquals("0", vevent.get("SEQUENCE"));
-        assertEquals("Discuss Unit Tests", vevent.get("SUMMARY"));
-        assertEquals(uid, vevent.get("UID"));
-        assertEquals("MAILTO:" + ATTENDEE,
-                vevent.get("ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE"));
-
-        // These next two fields should have a date only
-        assertEquals("20100412", vevent.get("DTSTART;VALUE=DATE"));
-        assertEquals("20100413", vevent.get("DTEND;VALUE=DATE"));
-        // This should be set to TRUE for all-day events
-        assertEquals("TRUE", vevent.get("X-MICROSOFT-CDO-ALLDAYEVENT"));
-    }
-
-    public void testCreateMessageForEntity_Invite() throws IOException {
-        // Set up the "event"
-        String title = "Discuss Unit Tests";
-        Entity entity = setupTestEventEntity(ORGANIZER, ATTENDEE, title);
-
-        // Create a dummy account for the attendee
-        Account account = new Account();
-        account.mEmailAddress = ORGANIZER;
-
-        // The uid is required, but can be anything
-        String uid = "31415926535";
-
-        // Create the outgoing message
-        Message msg = CalendarUtilities.createMessageForEntity(mContext, entity,
-                Message.FLAG_OUTGOING_MEETING_INVITE, uid, account);
-
-        // First, we should have a message
-        assertNotNull(msg);
-
-        // Now check some of the fields of the message
-        assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo);
-        assertEquals(title, msg.mSubject);
-
-        // And make sure we have an attachment
-        assertNotNull(msg.mAttachments);
-        assertEquals(1, msg.mAttachments.size());
-        Attachment att = msg.mAttachments.get(0);
-        // And that the attachment has the correct elements
-        assertEquals("invite.ics", att.mFileName);
-        assertEquals(Attachment.FLAG_ICS_ALTERNATIVE_PART,
-                att.mFlags & Attachment.FLAG_ICS_ALTERNATIVE_PART);
-        assertEquals("text/calendar; method=REQUEST", att.mMimeType);
-        assertNotNull(att.mContentBytes);
-        assertEquals(att.mSize, att.mContentBytes.length);
-
-        // We'll check the contents of the ics file here
-        BlockHash vcalendar = parseIcsContent(att.mContentBytes);
-        assertNotNull(vcalendar);
-
-        // We should have a VCALENDAR with a REQUEST method
-        assertEquals("VCALENDAR", vcalendar.name);
-        assertEquals("REQUEST", vcalendar.get("METHOD"));
-
-        // We should have one block under VCALENDAR
-        assertEquals(1, vcalendar.blocks.size());
-        BlockHash vevent = vcalendar.blocks.get(0);
-        // It's a VEVENT with the following fields
-        assertEquals("VEVENT", vevent.name);
-        assertEquals("Meeting Location", vevent.get("LOCATION"));
-        assertEquals("0", vevent.get("SEQUENCE"));
-        assertEquals("Discuss Unit Tests", vevent.get("SUMMARY"));
-        assertEquals(uid, vevent.get("UID"));
-        assertEquals("MAILTO:" + ATTENDEE,
-                vevent.get("ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE"));
-
-        // These next two fields should exist (without the VALUE=DATE suffix)
-        assertNotNull(vevent.get("DTSTART"));
-        assertNotNull(vevent.get("DTEND"));
-        assertNull(vevent.get("DTSTART;VALUE=DATE"));
-        assertNull(vevent.get("DTEND;VALUE=DATE"));
-        // This shouldn't exist for this event
-        assertNull(vevent.get("X-MICROSOFT-CDO-ALLDAYEVENT"));
-    }
-
-    public void testCreateMessageForEntity_Recurring() throws IOException {
-        // Set up the "event"
-        String title = "Discuss Unit Tests";
-        Entity entity = setupTestEventEntity(ORGANIZER, ATTENDEE, title);
-        // Set up a RRULE for this event
-        entity.getEntityValues().put(Events.RRULE, "FREQ=DAILY");
-
-        // Create a dummy account for the attendee
-        Account account = new Account();
-        account.mEmailAddress = ORGANIZER;
-
-        // The uid is required, but can be anything
-        String uid = "31415926535";
-
-        // Create the outgoing message
-        Message msg = CalendarUtilities.createMessageForEntity(mContext, entity,
-                Message.FLAG_OUTGOING_MEETING_INVITE, uid, account);
-
-        // First, we should have a message
-        assertNotNull(msg);
-
-        // Now check some of the fields of the message
-        assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo);
-        assertEquals(title, msg.mSubject);
-
-        // And make sure we have an attachment
-        assertNotNull(msg.mAttachments);
-        assertEquals(1, msg.mAttachments.size());
-        Attachment att = msg.mAttachments.get(0);
-        // And that the attachment has the correct elements
-        assertEquals("invite.ics", att.mFileName);
-        assertEquals(Attachment.FLAG_ICS_ALTERNATIVE_PART,
-                att.mFlags & Attachment.FLAG_ICS_ALTERNATIVE_PART);
-        assertEquals("text/calendar; method=REQUEST", att.mMimeType);
-        assertNotNull(att.mContentBytes);
-        assertEquals(att.mSize, att.mContentBytes.length);
-
-        // We'll check the contents of the ics file here
-        BlockHash vcalendar = parseIcsContent(att.mContentBytes);
-        assertNotNull(vcalendar);
-
-        // We should have a VCALENDAR with a REQUEST method
-        assertEquals("VCALENDAR", vcalendar.name);
-        assertEquals("REQUEST", vcalendar.get("METHOD"));
-
-        // We should have two blocks under VCALENDAR (VTIMEZONE and VEVENT)
-        assertEquals(2, vcalendar.blocks.size());
-
-        // This is the time zone that should be used
-        TimeZone timeZone = TimeZone.getDefault();
-
-        BlockHash vtimezone = vcalendar.blocks.get(0);
-        // It should be a VTIMEZONE for timeZone
-        assertEquals("VTIMEZONE", vtimezone.name);
-        assertEquals(timeZone.getID(), vtimezone.get("TZID"));
-
-        BlockHash vevent = vcalendar.blocks.get(1);
-        // It's a VEVENT with the following fields
-        assertEquals("VEVENT", vevent.name);
-        assertEquals("Meeting Location", vevent.get("LOCATION"));
-        assertEquals("0", vevent.get("SEQUENCE"));
-        assertEquals("Discuss Unit Tests", vevent.get("SUMMARY"));
-        assertEquals(uid, vevent.get("UID"));
-        assertEquals("MAILTO:" + ATTENDEE,
-                vevent.get("ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE"));
-
-        // We should have DTSTART/DTEND with time zone
-        assertNotNull(vevent.get("DTSTART;TZID=" + timeZone.getID()));
-        assertNotNull(vevent.get("DTEND;TZID=" + timeZone.getID()));
-        assertNull(vevent.get("DTSTART"));
-        assertNull(vevent.get("DTEND"));
-        assertNull(vevent.get("DTSTART;VALUE=DATE"));
-        assertNull(vevent.get("DTEND;VALUE=DATE"));
-        // This shouldn't exist for this event
-        assertNull(vevent.get("X-MICROSOFT-CDO-ALLDAYEVENT"));
-    }
-
-    public void testCreateMessageForEntity_Exception_Cancel() throws IOException {
-        // Set up the "exception"...
-        String title = "Discuss Unit Tests";
-        Entity entity = setupTestExceptionEntity(ORGANIZER, ATTENDEE, title);
-        
-        ContentValues entityValues = entity.getEntityValues();
-        // Mark the Exception as dirty
-        entityValues.put(Events.DIRTY, 1);
-        // And mark it canceled
-        entityValues.put(Events.STATUS, Events.STATUS_CANCELED);
-
-        // Create a dummy account for the attendee
-        Account account = new Account();
-        account.mEmailAddress = ORGANIZER;
-
-        // The uid is required, but can be anything
-        String uid = "31415926535";
-
-        // Create the outgoing message
-        Message msg = CalendarUtilities.createMessageForEntity(mContext, entity,
-                Message.FLAG_OUTGOING_MEETING_CANCEL, uid, account);
-
-        // First, we should have a message
-        assertNotNull(msg);
-
-        // Now check some of the fields of the message
-        assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo);
-        String cancel = getContext().getResources().getString(R.string.meeting_canceled, title);
-        assertEquals(cancel, msg.mSubject);
-
-        // And make sure we have an attachment
-        assertNotNull(msg.mAttachments);
-        assertEquals(1, msg.mAttachments.size());
-        Attachment att = msg.mAttachments.get(0);
-        // And that the attachment has the correct elements
-        assertEquals("invite.ics", att.mFileName);
-        assertEquals(Attachment.FLAG_ICS_ALTERNATIVE_PART,
-                att.mFlags & Attachment.FLAG_ICS_ALTERNATIVE_PART);
-        assertEquals("text/calendar; method=CANCEL", att.mMimeType);
-        assertNotNull(att.mContentBytes);
-
-        // We'll check the contents of the ics file here
-        BlockHash vcalendar = parseIcsContent(att.mContentBytes);
-        assertNotNull(vcalendar);
-
-        // We should have a VCALENDAR with a CANCEL method
-        assertEquals("VCALENDAR", vcalendar.name);
-        assertEquals("CANCEL", vcalendar.get("METHOD"));
-
-        // This is the time zone that should be used
-        TimeZone timeZone = TimeZone.getDefault();
-
-        // We should have two blocks under VCALENDAR (VTIMEZONE and VEVENT)
-        assertEquals(2, vcalendar.blocks.size());
-
-        BlockHash vtimezone = vcalendar.blocks.get(0);
-        // It should be a VTIMEZONE for timeZone
-        assertEquals("VTIMEZONE", vtimezone.name);
-        assertEquals(timeZone.getID(), vtimezone.get("TZID"));
-
-        BlockHash vevent = vcalendar.blocks.get(1);
-        // It's a VEVENT with the following fields
-        assertEquals("VEVENT", vevent.name);
-        assertEquals("Meeting Location", vevent.get("LOCATION"));
-        assertEquals("0", vevent.get("SEQUENCE"));
-        assertEquals("Discuss Unit Tests", vevent.get("SUMMARY"));
-        assertEquals(uid, vevent.get("UID"));
-        assertEquals("MAILTO:" + ATTENDEE,
-                vevent.get("ATTENDEE;ROLE=REQ-PARTICIPANT"));
-        long originalTime = entityValues.getAsLong(Events.ORIGINAL_INSTANCE_TIME);
-        assertNotSame(0, originalTime);
-        // For an exception, RECURRENCE-ID is critical
-        assertEquals(CalendarUtilities.millisToEasDateTime(originalTime, timeZone,
-                true /*withTime*/), vevent.get("RECURRENCE-ID" + ";TZID=" + timeZone.getID()));
-    }
-
-    public void testUtcOffsetString() {
-        assertEquals(CalendarUtilities.utcOffsetString(540), "+0900");
-        assertEquals(CalendarUtilities.utcOffsetString(-480), "-0800");
-        assertEquals(CalendarUtilities.utcOffsetString(0), "+0000");
-    }
-
-    public void testFindTransitionDate() {
-        // We'll find some transitions and make sure that we're properly in or out of daylight time
-        // on either side of the transition.
-        // Use CST for testing (any other will do as well, as long as it has DST)
-        TimeZone tz = TimeZone.getTimeZone("US/Central");
-        // Confirm that this time zone uses DST
-        assertTrue(tz.useDaylightTime());
-        // Get a calendar at January 1st of the current year
-        GregorianCalendar calendar = new GregorianCalendar(tz);
-        calendar.set(CalendarUtilities.sCurrentYear, Calendar.JANUARY, 1);
-        // Get start and end times at start and end of year
-        long startTime = calendar.getTimeInMillis();
-        long endTime = startTime + (365*CalendarUtilities.DAYS);
-        // Find the first transition
-        GregorianCalendar transitionCalendar =
-            CalendarUtilities.findTransitionDate(tz, startTime, endTime, false);
-        long transitionTime = transitionCalendar.getTimeInMillis();
-        // Before should be in standard time; after in daylight time
-        Date beforeDate = new Date(transitionTime - CalendarUtilities.HOURS);
-        Date afterDate = new Date(transitionTime + CalendarUtilities.HOURS);
-        assertFalse(tz.inDaylightTime(beforeDate));
-        assertTrue(tz.inDaylightTime(afterDate));
-
-        // Find the next one...
-        transitionCalendar = CalendarUtilities.findTransitionDate(tz, transitionTime +
-                CalendarUtilities.DAYS, endTime, true);
-        transitionTime = transitionCalendar.getTimeInMillis();
-        // This time, Before should be in daylight time; after in standard time
-        beforeDate = new Date(transitionTime - CalendarUtilities.HOURS);
-        afterDate = new Date(transitionTime + CalendarUtilities.HOURS);
-        assertTrue(tz.inDaylightTime(beforeDate));
-        assertFalse(tz.inDaylightTime(afterDate));
-
-        // Kinshasa has no daylight savings time
-        tz = TimeZone.getTimeZone("Africa/Kinshasa");
-        // Confirm that there's no DST for this time zone
-        assertFalse(tz.useDaylightTime());
-        // Get a calendar at January 1st of the current year
-        calendar = new GregorianCalendar(tz);
-        calendar.set(CalendarUtilities.sCurrentYear, Calendar.JANUARY, 1);
-        // Get start and end times at start and end of year
-        startTime = calendar.getTimeInMillis();
-        endTime = startTime + (365*CalendarUtilities.DAYS);
-        // Find the first transition
-        transitionCalendar = CalendarUtilities.findTransitionDate(tz, startTime, endTime, false);
-        // There had better not be one
-        assertNull(transitionCalendar);
-    }
-
-    public void testRruleFromRecurrence() {
-        // Every Monday for 2 weeks
-        String rrule = CalendarUtilities.rruleFromRecurrence(
-                1 /*Weekly*/, 2 /*Occurrences*/, 1 /*Interval*/, 2 /*Monday*/, 0, 0, 0, null);
-        assertEquals("FREQ=WEEKLY;COUNT=2;INTERVAL=1;BYDAY=MO", rrule);
-        // Every Tuesday and Friday
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                1 /*Weekly*/, 0 /*Occurrences*/, 0 /*Interval*/, 36 /*Tue&Fri*/, 0, 0, 0, null);
-        assertEquals("FREQ=WEEKLY;BYDAY=TU,FR", rrule);
-        // The last Saturday of the month
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                1 /*Weekly*/, 0, 0, 64 /*Sat*/, 0, 5 /*Last*/, 0, null);
-        assertEquals("FREQ=WEEKLY;BYDAY=-1SA", rrule);
-        // The third Wednesday and Thursday of the month
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                1 /*Weekly*/, 0, 0, 24 /*Wed&Thu*/, 0, 3 /*3rd*/, 0, null);
-        assertEquals("FREQ=WEEKLY;BYDAY=3WE,3TH", rrule);
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                3 /*Monthly/Day*/, 0, 0, 127 /*LastDay*/, 0, 0, 0, null);
-        assertEquals("FREQ=MONTHLY;BYMONTHDAY=-1", rrule);
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                3 /*Monthly/Day*/, 0, 0, 62 /*M-F*/, 0, 5 /*Last week*/, 0, null);
-        assertEquals("FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1", rrule);
-        // The 14th of the every month
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                2 /*Monthly/Date*/, 0, 0, 0, 14 /*14th*/, 0, 0, null);
-        assertEquals("FREQ=MONTHLY;BYMONTHDAY=14", rrule);
-        // Every 31st of October
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                5 /*Yearly/Date*/, 0, 0, 0, 31 /*31st*/, 0, 10 /*October*/, null);
-        assertEquals("FREQ=YEARLY;BYMONTHDAY=31;BYMONTH=10", rrule);
-        // The first Tuesday of June
-        rrule = CalendarUtilities.rruleFromRecurrence(
-                6 /*Yearly/Month/DayOfWeek*/, 0, 0, 4 /*Tue*/, 0, 1 /*1st*/, 6 /*June*/, null);
-        assertEquals("FREQ=YEARLY;BYDAY=1TU;BYMONTH=6", rrule);
-    }
-
-    /**
-     * Given a CalendarSyncAdapter and an RRULE, serialize the RRULE via recurrentFromRrule and
-     * then parse the result.  Assert that the resulting RRULE is the same as the original.
-     * @param adapter a CalendarSyncAdapter
-     * @param rrule an RRULE string that will be tested
-     * @throws IOException
-     */
-    private void testSingleRecurrenceFromRrule(CalendarSyncAdapter adapter, String rrule)
-            throws IOException {
-        Serializer s = new Serializer();
-        CalendarUtilities.recurrenceFromRrule(rrule, 0, s);
-        s.done();
-        EasCalendarSyncParser parser = adapter.new EasCalendarSyncParser(
-                new ByteArrayInputStream(s.toByteArray()), adapter);
-        // The first element should be the outer CALENDAR_RECURRENCE tag
-        assertEquals(Tags.CALENDAR_RECURRENCE, parser.nextTag(Parser.START_DOCUMENT));
-        assertEquals(rrule, parser.recurrenceParser());
-    }
-
-    /**
-     * Round-trip test of RRULE handling; we serialize an RRULE and then parse the result; the
-     * result should be identical to the original RRULE
-     */
-    public void testRecurrenceFromRrule() throws IOException {
-        // A test sync adapter we can use throughout the test
-        CalendarSyncAdapter adapter = getTestSyncAdapter(CalendarSyncAdapter.class);
-
-        testSingleRecurrenceFromRrule(adapter, "FREQ=WEEKLY;COUNT=2;INTERVAL=1;BYDAY=MO");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=WEEKLY;BYDAY=TU,FR");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=WEEKLY;BYDAY=-1SA");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=WEEKLY;BYDAY=3WE,3TH");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=MONTHLY;BYMONTHDAY=17");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=YEARLY;BYMONTHDAY=31;BYMONTH=10");
-        testSingleRecurrenceFromRrule(adapter, "FREQ=YEARLY;BYDAY=1TU;BYMONTH=6");
-    }
-
-    /**
-     * For debugging purposes, to help keep track of parsing errors.
-     */
-    private class UnterminatedBlockException extends IOException {
-        private static final long serialVersionUID = 1L;
-        UnterminatedBlockException(String name) {
-            super(name);
-        }
-    }
-
-    /**
-     * A lightweight representation of block object containing a hash of individual values and an
-     * array of inner blocks.  The object is build by pulling elements from a BufferedReader.
-     * NOTE: Multiple values of a given field are not supported.  We'd see this with ATTENDEEs, for
-     * example, and possibly RDATEs in VTIMEZONEs without an RRULE; these cases will be handled
-     * at a later time.
-     */
-    private class BlockHash {
-        String name;
-        HashMap<String, String> hash = new HashMap<String, String>();
-        ArrayList<BlockHash> blocks = new ArrayList<BlockHash>();
-
-        BlockHash (String _name, BufferedReader reader) throws IOException {
-            name = _name;
-            String lastField = null;
-            String lastValue = null;
-            while (true) {
-                // Get a line; we're done if it's null
-                String line = reader.readLine();
-                if (line == null) {
-                    throw new UnterminatedBlockException(name);
-                }
-                int length = line.length();
-                if (length == 0) {
-                    // We shouldn't ever see an empty line
-                    throw new IllegalArgumentException();
-                }
-                // A line starting with tab is a continuation
-                if (line.charAt(0) == '\t') {
-                    // Remember the line and length
-                    lastValue = line.substring(1);
-                    // Save the concatenation of old and new values
-                    hash.put(lastField, hash.get(lastField) + lastValue);
-                    continue;
-                }
-                // Find the field delimiter
-                int pos = line.indexOf(':');
-                // If not found, or at EOL, this is a bad ics
-                if (pos < 0 || pos >= length) {
-                    throw new IllegalArgumentException();
-                }
-                // Remember the field, value, and length
-                lastField = line.substring(0, pos);
-                lastValue = line.substring(pos + 1);
-                if (lastField.equals("BEGIN")) {
-                    blocks.add(new BlockHash(lastValue, reader));
-                    continue;
-                } else if (lastField.equals("END")) {
-                    if (!lastValue.equals(name)) {
-                        throw new UnterminatedBlockException(name);
-                    }
-                    break;
-                }
-
-                // Save it away and continue
-                hash.put(lastField, lastValue);
-            }
-        }
-
-        String get(String field) {
-            return hash.get(field);
-        }
-    }
-
-    private BlockHash parseIcsContent(byte[] bytes) throws IOException {
-        BufferedReader reader = new BufferedReader(new StringReader(Utility.fromUtf8(bytes)));
-        String line = reader.readLine();
-        if (!line.equals("BEGIN:VCALENDAR")) {
-            throw new IllegalArgumentException();
-        }
-        return new BlockHash("VCALENDAR", reader);
-    }
-
-    public void testBuildMessageTextFromEntityValues() {
-        // Set up a test event
-        String title = "Event Title";
-        Entity entity = setupTestEventEntity(ORGANIZER, ATTENDEE, title);
-        ContentValues entityValues = entity.getEntityValues();
-
-        // Save this away; we'll use it a few times below
-        Resources resources = mContext.getResources();
-        Date date = new Date(entityValues.getAsLong(Events.DTSTART));
-        String dateTimeString = DateFormat.getDateTimeInstance().format(date);
-
-        // Get the text for this message
-        StringBuilder sb = new StringBuilder();
-        CalendarUtilities.buildMessageTextFromEntityValues(mContext, entityValues, sb);
-        String text = sb.toString();
-        // We'll just check the when and where
-        assertTrue(text.contains(resources.getString(R.string.meeting_when, dateTimeString)));
-        String location = entityValues.getAsString(Events.EVENT_LOCATION);
-        assertTrue(text.contains(resources.getString(R.string.meeting_where, location)));
-
-        // Make this event recurring
-        entity.getEntityValues().put(Events.RRULE, "FREQ=WEEKLY;BYDAY=MO");
-        sb = new StringBuilder();
-        CalendarUtilities.buildMessageTextFromEntityValues(mContext, entityValues, sb);
-        text = sb.toString();
-        assertTrue(text.contains(resources.getString(R.string.meeting_recurring, dateTimeString)));
-    }
-
-    /**
-     * Sanity test for time zone generation.  Most important, make sure that we can run through
-     * all of the time zones without generating an exception.  Second, make sure that we're finding
-     * rules for at least 90% of time zones that use daylight time (empirically, it's more like
-     * 95%).  Log those without rules.
-     * @throws IOException
-     */
-    public void testTimeZoneToVTimezone() throws IOException {
-        SimpleIcsWriter writer = new SimpleIcsWriter();
-        int rule = 0;
-        int nodst = 0;
-        int norule = 0;
-        ArrayList<String> norulelist = new ArrayList<String>();
-        for (String tzs: TimeZone.getAvailableIDs()) {
-            TimeZone tz = TimeZone.getTimeZone(tzs);
-            writer = new SimpleIcsWriter();
-            CalendarUtilities.timeZoneToVTimezone(tz, writer);
-            String vc = writer.toString();
-            boolean hasRule = vc.indexOf("RRULE") > 0;
-            if (hasRule) {
-                rule++;
-            } else if (tz.useDaylightTime()) {
-                norule++;
-                norulelist.add(tz.getID());
-            } else {
-                nodst++;
-            }
-        }
-        Log.d("TimeZoneGeneration",
-                "Rule: " + rule + ", No DST: " + nodst + ", No rule: " + norule);
-        for (String nr: norulelist) {
-            Log.d("TimeZoneGeneration", "No rule: " + nr);
-        }
-        // This is an empirical sanity test; we shouldn't have too many time zones with DST and
-        // without a rule.
-        assertTrue(norule < rule/8);
-    }
-
-    public void testGetUidFromGlobalObjId() {
-        // This is a "foreign" uid (from some vCalendar client)
-        String globalObjId = "BAAAAIIA4AB0xbcQGoLgCAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAA" +
-                "HZDYWwtVWlkAQAAADI3NjU1NmRkLTg1MzAtNGZiZS1iMzE0LThiM2JlYTYwMjE0OQA=";
-        String uid = CalendarUtilities.getUidFromGlobalObjId(globalObjId);
-        assertEquals(uid, "276556dd-8530-4fbe-b314-8b3bea602149");
-        // This is a native EAS uid
-        globalObjId =
-            "BAAAAIIA4AB0xbcQGoLgCAAAAADACTu7KbPKAQAAAAAAAAAAEAAAAObgsG6HVt1Fmy+7GlLbGhY=";
-        uid = CalendarUtilities.getUidFromGlobalObjId(globalObjId);
-        assertEquals(uid, "040000008200E00074C5B7101A82E00800000000C0093BBB29B3CA" +
-                "01000000000000000010000000E6E0B06E8756DD459B2FBB1A52DB1A16");
-    }
-
-    public void testSelfAttendeeStatusFromBusyStatus() {
-        assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED,
-                CalendarUtilities.attendeeStatusFromBusyStatus(
-                        CalendarUtilities.BUSY_STATUS_BUSY));
-        assertEquals(Attendees.ATTENDEE_STATUS_TENTATIVE,
-                CalendarUtilities.attendeeStatusFromBusyStatus(
-                        CalendarUtilities.BUSY_STATUS_TENTATIVE));
-        assertEquals(Attendees.ATTENDEE_STATUS_NONE,
-                CalendarUtilities.attendeeStatusFromBusyStatus(
-                        CalendarUtilities.BUSY_STATUS_FREE));
-        assertEquals(Attendees.ATTENDEE_STATUS_NONE,
-                CalendarUtilities.attendeeStatusFromBusyStatus(
-                        CalendarUtilities.BUSY_STATUS_OUT_OF_OFFICE));
-    }
-
-    public void testBusyStatusFromSelfStatus() {
-        assertEquals(CalendarUtilities.BUSY_STATUS_FREE,
-                CalendarUtilities.busyStatusFromAttendeeStatus(
-                        Attendees.ATTENDEE_STATUS_DECLINED));
-        assertEquals(CalendarUtilities.BUSY_STATUS_FREE,
-                CalendarUtilities.busyStatusFromAttendeeStatus(
-                        Attendees.ATTENDEE_STATUS_NONE));
-        assertEquals(CalendarUtilities.BUSY_STATUS_FREE,
-                CalendarUtilities.busyStatusFromAttendeeStatus(
-                        Attendees.ATTENDEE_STATUS_INVITED));
-        assertEquals(CalendarUtilities.BUSY_STATUS_TENTATIVE,
-                CalendarUtilities.busyStatusFromAttendeeStatus(
-                        Attendees.ATTENDEE_STATUS_TENTATIVE));
-        assertEquals(CalendarUtilities.BUSY_STATUS_BUSY,
-                CalendarUtilities.busyStatusFromAttendeeStatus(
-                        Attendees.ATTENDEE_STATUS_ACCEPTED));
-    }
-
-    public void testGetUtcAllDayCalendarTime() {
-        GregorianCalendar correctUtc = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        correctUtc.set(2011, 2, 10, 0, 0, 0);
-        long correctUtcTime = correctUtc.getTimeInMillis();
-
-        TimeZone localTimeZone = TimeZone.getTimeZone("GMT-0700");
-        GregorianCalendar localCalendar = new GregorianCalendar(localTimeZone);
-        localCalendar.set(2011, 2, 10, 12, 23, 34);
-        long localTimeMillis = localCalendar.getTimeInMillis();
-        long convertedUtcTime =
-            CalendarUtilities.getUtcAllDayCalendarTime(localTimeMillis, localTimeZone);
-        // Milliseconds aren't zeroed out and may not be the same
-        assertEquals(convertedUtcTime/1000, correctUtcTime/1000);
-
-        localTimeZone = TimeZone.getTimeZone("GMT+0700");
-        localCalendar = new GregorianCalendar(localTimeZone);
-        localCalendar.set(2011, 2, 10, 12, 23, 34);
-        localTimeMillis = localCalendar.getTimeInMillis();
-        convertedUtcTime =
-            CalendarUtilities.getUtcAllDayCalendarTime(localTimeMillis, localTimeZone);
-        assertEquals(convertedUtcTime/1000, correctUtcTime/1000);
-    }
-
-    public void testGetLocalAllDayCalendarTime() {
-        TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
-        TimeZone localTimeZone = TimeZone.getTimeZone("GMT-0700");
-        GregorianCalendar correctLocal = new GregorianCalendar(localTimeZone);
-        correctLocal.set(2011, 2, 10, 0, 0, 0);
-        long correctLocalTime = correctLocal.getTimeInMillis();
-
-        GregorianCalendar utcCalendar = new GregorianCalendar(utcTimeZone);
-        utcCalendar.set(2011, 2, 10, 12, 23, 34);
-        long utcTimeMillis = utcCalendar.getTimeInMillis();
-        long convertedLocalTime =
-            CalendarUtilities.getLocalAllDayCalendarTime(utcTimeMillis, localTimeZone);
-        // Milliseconds aren't zeroed out and may not be the same
-        assertEquals(convertedLocalTime/1000, correctLocalTime/1000);
-
-        localTimeZone = TimeZone.getTimeZone("GMT+0700");
-        correctLocal = new GregorianCalendar(localTimeZone);
-        correctLocal.set(2011, 2, 10, 0, 0, 0);
-        correctLocalTime = correctLocal.getTimeInMillis();
-
-        utcCalendar = new GregorianCalendar(utcTimeZone);
-        utcCalendar.set(2011, 2, 10, 12, 23, 34);
-        utcTimeMillis = utcCalendar.getTimeInMillis();
-        convertedLocalTime =
-            CalendarUtilities.getLocalAllDayCalendarTime(utcTimeMillis, localTimeZone);
-        // Milliseconds aren't zeroed out and may not be the same
-        assertEquals(convertedLocalTime/1000, correctLocalTime/1000);
-    }
-
-    public void testGetIntegerValueAsBoolean() {
-        ContentValues cv = new ContentValues();
-        cv.put("A", 1);
-        cv.put("B", 69);
-        cv.put("C", 0);
-        assertTrue(CalendarUtilities.getIntegerValueAsBoolean(cv, "A"));
-        assertTrue(CalendarUtilities.getIntegerValueAsBoolean(cv, "B"));
-        assertFalse(CalendarUtilities.getIntegerValueAsBoolean(cv, "C"));
-        assertFalse(CalendarUtilities.getIntegerValueAsBoolean(cv, "D"));
-    }
-}
-
-    // TODO Planned unit tests
-    // findNextTransition
-    // recurrenceFromRrule
-    // timeZoneToTziStringImpl
-    // getDSTCalendars
-    // millisToVCalendarTime
-    // millisToEasDateTime
-    // getTrueTransitionMinute
-    // getTrueTransitionHour
-

diff --git a/exchange2/tests/src/com/android/exchange/utility/ExchangeTestCase.java b/exchange2/tests/src/com/android/exchange/utility/ExchangeTestCase.java
deleted file mode 100644
index 86ea0c5..0000000
--- a/exchange2/tests/src/com/android/exchange/utility/ExchangeTestCase.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.utility;
-
-import com.android.emailcommon.provider.Account;
-import com.android.exchange.provider.EmailContentSetupUtils;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-import java.util.ArrayList;
-
-public abstract class ExchangeTestCase extends AndroidTestCase {
-    private final ArrayList<Long> mCreatedAccountIds = new ArrayList<Long>();
-    protected Context mProviderContext;
-    
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
-        // Could use MockContext here if we switch over
-        mProviderContext = mContext;
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-        ContentResolver resolver = mProviderContext.getContentResolver();
-        for (Long accountId: mCreatedAccountIds) {
-            resolver.delete(ContentUris.withAppendedId(Account.CONTENT_URI, accountId), null,
-                    null);
-        }
-    }
-
-    /**
-     * Add an account to our list of test accounts; we'll delete it automatically in tearDown()
-     * @param account the account to be added to our list of test accounts
-     */
-    protected void addTestAccount(Account account) {
-        if (account.mId > 0) {
-            mCreatedAccountIds.add(account.mId);
-        }
-    }
-    
-    /**
-     * Create a test account that will be automatically deleted when the test is finished
-     * @param name the name of the account
-     * @param saveIt whether or not to save the account in EmailProvider
-     * @return the account created
-     */
-    protected Account setupTestAccount(String name, boolean saveIt) {
-        Account account = EmailContentSetupUtils.setupAccount(name, saveIt, mProviderContext);
-        addTestAccount(account);
-        return account;
-    }
-}

diff --git a/exchange2/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java b/exchange2/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
deleted file mode 100644
index 94c53b7..0000000
--- a/exchange2/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/* Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.exchange.utility;
-
-import com.android.emailcommon.utility.Utility;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.TestCase;
-
-/**
- * Test for {@link SimpleIcsWriter}.
- * You can run this entire test case with:
- *   runtest -c com.android.exchange.utility.SimpleIcsWriterTests exchange
- */
-@SmallTest
-public class SimpleIcsWriterTests extends TestCase {
-    private static final String CRLF = "\r\n";
-    private static final String UTF8_1_BYTE = "a";
-    private static final String UTF8_2_BYTES = "\u00A2";
-    private static final String UTF8_3_BYTES = "\u20AC";
-    private static final String UTF8_4_BYTES = "\uD852\uDF62";
-
-    /**
-     * Test for {@link SimpleIcsWriter#writeTag}.  It also covers {@link SimpleIcsWriter#getBytes()}
-     * and {@link SimpleIcsWriter#escapeTextValue}.
-     */
-    public void testWriteTag() {
-        final SimpleIcsWriter ics = new SimpleIcsWriter();
-        ics.writeTag("TAG1", null);
-        ics.writeTag("TAG2", "");
-        ics.writeTag("TAG3", "xyz");
-        ics.writeTag("SUMMARY", "TEST-TEST,;\r\n\\TEST");
-        ics.writeTag("SUMMARY2", "TEST-TEST,;\r\n\\TEST");
-        final String actual = Utility.fromUtf8(ics.getBytes());
-
-        assertEquals(
-                "TAG3:xyz" + CRLF +
-                "SUMMARY:TEST-TEST\\,\\;\\n\\\\TEST" + CRLF + // escaped
-                "SUMMARY2:TEST-TEST,;\r\n\\TEST" + CRLF // not escaped
-                , actual);
-    }
-
-    /**
-     * Verify that: We're folding lines correctly, and we're not splitting up a UTF-8 character.
-     */
-    public void testWriteLine() {
-        for (String last : new String[] {UTF8_1_BYTE, UTF8_2_BYTES, UTF8_3_BYTES, UTF8_4_BYTES}) {
-            for (int i = 70; i < 160; i++) {
-                String input = stringOfLength(i) + last;
-                checkWriteLine(input);
-            }
-        }
-    }
-
-    /**
-     * @return a String of {@code length} bytes in UTF-8.
-     */
-    private static String stringOfLength(int length) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < length; i++) {
-            sb.append('0' +(i % 10));
-        }
-        return sb.toString();
-    }
-
-    private void checkWriteLine(String input) {
-        final SimpleIcsWriter ics = new SimpleIcsWriter();
-        ics.writeLine(input);
-        final byte[] bytes = ics.getBytes();
-
-        // Verify that no lines are longer than 75 bytes.
-        int numBytes = 0;
-        for (byte b : bytes) {
-            if (b == '\r') {
-                continue; // ignore
-            }
-            if (b == '\n') {
-                assertTrue("input=" + input, numBytes <= 75);
-                numBytes = 0;
-                continue;
-            }
-            numBytes++;
-        }
-        assertTrue("input=" + input, numBytes <= 75);
-
-        // If we're splitting up a UTF-8 character, fromUtf8() won't restore it correctly.
-        // If it becomes the same as input, we're doing the right thing.
-        final String actual = Utility.fromUtf8(bytes);
-        final String unfolded = actual.replace("\r\n\t", "");
-        assertEquals("input=" + input, input + "\r\n", unfolded);
-    }
-
-    public void testQuoteParamValue() {
-        assertNull(SimpleIcsWriter.quoteParamValue(null));
-        assertEquals("\"\"", SimpleIcsWriter.quoteParamValue(""));
-        assertEquals("\"a\"", SimpleIcsWriter.quoteParamValue("a"));
-        assertEquals("\"''\"", SimpleIcsWriter.quoteParamValue("\"'"));
-        assertEquals("\"abc\"", SimpleIcsWriter.quoteParamValue("abc"));
-        assertEquals("\"a'b'c\"", SimpleIcsWriter.quoteParamValue("a\"b\"c"));
-    }
-}

diff --git a/exchange2/proguard.flags b/proguard.flags
similarity index 100%
rename from exchange2/proguard.flags
rename to proguard.flags


diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1716e35..7146543 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -195,4 +195,7 @@
     <string name="account_setup_options_mail_window_1month">One month</string>
     <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
     <string name="account_setup_options_mail_window_all">All</string>
+
+    <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
+    <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
 </resources>

diff --git a/res/xml/syncadapter_calendar.xml b/res/xml/syncadapter_calendar.xml
index a6c0fc6..75a2286 100644
--- a/res/xml/syncadapter_calendar.xml
+++ b/res/xml/syncadapter_calendar.xml

@@ -22,5 +22,6 @@
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="com.android.calendar"
-    android:accountType="com.android.exchange"
+    android:accountType="@string/account_manager_type_exchange"
+    android:allowParallelSyncs="true"
 />

diff --git a/res/xml/syncadapter_contacts.xml b/res/xml/syncadapter_contacts.xml
index 4691aee..50c931e 100644
--- a/res/xml/syncadapter_contacts.xml
+++ b/res/xml/syncadapter_contacts.xml

@@ -22,5 +22,6 @@
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="com.android.contacts"
-    android:accountType="com.android.exchange"
+    android:accountType="@string/account_manager_type_exchange"
+    android:allowParallelSyncs="true"
 />

diff --git a/res/xml/syncadapter_email.xml b/res/xml/syncadapter_email.xml
index c7ca850..4b4c2da 100644
--- a/res/xml/syncadapter_email.xml
+++ b/res/xml/syncadapter_email.xml

@@ -21,7 +21,8 @@
 <!-- for the SyncAdapter. -->
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.email.provider"
-    android:accountType="com.android.exchange"
+    android:contentAuthority="@string/authority_email_provider"
+    android:accountType="@string/account_manager_type_exchange"
+    android:allowParallelSyncs="true"
     android:supportsUploading="false"
 />

diff --git a/exchange2/src/com/android/exchange/CalendarSyncEnabler.java b/src/com/android/exchange/CalendarSyncEnabler.java
similarity index 94%
rename from exchange2/src/com/android/exchange/CalendarSyncEnabler.java
rename to src/com/android/exchange/CalendarSyncEnabler.java
index 5989614..ce0addd 100644
--- a/exchange2/src/com/android/exchange/CalendarSyncEnabler.java
+++ b/src/com/android/exchange/CalendarSyncEnabler.java

@@ -17,6 +17,7 @@
 package com.android.exchange;
 
 import com.android.emailcommon.Logging;
+import com.android.mail.utils.LogUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -28,7 +29,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.CalendarContract;
-import android.util.Log;
 
 /**
  * Utility class to enable Exchange calendar sync for all existing Exchange accounts.
@@ -70,7 +70,7 @@
                 .getAccountsByType(Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
         for (Account account : exchangeAccounts) {
             final String emailAddress = account.name;
-            Log.i(Logging.LOG_TAG, "Enabling Exchange calendar sync for " + emailAddress);
+            LogUtils.i(Logging.LOG_TAG, "Enabling Exchange calendar sync for " + emailAddress);
 
             ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1);
             ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, true);
@@ -93,6 +93,7 @@
      * @param emailAddresses space delimited list of email addresses of Exchange accounts.  It'll
      *     be shown on the notification.
      */
+    @SuppressWarnings("deprecation")
     /* package for testing */ void showNotificationForTest(String emailAddresses) {
         // Launch Calendar app when clicked.
         PendingIntent launchCalendarPendingIntent = PendingIntent.getActivity(mContext, 0,
@@ -110,7 +111,7 @@
     }
 
     /** @return {@link Intent} to launch the Calendar app. */
-    private Intent createLaunchCalendarIntent() {
+    private static Intent createLaunchCalendarIntent() {
         return new Intent(Intent.ACTION_VIEW, Uri.parse("content://com.android.calendar/time"));
     }
 }

diff --git a/exchange2/src/com/android/exchange/CommandStatusException.java b/src/com/android/exchange/CommandStatusException.java
similarity index 98%
rename from exchange2/src/com/android/exchange/CommandStatusException.java
rename to src/com/android/exchange/CommandStatusException.java
index 80b405a..53f3ecd 100644
--- a/exchange2/src/com/android/exchange/CommandStatusException.java
+++ b/src/com/android/exchange/CommandStatusException.java

@@ -32,7 +32,6 @@
     public final String mItemId;
 
     public static class CommandStatus {
-        private static final long serialVersionUID = 1L;
 
         // Fatal user/provisioning issues (put on security hold)
         public static final int USER_DISABLED_FOR_SYNC = 126;

diff --git a/exchange2/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
similarity index 76%
rename from exchange2/src/com/android/exchange/Eas.java
rename to src/com/android/exchange/Eas.java
index 9789f43..7f9997f 100644
--- a/exchange2/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java

@@ -17,16 +17,19 @@
 
 package com.android.exchange;
 
-import android.util.Log;
-
+import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.service.EmailServiceProxy;
-import com.android.emailcommon.service.SyncWindow;
+import com.android.mail.utils.LogUtils;
 
 /**
  * Constants used throughout the EAS implementation are stored here.
  *
  */
 public class Eas {
+
+    // For logging.
+    public static final String LOG_TAG = "EAS";
+
     // For debugging
     public static boolean WAIT_DEBUG = false;   // DO NOT CHECK IN WITH THIS SET TO TRUE
     public static boolean DEBUG = false;         // DO NOT CHECK IN WITH THIS SET TO TRUE
@@ -52,7 +55,11 @@
     public static final double SUPPORTED_PROTOCOL_EX2010_SP1_DOUBLE = 14.1;
     public static final String DEFAULT_PROTOCOL_VERSION = SUPPORTED_PROTOCOL_EX2003;
 
-    public static final String EXCHANGE_ACCOUNT_MANAGER_TYPE = "com.android.exchange";
+    public static final String EXCHANGE_ACCOUNT_MANAGER_TYPE =
+            com.android.exchange.Configuration.EXCHANGE_ACCOUNT_MANAGER_TYPE;
+    public static final String PROTOCOL = com.android.exchange.Configuration.EXCHANGE_PROTOCOL;
+    public static final String EXCHANGE_SERVICE_INTENT_ACTION =
+            com.android.exchange.Configuration.EXCHANGE_SERVICE_INTENT_ACTION;
 
     // From EAS spec
     //                Mail Cal
@@ -65,14 +72,13 @@
     // 6 3 months ago No   Yes
     // 7 6 months ago No   Yes
 
-    public static final String FILTER_AUTO =  Integer.toString(SyncWindow.SYNC_WINDOW_AUTO);
     // TODO Rationalize this with SYNC_WINDOW_ALL
     public static final String FILTER_ALL = "0";
-    public static final String FILTER_1_DAY = Integer.toString(SyncWindow.SYNC_WINDOW_1_DAY);
-    public static final String FILTER_3_DAYS =  Integer.toString(SyncWindow.SYNC_WINDOW_3_DAYS);
-    public static final String FILTER_1_WEEK =  Integer.toString(SyncWindow.SYNC_WINDOW_1_WEEK);
-    public static final String FILTER_2_WEEKS =  Integer.toString(SyncWindow.SYNC_WINDOW_2_WEEKS);
-    public static final String FILTER_1_MONTH =  Integer.toString(SyncWindow.SYNC_WINDOW_1_MONTH);
+    public static final String FILTER_1_DAY = "1";
+    public static final String FILTER_3_DAYS =  "2";
+    public static final String FILTER_1_WEEK =  "3";
+    public static final String FILTER_2_WEEKS =  "4";
+    public static final String FILTER_1_MONTH =  "5";
     public static final String FILTER_3_MONTHS = "6";
     public static final String FILTER_6_MONTHS = "7";
 
@@ -101,7 +107,7 @@
             if (FILE_LOG || PARSER_LOG) {
                 USER_LOG = true;
             }
-            Log.d("Eas Debug", "Logging: " + (USER_LOG ? "User " : "") +
+            LogUtils.d("Eas Debug", "Logging: " + (USER_LOG ? "User " : "") +
                     (PARSER_LOG ? "Parser " : "") + (FILE_LOG ? "File" : ""));
         }
     }
@@ -120,4 +126,21 @@
         }
         throw new IllegalArgumentException("illegal protocol version");
     }
+
+    /**
+     * Gets the Exchange folder class for a mailbox type (PIM collections have different values
+     * from email), needed when forming the request.
+     * @param mailboxType The type of the mailbox we're interested in, from {@link Mailbox}.
+     * @return The folder class for the mailbox we're interested in.
+     */
+    public static String getFolderClass(final int mailboxType) {
+        switch (mailboxType) {
+            case Mailbox.TYPE_CALENDAR:
+                return "Calendar";
+            case Mailbox.TYPE_CONTACTS:
+                return "Contacts";
+            default:
+                return "Email";
+        }
+    }
 }

diff --git a/exchange2/src/com/android/exchange/EasAccountService.java b/src/com/android/exchange/EasAccountService.java
similarity index 91%
rename from exchange2/src/com/android/exchange/EasAccountService.java
rename to src/com/android/exchange/EasAccountService.java
index 863e0d6..f5710b2 100644
--- a/exchange2/src/com/android/exchange/EasAccountService.java
+++ b/src/com/android/exchange/EasAccountService.java

@@ -22,12 +22,11 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.TrafficStats;
-import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.CalendarContract;
 import android.provider.ContactsContract;
 import android.text.TextUtils;
-import android.util.Log;
+import android.text.format.DateUtils;
 
 import com.android.emailcommon.TrafficFlags;
 import com.android.emailcommon.mail.MessagingException;
@@ -38,9 +37,9 @@
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
 import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.MailboxUtilities;
 import com.android.emailcommon.provider.Policy;
 import com.android.emailcommon.provider.ProviderUnavailableException;
-import com.android.emailcommon.service.EmailServiceStatus;
 import com.android.emailcommon.service.PolicyServiceProxy;
 import com.android.exchange.CommandStatusException.CommandStatus;
 import com.android.exchange.adapter.AccountSyncAdapter;
@@ -49,7 +48,7 @@
 import com.android.exchange.adapter.PingParser;
 import com.android.exchange.adapter.Serializer;
 import com.android.exchange.adapter.Tags;
-import com.android.exchange.provider.MailboxUtilities;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import org.apache.http.Header;
@@ -78,6 +77,10 @@
         '=' + Mailbox.CHECK_INTERVAL_PUSH_HOLD;
     private static final String WHERE_ACCOUNT_KEY_AND_SERVER_ID =
         MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.SERVER_ID + "=?";
+    protected static final String WHERE_IN_ACCOUNT_AND_PUSHABLE =
+            MailboxColumns.ACCOUNT_KEY + "=? and type in (" + Mailbox.TYPE_INBOX + ','
+            + Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + ',' + Mailbox.TYPE_CONTACTS + ','
+            + Mailbox.TYPE_CALENDAR + ')';
 
     /**
      * We start with an 8 minute timeout, and increase/decrease by 3 minutes at a time.  There's
@@ -108,9 +111,9 @@
     // The amount of time the account mailbox will sleep if there are no pingable mailboxes
     // This could happen if the sync time is set to "never"; we always want to check in from time
     // to time, however, for folder list/policy changes
-    static private final int ACCOUNT_MAILBOX_SLEEP_TIME = 20*MINUTES;
-    static private final String ACCOUNT_MAILBOX_SLEEP_TEXT =
-        "Account mailbox sleeping for " + (ACCOUNT_MAILBOX_SLEEP_TIME / MINUTES) + "m";
+    static private final int ACCOUNT_MAILBOX_SLEEP_TIME = (int)(20 * DateUtils.MINUTE_IN_MILLIS);
+    static private final String ACCOUNT_MAILBOX_SLEEP_TEXT = "Account mailbox sleeping for " +
+            (ACCOUNT_MAILBOX_SLEEP_TIME / DateUtils.MINUTE_IN_MILLIS) + "m";
 
     // Our heartbeat when we are waiting for ping boxes to be ready
     /*package*/ int mPingForceHeartbeat = 2*PING_MINUTES;
@@ -185,7 +188,7 @@
                 ExchangeService.kick("sync finished");
             }
         } catch (ProviderUnavailableException e) {
-            Log.e(TAG, "EmailProvider unavailable; sync ended prematurely");
+            LogUtils.e(TAG, "EmailProvider unavailable; sync ended prematurely");
         }
     }
 
@@ -219,13 +222,6 @@
         MailboxUtilities.checkMailboxConsistency(mContext, mAccount.mId);
         // Initialize exit status to success
         try {
-            try {
-                ExchangeService.callback()
-                    .syncMailboxListStatus(mAccount.mId, EmailServiceStatus.IN_PROGRESS, 0);
-            } catch (RemoteException e1) {
-                // Don't care if this fails
-            }
-
             if (mAccount.mSyncKey == null) {
                 mAccount.mSyncKey = "0";
                 userLog("Account syncKey INIT to 0");
@@ -251,7 +247,7 @@
             // Determine our protocol version, if we haven't already and save it in the Account
             // Also re-check protocol version at least once a day (in case of upgrade)
             if (mAccount.mProtocolVersion == null || firstSync ||
-                   ((System.currentTimeMillis() - mMailbox.mSyncTime) > DAYS)) {
+                   ((System.currentTimeMillis() - mMailbox.mSyncTime) > DateUtils.DAY_IN_MILLIS)) {
                 userLog("Determine EAS protocol version");
                 EasResponse resp = sendHttpClientOptions();
                 try {
@@ -288,6 +284,11 @@
                      } else if (code == EAS_REDIRECT_CODE && canHandleAccountMailboxRedirect(resp)) {
                         // Cause this to re-run
                         throw new IOException("Will retry after a brief hold...");
+                     } else if (resp.isProvisionError()) {
+                         throw new CommandStatusException(CommandStatus.NEEDS_PROVISIONING);
+                     } else if (resp.isAuthError()) {
+                         mExitStatus = EasSyncService.EXIT_LOGIN_FAILURE;
+                         return;
                      } else {
                         errorLog("OPTIONS command failed; throwing IOException");
                         throw new IOException();
@@ -302,7 +303,7 @@
                 cv.clear();
                 cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PUSH);
                 if (mContentResolver.update(Mailbox.CONTENT_URI, cv,
-                        ExchangeService.WHERE_IN_ACCOUNT_AND_PUSHABLE,
+                        WHERE_IN_ACCOUNT_AND_PUSHABLE,
                         new String[] {Long.toString(mAccount.mId)}) > 0) {
                     userLog("Push account; set pushable boxes to push...");
                 }
@@ -336,9 +337,9 @@
                                 continue;
                             }
                         }
-                    } else if (EasResponse.isProvisionError(code)) {
+                    } else if (resp.isProvisionError()) {
                         throw new CommandStatusException(CommandStatus.NEEDS_PROVISIONING);
-                    } else if (EasResponse.isAuthError(code)) {
+                    } else if (resp.isAuthError()) {
                         mExitStatus = EasSyncService.EXIT_LOGIN_FAILURE;
                         return;
                     } else if (code == EAS_REDIRECT_CODE && canHandleAccountMailboxRedirect(resp)) {
@@ -360,15 +361,6 @@
                     userLog("Set push/hold boxes to push...");
                 }
 
-                try {
-                    ExchangeService.callback()
-                        .syncMailboxListStatus(mAccount.mId,
-                                exitStatusToServiceStatus(mExitStatus),
-                                0);
-                } catch (RemoteException e1) {
-                    // Don't care if this fails
-                }
-
                 // Before each run of the pingLoop, if this Account has a PolicySet, make sure it's
                 // active; otherwise, clear out the key/flag.  This should cause a provisioning
                 // error on the next POST, and start the security sequence over again
@@ -410,32 +402,11 @@
                 }
             } else if (CommandStatus.isDeniedAccess(status)) {
                 mExitStatus = EasSyncService.EXIT_ACCESS_DENIED;
-                try {
-                    ExchangeService.callback().syncMailboxListStatus(mAccount.mId,
-                            EmailServiceStatus.ACCESS_DENIED, 0);
-                } catch (RemoteException e1) {
-                    // Don't care if this fails
-                }
                 return;
             } else {
                 userLog("Unexpected status: " + CommandStatus.toString(status));
                 mExitStatus = EasSyncService.EXIT_EXCEPTION;
             }
-        } catch (IOException e) {
-            // We catch this here to send the folder sync status callback
-            // A folder sync failed callback will get sent from run()
-            try {
-                if (!isStopped()) {
-                    // NOTE: The correct status is CONNECTION_ERROR, but the UI displays this, and
-                    // it's not really appropriate for EAS as this is not unexpected for a ping and
-                    // connection errors are retried in any case
-                    ExchangeService.callback()
-                        .syncMailboxListStatus(mAccount.mId, EmailServiceStatus.SUCCESS, 0);
-                }
-            } catch (RemoteException e1) {
-                // Don't care if this fails
-            }
-            throw e;
         }
     }
 
@@ -502,7 +473,7 @@
      * @param message
      * @return whether this message is likely associated with a NAT failure
      */
-    private boolean isLikelyNatFailure(String message) {
+    private static boolean isLikelyNatFailure(String message) {
         if (message == null) return false;
         if (message.contains("reset by peer")) {
             return true;
@@ -512,7 +483,7 @@
 
     private void sleep(long ms, boolean runAsleep) {
         if (runAsleep) {
-            ExchangeService.runAsleep(mMailboxId, ms+(5*SECONDS));
+            ExchangeService.runAsleep(mMailboxId, ms + (5 * DateUtils.SECOND_IN_MILLIS));
         }
         try {
             Thread.sleep(ms);
@@ -525,14 +496,13 @@
         }
     }
 
-    @Override
     protected EasResponse sendPing(byte[] bytes, int heartbeat) throws IOException {
        Thread.currentThread().setName(mAccount.mDisplayName + ": Ping");
        if (Eas.USER_LOG) {
            userLog("Send ping, timeout: " + heartbeat + "s, high: " + mPingHighWaterMark + 's');
        }
        return sendHttpClientPost(EasSyncService.PING_COMMAND, new ByteArrayEntity(bytes),
-               (heartbeat+5)*SECONDS);
+               (int)((heartbeat + 5) * DateUtils.SECOND_IN_MILLIS));
     }
 
     private void runPingLoop() throws IOException, StaleFolderListException,
@@ -540,7 +510,7 @@
         int pingHeartbeat = mPingHeartbeat;
         userLog("runPingLoop");
         // Do push for all sync services here
-        long endTime = System.currentTimeMillis() + (30*MINUTES);
+        long endTime = System.currentTimeMillis() + (30 * DateUtils.MINUTE_IN_MILLIS);
         HashMap<String, Integer> pingErrorMap = new HashMap<String, Integer>();
         ArrayList<String> readyMailboxes = new ArrayList<String>();
         ArrayList<String> notReadyMailboxes = new ArrayList<String>();
@@ -718,9 +688,10 @@
                                 ExchangeService.removeFromSyncErrorMap(mMailboxId);
                             } else {
                                 userLog("Ping returned empty result; throwing IOException");
+                                // Act as if we have an IOException (backoff, etc.)
                                 throw new IOException();
                             }
-                        } else if (EasResponse.isAuthError(code)) {
+                        } else if (resp.isAuthError()) {
                             mExitStatus = EasSyncService.EXIT_LOGIN_FAILURE;
                             userLog("Authorization error during Ping: ", code);
                             throw new IOException();
@@ -772,11 +743,11 @@
                 // In this case, there aren't any boxes that are pingable, but there are boxes
                 // waiting (for IOExceptions)
                 userLog("pingLoop waiting 60s for any pingable boxes");
-                sleep(60*SECONDS, true);
+                sleep(60 * DateUtils.SECOND_IN_MILLIS, true);
             } else if (pushCount > 0) {
                 // If we want to Ping, but can't just yet, wait a little bit
                 // TODO Change sleep to wait and use notify from ExchangeService when a sync ends
-                sleep(2*SECONDS, false);
+                sleep(2 * DateUtils.SECOND_IN_MILLIS, false);
                 pingWaitCount++;
                 //userLog("pingLoop waited 2s for: ", (pushCount - canPushCount), " box(es)");
             } else if (uninitCount > 0) {
@@ -784,10 +755,10 @@
                 // is typically a one-time case, I'm ok with trying again every 10 seconds until
                 // we're in one of the other possible states.
                 userLog("pingLoop waiting for initial sync of ", uninitCount, " box(es)");
-                sleep(10*SECONDS, true);
+                sleep(10 * DateUtils.SECOND_IN_MILLIS, true);
             } else if (inboxId == -1) {
                 // In this case, we're still syncing mailboxes, so sleep for only a short time
-                sleep(45*SECONDS, true);
+                sleep(45 * DateUtils.SECOND_IN_MILLIS, true);
             } else {
                 // We've got nothing to do, so we'll check again in 20 minutes at which time
                 // we'll update the folder list, check for policy changes and/or remote wipe, etc.
@@ -805,7 +776,7 @@
             HashMap<String, Integer> errorMap)
             throws IOException, StaleFolderListException, IllegalHeartbeatException,
                 CommandStatusException {
-        PingParser pp = new PingParser(is, this);
+        PingParser pp = new PingParser(is);
         if (pp.parse()) {
             // True indicates some mailboxes need syncing...
             // syncList has the serverId's of the mailboxes...
@@ -869,22 +840,6 @@
                 }
             }
         }
-        return pp.getSyncStatus();
-    }
-
-    /**
-     * Translate exit status code to service status code (used in callbacks)
-     * @param exitStatus the service's exit status
-     * @return the corresponding service status
-     */
-    private int exitStatusToServiceStatus(int exitStatus) {
-        switch(exitStatus) {
-            case EasSyncService.EXIT_SECURITY_FAILURE:
-                return EmailServiceStatus.SECURITY_FAILURE;
-            case EasSyncService.EXIT_LOGIN_FAILURE:
-                return EmailServiceStatus.LOGIN_FAILED;
-            default:
-                return EmailServiceStatus.SUCCESS;
-        }
+        return pp.getPingStatus();
     }
 }

diff --git a/exchange2/src/com/android/exchange/EasAuthenticationException.java b/src/com/android/exchange/EasAuthenticationException.java
similarity index 95%
rename from exchange2/src/com/android/exchange/EasAuthenticationException.java
rename to src/com/android/exchange/EasAuthenticationException.java
index f5b14b9..2e7847f 100644
--- a/exchange2/src/com/android/exchange/EasAuthenticationException.java
+++ b/src/com/android/exchange/EasAuthenticationException.java

@@ -25,7 +25,7 @@
 public class EasAuthenticationException extends IOException {
     private static final long serialVersionUID = 1L;
 
-    EasAuthenticationException() {
+    public EasAuthenticationException() {
         super();
     }
 }

diff --git a/exchange2/src/com/android/exchange/EasCertificateRequestor.java b/src/com/android/exchange/EasCertificateRequestor.java
similarity index 100%
rename from exchange2/src/com/android/exchange/EasCertificateRequestor.java
rename to src/com/android/exchange/EasCertificateRequestor.java


diff --git a/exchange2/src/com/android/exchange/EasException.java b/src/com/android/exchange/EasException.java
similarity index 100%
rename from exchange2/src/com/android/exchange/EasException.java
rename to src/com/android/exchange/EasException.java


diff --git a/exchange2/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
similarity index 87%
rename from exchange2/src/com/android/exchange/EasOutboxService.java
rename to src/com/android/exchange/EasOutboxService.java
index 9ff1ffc..0a4c233 100644
--- a/exchange2/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java

@@ -23,13 +23,13 @@
 import android.database.Cursor;
 import android.net.TrafficStats;
 import android.net.Uri;
-import android.os.RemoteException;
-import android.text.TextUtils;
+import android.text.format.DateUtils;
 
 import com.android.emailcommon.TrafficFlags;
 import com.android.emailcommon.internet.Rfc822Output;
 import com.android.emailcommon.mail.MessagingException;
 import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Attachment;
 import com.android.emailcommon.provider.EmailContent.Body;
 import com.android.emailcommon.provider.EmailContent.BodyColumns;
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
@@ -56,6 +56,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 
 public class EasOutboxService extends EasSyncService {
 
@@ -78,7 +79,7 @@
     // as to effectively "hang" sending of mail.  The standard 30 second timeout isn't long enough
     // for pictures and the like.  For now, we'll use 15 minutes, in the knowledge that any socket
     // failure would probably generate an Exception before timing out anyway
-    public static final int SEND_MAIL_TIMEOUT = 15*MINUTES;
+    public static final int SEND_MAIL_TIMEOUT = (int)(15 * DateUtils.MINUTE_IN_MILLIS);
 
     protected EasOutboxService(Context _context, Mailbox _mailbox) {
         super(_context, _mailbox);
@@ -227,37 +228,24 @@
      * original message
      */
     protected static class OriginalMessageInfo {
+        final long mRefId;
         final String mItemId;
         final String mCollectionId;
-        final String mLongId;
 
-        OriginalMessageInfo(String itemId, String collectionId, String longId) {
+        OriginalMessageInfo(long refId, String itemId, String collectionId) {
+            mRefId = refId;
             mItemId = itemId;
             mCollectionId = collectionId;
-            mLongId = longId;
-        }
-    }
-
-    private void sendCallback(long msgId, String subject, int status) {
-        try {
-            ExchangeService.callback().sendMessageStatus(msgId, subject, status, 0);
-        } catch (RemoteException e) {
-            // It's all good
         }
     }
 
     /*package*/ String generateSmartSendCmd(boolean reply, OriginalMessageInfo info) {
         StringBuilder sb = new StringBuilder();
         sb.append(reply ? "SmartReply" : "SmartForward");
-        if (!TextUtils.isEmpty(info.mLongId)) {
-            sb.append("&LongId=");
-            sb.append(Uri.encode(info.mLongId, ":"));
-        } else {
-            sb.append("&ItemId=");
-            sb.append(Uri.encode(info.mItemId, ":"));
-            sb.append("&CollectionId=");
-            sb.append(Uri.encode(info.mCollectionId, ":"));
-        }
+        sb.append("&ItemId=");
+        sb.append(Uri.encode(info.mItemId, ":"));
+        sb.append("&CollectionId=");
+        sb.append(Uri.encode(info.mCollectionId, ":"));
         return sb.toString();
     }
 
@@ -275,14 +263,14 @@
         // mailboxId of a Message
         String itemId = null;
         String collectionId = null;
-        String longId = null;
 
         // First, we need to get the id of the reply/forward message
         String[] cols = Utility.getRowColumns(context, Body.CONTENT_URI,
                 BODY_SOURCE_PROJECTION, WHERE_MESSAGE_KEY,
                 new String[] {Long.toString(msgId)});
+        long refId = 0;
         if (cols != null) {
-            long refId = Long.parseLong(cols[0]);
+            refId = Long.parseLong(cols[0]);
             // Then, we need the serverId and mailboxKey of the message
             cols = Utility.getRowColumns(context, Message.CONTENT_URI, refId,
                     SyncColumns.SERVER_ID, MessageColumns.MAILBOX_KEY,
@@ -300,8 +288,8 @@
         }
         // We need either a longId or both itemId (serverId) and collectionId (mailboxId) to process
         // a smart reply or a smart forward
-        if (longId != null || (itemId != null && collectionId != null)){
-            return new OriginalMessageInfo(itemId, collectionId, longId);
+        if (itemId != null && collectionId != null){
+            return new OriginalMessageInfo(refId, itemId, collectionId);
         }
         return null;
     }
@@ -310,7 +298,27 @@
         ContentValues cv = new ContentValues();
         cv.put(SyncColumns.SERVER_ID, SEND_FAILED);
         Message.update(mContext, Message.CONTENT_URI, msgId, cv);
-        sendCallback(msgId, null, result);
+    }
+
+    /**
+     * See if a given attachment is among an array of attachments; it is if the locations of both
+     * are the same (we're looking to see if they represent the same attachment on the server. Note
+     * that an attachment that isn't on the server (e.g. an outbound attachment picked from the
+     * gallery) won't have a location, so the result will always be false
+     *
+     * @param att the attachment to test
+     * @param atts the array of attachments to look in
+     * @return whether the test attachment is among the array of attachments
+     */
+    private static boolean amongAttachments(Attachment att, Attachment[] atts) {
+        String location = att.mLocation;
+        if (location == null) return false;
+        for (Attachment a: atts) {
+            if (location.equals(a.mLocation)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -327,8 +335,6 @@
         // authentication) rather than message-specific; returning anything else will terminate
         // the Outbox sync! Message-specific errors are marked in the messages themselves.
         int result = EmailServiceStatus.SUCCESS;
-        // Say we're starting to send this message
-        sendCallback(msgId, null, EmailServiceStatus.IN_PROGRESS);
         // Create a temporary file (this will hold the outgoing message in RFC822 (MIME) format)
         File tmpFile = File.createTempFile("eas_", "tmp", cacheDir);
         try {
@@ -357,9 +363,37 @@
                 smartSend = false;
             }
 
+            ArrayList<Attachment> requiredAtts = null;
+            if (smartSend && forward) {
+                // See if we can really smart forward (all reference attachments must be sent)
+                Attachment[] outAtts =
+                        Attachment.restoreAttachmentsWithMessageId(mContext, msg.mId);
+                Attachment[] refAtts =
+                        Attachment.restoreAttachmentsWithMessageId(mContext, referenceInfo.mRefId);
+                for (Attachment refAtt: refAtts) {
+                    // If an original attachment isn't among what's going out, we can't be "smart"
+                    if (!amongAttachments(refAtt, outAtts)) {
+                        smartSend = false;
+                        break;
+                    }
+                }
+                if (smartSend) {
+                    requiredAtts = new ArrayList<Attachment>();
+                    for (Attachment outAtt: outAtts) {
+                        // If an outgoing attachment isn't in original message, we must send it
+                        if (!amongAttachments(outAtt, refAtts)) {
+                            requiredAtts.add(outAtt);
+                        }
+                    }
+                }
+            }
+
             // Write the message to the temporary file
             FileOutputStream fileOutputStream = new FileOutputStream(tmpFile);
-            Rfc822Output.writeTo(mContext, msgId, fileOutputStream, smartSend, true);
+            // If we're using smartSend, send along our required attachments (which will be empty
+            // if the user hasn't added new ones); otherwise, null to send everything in the msg
+            Rfc822Output.writeTo(mContext, msg, fileOutputStream, smartSend, true,
+                    smartSend ? requiredAtts : null);
             fileOutputStream.close();
 
             // Sending via EAS14 is a whole 'nother kettle of fish
@@ -440,7 +474,6 @@
                         // Delete the message from the Outbox and send callback
                         mContentResolver.delete(
                                 ContentUris.withAppendedId(Message.CONTENT_URI, msgId), null, null);
-                        sendCallback(-1, msg.mSubject, EmailServiceStatus.SUCCESS);
                         break;
                     } else if (code == EasSyncService.INTERNAL_SERVER_ERROR_CODE && smartSend) {
                         // This is the retry case for EAS 12.1 and below; we'll send without "smart"
@@ -449,9 +482,9 @@
                         smartSend = false;
                     } else {
                         userLog("Message sending failed, code: " + code);
-                        if (EasResponse.isAuthError(code)) {
+                        if (resp.isAuthError()) {
                             result = EmailServiceStatus.LOGIN_FAILED;
-                        } else if (EasResponse.isProvisionError(code)) {
+                        } else if (resp.isProvisionError()) {
                             result = EmailServiceStatus.SECURITY_FAILURE;
                         }
                         sendFailed(msgId, result);
@@ -461,10 +494,6 @@
                     resp.close();
                 }
             }
-        } catch (IOException e) {
-            // We catch this just to send the callback
-            sendCallback(msgId, null, EmailServiceStatus.CONNECTION_ERROR);
-            throw e;
         } finally {
             // Clean up the temporary file
             if (tmpFile.exists()) {
@@ -540,4 +569,4 @@
             msg.save(context);
         }
     }
-}
\ No newline at end of file
+}

diff --git a/exchange2/src/com/android/exchange/EasResponse.java b/src/com/android/exchange/EasResponse.java
similarity index 67%
rename from exchange2/src/com/android/exchange/EasResponse.java
rename to src/com/android/exchange/EasResponse.java
index 174989e..5af80fd 100644
--- a/exchange2/src/com/android/exchange/EasResponse.java
+++ b/src/com/android/exchange/EasResponse.java

@@ -17,6 +17,8 @@
 
 package com.android.exchange;
 
+import android.net.Uri;
+
 import com.android.emailcommon.utility.EmailClientConnectionManager;
 
 import org.apache.http.Header;
@@ -37,19 +39,26 @@
     // MSFT's custom HTTP result code indicating the need to provision
     static private final int HTTP_NEED_PROVISIONING = 449;
 
-    final HttpResponse mResponse;
+    // Microsoft-defined HTTP response indicating a redirect to a "better" server.
+    // Why is this a 4xx instead of 3xx? Because EAS considers this a "Device misconfigured" error.
+    static private final int HTTP_REDIRECT = 451;
+
+    private final HttpResponse mResponse;
     private final HttpEntity mEntity;
     private final int mLength;
     private InputStream mInputStream;
     private boolean mClosed;
 
+    private final int mStatus;
+
     /**
      * Whether or not a certificate was requested by the server and missing.
      * If this is set, it is essentially a 403 whereby the failure was due
      */
-    private boolean mClientCertRequested = false;
+    private final boolean mClientCertRequested;
 
-    private EasResponse(HttpResponse response) {
+    private EasResponse(final HttpResponse response,
+            final EmailClientConnectionManager connManager, final long reqTime) {
         mResponse = response;
         mEntity = (response == null) ? null : mResponse.getEntity();
         if (mEntity !=  null) {
@@ -57,22 +66,51 @@
         } else {
             mLength = 0;
         }
+        int status = response.getStatusLine().getStatusCode();
+        mClientCertRequested =
+                isAuthError(status) && connManager.hasDetectedUnsatisfiedCertReq(reqTime);
+        if (mClientCertRequested) {
+            status = HttpStatus.SC_UNAUTHORIZED;
+            mClosed = true;
+        }
+        mStatus = status;
     }
 
     public static EasResponse fromHttpRequest(
             EmailClientConnectionManager connManager, HttpClient client, HttpUriRequest request)
             throws IOException {
+        final long reqTime = System.currentTimeMillis();
+        final HttpResponse response = client.execute(request);
+        return new EasResponse(response, connManager, reqTime);
+    }
 
-        long reqTime = System.currentTimeMillis();
-        HttpResponse response = client.execute(request);
-        EasResponse result = new EasResponse(response);
-        if (isAuthError(response.getStatusLine().getStatusCode())
-                && connManager.hasDetectedUnsatisfiedCertReq(reqTime)) {
-            result.mClientCertRequested = true;
-            result.mClosed = true;
-        }
+    public boolean isSuccess() {
+        return mStatus == HttpStatus.SC_OK;
+    }
 
-        return result;
+    public boolean isForbidden() {
+        return mStatus == HttpStatus.SC_FORBIDDEN;
+    }
+
+    /**
+     * @return Whether this response indicates an authentication error.
+     */
+    public boolean isAuthError() {
+        return mStatus == HttpStatus.SC_UNAUTHORIZED;
+    }
+
+    /**
+     * @return Whether this response indicates a provisioning error.
+     */
+    public boolean isProvisionError() {
+        return (mStatus == HTTP_NEED_PROVISIONING) || isForbidden();
+    }
+
+    /**
+     * @return Whether this response indicates a redirect error.
+     */
+    public boolean isRedirectError() {
+        return mStatus == HTTP_REDIRECT;
     }
 
     /**
@@ -80,17 +118,20 @@
      * @param code the HTTP code returned by the server
      * @return whether or not the code represents an authentication error
      */
-    public static boolean isAuthError(int code) {
+    private static boolean isAuthError(int code) {
         return (code == HttpStatus.SC_UNAUTHORIZED) || (code == HttpStatus.SC_FORBIDDEN);
     }
 
     /**
-     * Determine whether an HTTP code represents a provisioning error
-     * @param code the HTTP code returned by the server
-     * @return whether or not the code represents an provisioning error
+     * Read the redirect address from this response, if it's present.
+     * @return The new host address, or null if it's not there.
      */
-    public static boolean isProvisionError(int code) {
-        return (code == HTTP_NEED_PROVISIONING) || (code == HttpStatus.SC_FORBIDDEN);
+    public String getRedirectAddress() {
+        final Header locHeader = getHeader("X-MS-Location");
+        if (locHeader != null) {
+            return Uri.parse(locHeader.getValue()).getHost();
+        }
+        return null;
     }
 
     /**
@@ -128,9 +169,7 @@
     }
 
     public int getStatus() {
-        return mClientCertRequested
-                ? HttpStatus.SC_UNAUTHORIZED
-                : mResponse.getStatusLine().getStatusCode();
+        return mStatus;
     }
 
     public boolean isMissingCertificate() {

diff --git a/exchange2/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
similarity index 93%
rename from exchange2/src/com/android/exchange/EasSyncService.java
rename to src/com/android/exchange/EasSyncService.java
index 75e33ad..9257d15 100644
--- a/exchange2/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java

@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.content.Entity;
 import android.database.Cursor;
-import android.net.Proxy;
 import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.Build;
@@ -32,8 +31,8 @@
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Events;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.util.Base64;
-import android.util.Log;
 import android.util.Xml;
 
 import com.android.emailcommon.TrafficFlags;
@@ -56,6 +55,9 @@
 import com.android.emailcommon.service.PolicyServiceProxy;
 import com.android.emailcommon.utility.EmailClientConnectionManager;
 import com.android.emailcommon.utility.Utility;
+import com.android.emailsync.AbstractSyncService;
+import com.android.emailsync.PartRequest;
+import com.android.emailsync.Request;
 import com.android.exchange.CommandStatusException.CommandStatus;
 import com.android.exchange.adapter.AbstractSyncAdapter;
 import com.android.exchange.adapter.AccountSyncAdapter;
@@ -74,18 +76,17 @@
 import com.android.exchange.adapter.Tags;
 import com.android.exchange.provider.GalResult;
 import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpOptions;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.conn.params.ConnRouteParams;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
@@ -112,11 +113,11 @@
     // Command timeout is the the time allowed for reading data from an open connection before an
     // IOException is thrown.  After a small added allowance, our watchdog alarm goes off (allowing
     // us to detect a silently dropped connection).  The allowance is defined below.
-    static public final int COMMAND_TIMEOUT = 30*SECONDS;
+    static public final int COMMAND_TIMEOUT = (int)(30 * DateUtils.SECOND_IN_MILLIS);
     // Connection timeout is the time given to connect to the server before reporting an IOException
-    static private final int CONNECTION_TIMEOUT = 20*SECONDS;
+    static private final int CONNECTION_TIMEOUT = (int)(20 * DateUtils.SECOND_IN_MILLIS);
     // The extra time allowed beyond the COMMAND_TIMEOUT before which our watchdog alarm triggers
-    static private final int WATCHDOG_TIMEOUT_ALLOWANCE = 30*SECONDS;
+    static private final int WATCHDOG_TIMEOUT_ALLOWANCE = (int)(30 * DateUtils.SECOND_IN_MILLIS);
 
     static private final String AUTO_DISCOVER_SCHEMA_PREFIX =
         "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/";
@@ -130,7 +131,7 @@
 
     static public final int MESSAGE_FLAG_MOVED_MESSAGE = 1 << Message.FLAG_SYNC_ADAPTER_SHIFT;
     // The amount of time we allow for a thread to release its post lock after receiving an alert
-    static private final int POST_LOCK_TIMEOUT = 10*SECONDS;
+    static private final int POST_LOCK_TIMEOUT = (int)(10 * DateUtils.SECOND_IN_MILLIS);
 
     // The EAS protocol Provision status for "we implement all of the policies"
     static private final String PROVISION_STATUS_OK = "1";
@@ -166,10 +167,10 @@
     protected boolean mPostReset = false;
 
     // The parameters for the connection must be modified through setConnectionParameters
+    private HostAuth mHostAuth;
     private boolean mSsl = true;
     private boolean mTrustSsl = false;
     private String mClientCertAlias = null;
-    private int mPort;
 
     public ContentResolver mContentResolver;
     // Whether or not the sync service is valid (usable)
@@ -213,6 +214,16 @@
         }
     }
 
+    @Override
+    public void resetCalendarSyncKey() {
+        CalendarSyncAdapter adapter = new CalendarSyncAdapter(this);
+            try {
+                adapter.setSyncKey("0", false);
+            } catch (IOException e) {
+                // The provider can't be reached; nothing to be done
+            }
+    }
+
     /**
      * Try to wake up a sync thread that is waiting on an HttpClient POST and has waited past its
      * socket timeout without having thrown an Exception
@@ -307,14 +318,6 @@
         }
     }
 
-    @Override
-    public void addRequest(Request request) {
-        // Don't allow duplicates of requests; just refuse them
-        if (mRequestQueue.contains(request)) return;
-        // Add the request
-        super.addRequest(request);
-    }
-
     void setupProtocolVersion(EasSyncService service, Header versionHeader)
             throws MessagingException {
         // The string is a comma separated list of EAS versions in ascending order
@@ -336,13 +339,13 @@
         // If we don't support any of the servers supported versions, throw an exception here
         // This will cause validation to fail
         if (ourVersion == null) {
-            Log.w(TAG, "No supported EAS versions: " + supportedVersions);
+            LogUtils.w(TAG, "No supported EAS versions: " + supportedVersions);
             throw new MessagingException(MessagingException.PROTOCOL_VERSION_UNSUPPORTED);
         } else {
             // Debug code for testing EAS 14.0; disables support for EAS 14.1
             // "adb shell setprop log.tag.Exchange14 VERBOSE"
             if (ourVersion.equals(Eas.SUPPORTED_PROTOCOL_EX2010_SP1) &&
-                    Log.isLoggable("Exchange14", Log.VERBOSE)) {
+                    LogUtils.isLoggable("Exchange14", LogUtils.VERBOSE)) {
                 ourVersion = Eas.SUPPORTED_PROTOCOL_EX2010;
             }
             service.mProtocolVersion = ourVersion;
@@ -393,8 +396,6 @@
         try {
             svc.setConnectionParameters(ha);
             svc.mDeviceId = ExchangeService.getDeviceId(context);
-        } catch (IOException e) {
-            return null;
         } catch (CertificateException e) {
             return null;
         }
@@ -487,7 +488,7 @@
                         // For validation only, we take 403 as ACCESS_DENIED (the account isn't
                         // authorized, possibly due to device type)
                         resultCode = MessagingException.ACCESS_DENIED;
-                    } else if (EasResponse.isProvisionError(code)) {
+                    } else if (resp.isProvisionError()) {
                         // The device needs to have security policies enforced
                         throw new CommandStatusException(CommandStatus.NEEDS_PROVISIONING);
                     } else if (code == HttpStatus.SC_NOT_FOUND) {
@@ -517,7 +518,7 @@
                         }
                         userLog("Validation successful");
                     }
-                } else if (EasResponse.isAuthError(code)) {
+                } else if (resp.isAuthError()) {
                     userLog("Authentication failed");
                     resultCode = resp.isMissingCertificate()
                             ? MessagingException.CLIENT_CERTIFICATE_REQUIRED
@@ -597,7 +598,7 @@
      * @param post the HttpPost that was originally sent to the server
      * @return the HttpPost, updated with the redirect location
      */
-    private HttpPost getRedirect(HttpResponse resp, HttpPost post) {
+    private static HttpPost getRedirect(HttpResponse resp, HttpPost post) {
         Header locHeader = resp.getFirstHeader("X-MS-Location");
         if (locHeader != null) {
             String loc = locHeader.getValue();
@@ -630,7 +631,7 @@
         int code = resp.getStatus();
         // On a redirect, try the new location
         if (code == EAS_REDIRECT_CODE) {
-            post = getRedirect(resp.mResponse, post);
+            //post = getRedirect(resp.mResponse, post);
             if (post != null) {
                 userLog("Posting autodiscover to redirect: " + post.getURI());
                 return executePostWithTimeout(client, post, COMMAND_TIMEOUT);
@@ -673,14 +674,12 @@
      * Use the Exchange 2007 AutoDiscover feature to try to retrieve server information using
      * only an email address and the password
      *
-     * @param userName the user's email address
-     * @param password the user's password
+     * @param context Our {@link Context}.
      * @return a HostAuth ready to be saved in an Account or null (failure)
      */
-    public Bundle tryAutodiscover(String userName, String password) throws RemoteException {
+    public Bundle tryAutodiscover(Context context, HostAuth hostAuth) throws RemoteException {
         XmlSerializer s = Xml.newSerializer();
         ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
-        HostAuth hostAuth = new HostAuth();
         Bundle bundle = new Bundle();
         bundle.putInt(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_ERROR_CODE,
                 MessagingException.NO_ERROR);
@@ -691,7 +690,7 @@
             s.startTag(null, "Autodiscover");
             s.attribute(null, "xmlns", AUTO_DISCOVER_SCHEMA_PREFIX + "requestschema/2006");
             s.startTag(null, "Request");
-            s.startTag(null, "EMailAddress").text(userName).endTag(null, "EMailAddress");
+            s.startTag(null, "EMailAddress").text(hostAuth.mLogin).endTag(null, "EMailAddress");
             s.startTag(null, "AcceptableResponseSchema");
             s.text(AUTO_DISCOVER_SCHEMA_PREFIX + "responseschema/2006");
             s.endTag(null, "AcceptableResponseSchema");
@@ -700,23 +699,23 @@
             s.endDocument();
             String req = os.toString();
 
-            // Initialize the user name and password
-            mUserName = userName;
-            mPassword = password;
-            // Port is always 443 and SSL is used
-            mPort = 443;
-            mSsl = true;
+            // Initialize user name, password, etc.
+            mContext = context;
+            mHostAuth = hostAuth;
+            mUserName = hostAuth.mLogin;
+            mPassword = hostAuth.mPassword;
+            mSsl = hostAuth.shouldUseSsl();
 
             // Make sure the authentication string is recreated and cached
             cacheAuthUserAndBaseUriStrings();
 
             // Split out the domain name
-            int amp = userName.indexOf('@');
+            int amp = mUserName.indexOf('@');
             // The UI ensures that userName is a valid email address
             if (amp < 0) {
                 throw new RemoteException();
             }
-            String domain = userName.substring(amp + 1);
+            String domain = mUserName.substring(amp + 1);
 
             // There are up to four attempts here; the two URLs that we're supposed to try per the
             // specification, and up to one redirect for each (handled in postAutodiscover)
@@ -772,7 +771,7 @@
                                 // Note: there is no way we can auto-discover the proper client
                                 // SSL certificate to use, if one is needed.
                                 hostAuth.mPort = 443;
-                                hostAuth.mProtocol = "eas";
+                                hostAuth.mProtocol = Eas.PROTOCOL;
                                 hostAuth.mFlags =
                                     HostAuth.FLAG_SSL | HostAuth.FLAG_AUTHENTICATE;
                                 bundle.putParcelable(
@@ -860,7 +859,7 @@
                 if (name.equals("Error")) {
                     // Should parse the error
                 } else if (name.equals("Redirect")) {
-                    Log.d(TAG, "Redirect: " + parser.nextText());
+                    LogUtils.d(TAG, "Redirect: " + parser.nextText());
                 } else if (name.equals("Settings")) {
                     parseSettings(parser, hostAuth);
                 }
@@ -1074,7 +1073,7 @@
             if (status == HttpStatus.SC_OK) {
                 if (!resp.isEmpty()) {
                     InputStream is = resp.getInputStream();
-                    MoveItemsParser p = new MoveItemsParser(is, this);
+                    MoveItemsParser p = new MoveItemsParser(is);
                     p.parse();
                     int statusCode = p.getStatusCode();
                     ContentValues cv = new ContentValues();
@@ -1103,7 +1102,7 @@
                         // handled next sync
                     }
                 }
-            } else if (EasResponse.isAuthError(status)) {
+            } else if (resp.isAuthError()) {
                 throw new EasAuthenticationException();
             } else {
                 userLog("Move items request failed, code: " + status);
@@ -1138,7 +1137,7 @@
             if (status == HttpStatus.SC_OK) {
                 if (!resp.isEmpty()) {
                     InputStream is = resp.getInputStream();
-                    new MeetingResponseParser(is, this).parse();
+                    new MeetingResponseParser(is).parse();
                     String meetingInfo = msg.mMeetingInfo;
                     if (meetingInfo != null) {
                         String responseRequested = new PackedString(meetingInfo).get(
@@ -1150,7 +1149,7 @@
                     }
                     sendMeetingResponseMail(msg, req.mResponse);
                 }
-            } else if (EasResponse.isAuthError(status)) {
+            } else if (resp.isAuthError()) {
                 throw new EasAuthenticationException();
             } else {
                 userLog("Meeting response request failed, code: " + status);
@@ -1218,10 +1217,10 @@
     }
 
     protected void setConnectionParameters(HostAuth hostAuth) throws CertificateException {
+        mHostAuth = hostAuth;
         mSsl = hostAuth.shouldUseSsl();
         mTrustSsl = hostAuth.shouldTrustAllServerCerts();
         mClientCertAlias = hostAuth.mClientCertAlias;
-        mPort = hostAuth.mPort;
 
         // Register the new alias, if needed.
         if (mClientCertAlias != null) {
@@ -1233,7 +1232,7 @@
     }
 
     private EmailClientConnectionManager getClientConnectionManager() {
-        return ExchangeService.getClientConnectionManager(mSsl, mPort);
+        return ExchangeService.getClientConnectionManager(mContext, mHostAuth);
     }
 
     private HttpClient getHttpClient(int timeout) {
@@ -1242,17 +1241,6 @@
         HttpConnectionParams.setSoTimeout(params, timeout);
         HttpConnectionParams.setSocketBufferSize(params, 8192);
         HttpClient client = new DefaultHttpClient(getClientConnectionManager(), params);
-
-        if (mTrustSsl) {
-            HttpHost httpHost = Proxy.getPreferredHttpHost(mContext, "httpts://" + mHostAddress);
-            if (httpHost != null) {
-                if (Eas.USER_LOG) {
-                    userLog("Using proxy:" + httpHost.toString());
-                }
-                ConnRouteParams.setDefaultProxy(client.getParams(), httpHost);
-            }
-        }
-
         return client;
     }
 
@@ -1260,15 +1248,6 @@
         return sendHttpClientPost(cmd, new ByteArrayEntity(bytes), COMMAND_TIMEOUT);
     }
 
-    protected EasResponse sendHttpClientPost(String cmd, HttpEntity entity) throws IOException {
-        return sendHttpClientPost(cmd, entity, COMMAND_TIMEOUT);
-    }
-
-    protected EasResponse sendPing(byte[] bytes, int heartbeat) throws IOException {
-       Thread.currentThread().setName(mAccount.mDisplayName + ": Ping");
-       return sendHttpClientPost(PING_COMMAND, new ByteArrayEntity(bytes), (heartbeat+5)*SECONDS);
-    }
-
     /**
      * Convenience method for executePostWithTimeout for use other than with the Ping command
      */
@@ -1286,12 +1265,17 @@
      * @return the HttpResponse
      * @throws IOException
      */
-    protected EasResponse executePostWithTimeout(HttpClient client, HttpPost method, int timeout,
-            boolean isPingCommand) throws IOException {
+    protected EasResponse executePostWithTimeout(HttpClient client, HttpPost method,
+            final int timeout, final boolean isPingCommand) throws IOException {
+        final boolean hasWakeLock;
         synchronized(getSynchronizer()) {
+            hasWakeLock = ExchangeService.isHoldingWakeLock(mMailboxId);
+            if (isPingCommand && !hasWakeLock) {
+                LogUtils.e(TAG, "executePostWithTimeout (ping) without holding wakelock");
+            }
             mPendingPost = method;
             long alarmTime = timeout + WATCHDOG_TIMEOUT_ALLOWANCE;
-            if (isPingCommand) {
+            if (isPingCommand && hasWakeLock) {
                 ExchangeService.runAsleep(mMailboxId, alarmTime);
             } else {
                 ExchangeService.setWatchdogAlarm(mMailboxId, alarmTime);
@@ -1301,7 +1285,7 @@
             return EasResponse.fromHttpRequest(getClientConnectionManager(), client, method);
         } finally {
             synchronized(getSynchronizer()) {
-                if (isPingCommand) {
+                if (isPingCommand && hasWakeLock) {
                     ExchangeService.runAwake(mMailboxId);
                 } else {
                     ExchangeService.clearWatchdogAlarm(mMailboxId);
@@ -1487,7 +1471,7 @@
             int code = resp.getStatus();
             if (code == HttpStatus.SC_OK) {
                 InputStream is = resp.getInputStream();
-                ProvisionParser pp = new ProvisionParser(is, svc);
+                ProvisionParser pp = new ProvisionParser(svc.mContext, is);
                 if (pp.parse()) {
                     // The PolicySet in the ProvisionParser will have the requirements for all KNOWN
                     // policies.  If others are required, hasSupportablePolicySet will be false
@@ -1527,7 +1511,6 @@
      * Acknowledge that we support the policies provided by the server, and that these policies
      * are in force.
      * @param tempKey the initial (temporary) policy key sent by the server
-     * @return the final policy key, which can be used for syncing
      * @throws IOException
      */
     private static void acknowledgeRemoteWipe(EasSyncService svc, String tempKey)
@@ -1563,7 +1546,7 @@
             int code = resp.getStatus();
             if (code == HttpStatus.SC_OK) {
                 InputStream is = resp.getInputStream();
-                ProvisionParser pp = new ProvisionParser(is, svc);
+                ProvisionParser pp = new ProvisionParser(svc.mContext, is);
                 if (pp.parse()) {
                     // Return the final policy key from the ProvisionParser
                     String result = (pp.getSecuritySyncKey() == null) ? "failed" : "confirmed";
@@ -1594,7 +1577,7 @@
             int code = resp.getStatus();
             if (code == HttpStatus.SC_OK) {
                 InputStream is = resp.getInputStream();
-                SettingsParser sp = new SettingsParser(is, this);
+                SettingsParser sp = new SettingsParser(is);
                 return sp.parse();
             }
         } finally {
@@ -1687,12 +1670,12 @@
             target.sendSyncOptions(mProtocolVersionDouble, s, initialSync);
             if (initialSync) {
                 // Use enormous timeout for initial sync, which empirically can take a while longer
-                timeout = 120*SECONDS;
+                timeout = (int)(120 * DateUtils.SECOND_IN_MILLIS);
             }
             // Send our changes up to the server
             if (mUpsyncFailed) {
                 if (Eas.USER_LOG) {
-                    Log.d(TAG, "Inhibiting upsync this cycle");
+                    LogUtils.d(TAG, "Inhibiting upsync this cycle");
                 }
             } else {
                 target.sendLocalChanges(s);
@@ -1783,9 +1766,9 @@
                     }
                 } else {
                     userLog("Sync response error: ", code);
-                    if (EasResponse.isProvisionError(code)) {
+                    if (resp.isProvisionError()) {
                         mExitStatus = EXIT_SECURITY_FAILURE;
-                    } else if (EasResponse.isAuthError(code)) {
+                    } else if (resp.isAuthError()) {
                         mExitStatus = EXIT_LOGIN_FAILURE;
                     } else {
                         mExitStatus = EXIT_IO_ERROR;
@@ -1820,12 +1803,6 @@
             setConnectionParameters(ha);
         } catch (CertificateException e) {
             userLog("Couldn't retrieve certificate for connection");
-            try {
-                ExchangeService.callback().syncMailboxStatus(mMailboxId,
-                        EmailServiceStatus.CLIENT_CERTIFICATE_ERROR, 0);
-            } catch (RemoteException e1) {
-                // Don't care if this fails.
-            }
             return false;
         }
 
@@ -1897,16 +1874,6 @@
                             userLog("Looping for user request...");
                             mRequestTime = 0;
                         }
-                        String syncKey = target.getSyncKey();
-                        if (mSyncReason >= ExchangeService.SYNC_CALLBACK_START ||
-                                "0".equals(syncKey)) {
-                            try {
-                                ExchangeService.callback().syncMailboxStatus(mMailboxId,
-                                        EmailServiceStatus.IN_PROGRESS, 0);
-                            } catch (RemoteException e1) {
-                                // Don't care if this fails
-                            }
-                        }
                         sync(target);
                     } while (mRequestTime != 0);
                 }
@@ -1959,26 +1926,11 @@
                     status = EmailServiceStatus.SUCCESS;
                 }
 
-                // Send a callback (doesn't matter how the sync was started)
-                try {
-                    // Unless the user specifically asked for a sync, we don't want to report
-                    // connection issues, as they are likely to be transient.  In this case, we
-                    // simply report success, so that the progress indicator terminates without
-                    // putting up an error banner
-                    if (mSyncReason != ExchangeService.SYNC_UI_REQUEST &&
-                            status == EmailServiceStatus.CONNECTION_ERROR) {
-                        status = EmailServiceStatus.SUCCESS;
-                    }
-                    ExchangeService.callback().syncMailboxStatus(mMailboxId, status, 0);
-                } catch (RemoteException e1) {
-                    // Don't care if this fails
-                }
-
                 // Make sure ExchangeService knows about this
                 ExchangeService.kick("sync finished");
             }
         } catch (ProviderUnavailableException e) {
-            Log.e(TAG, "EmailProvider unavailable; sync ended prematurely");
+            LogUtils.e(TAG, "EmailProvider unavailable; sync ended prematurely");
         }
     }
 }

diff --git a/exchange2/src/com/android/exchange/Exchange.java b/src/com/android/exchange/Exchange.java
similarity index 82%
rename from exchange2/src/com/android/exchange/Exchange.java
rename to src/com/android/exchange/Exchange.java
index 496e1f5..faf2e43 100644
--- a/exchange2/src/com/android/exchange/Exchange.java
+++ b/src/com/android/exchange/Exchange.java

@@ -18,6 +18,12 @@
 
 import android.app.Application;
 
+import com.android.mail.utils.LogTag;
+
 public class Exchange extends Application {
-    // TODO Investigate whether this class is needed
+    private static final String LOG_TAG = "Exchange";
+
+    static {
+        LogTag.setLogTag(LOG_TAG);
+    }
 }

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
new file mode 100644
index 0000000..375f5dc
--- /dev/null
+++ b/src/com/android/exchange/ExchangeService.java

@@ -0,0 +1,764 @@
+/*
+ * Copyright (C) 2008-2009 Marc Blank
+ * Licensed to The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+
+import com.android.emailcommon.Api;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.EmailContent.SyncColumns;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.MailboxUtilities;
+import com.android.emailcommon.provider.ProviderUnavailableException;
+import com.android.emailcommon.service.AccountServiceProxy;
+import com.android.emailcommon.service.IEmailService;
+import com.android.emailcommon.service.IEmailServiceCallback;
+import com.android.emailcommon.service.IEmailServiceCallback.Stub;
+import com.android.emailcommon.service.SearchParams;
+import com.android.emailsync.AbstractSyncService;
+import com.android.emailsync.PartRequest;
+import com.android.emailsync.SyncManager;
+import com.android.exchange.adapter.CalendarSyncAdapter;
+import com.android.exchange.adapter.ContactsSyncAdapter;
+import com.android.exchange.adapter.Search;
+import com.android.exchange.utility.FileLogger;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.utils.LogUtils;
+
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * The ExchangeService handles all aspects of starting, maintaining, and stopping the various sync
+ * adapters used by Exchange.  However, it is capable of handing any kind of email sync, and it
+ * would be appropriate to use for IMAP push, when that functionality is added to the Email
+ * application.
+ *
+ * The Email application communicates with EAS sync adapters via ExchangeService's binder interface,
+ * which exposes UI-related functionality to the application (see the definitions below)
+ *
+ * ExchangeService uses ContentObservers to detect changes to accounts, mailboxes, and messages in
+ * order to maintain proper 2-way syncing of data.  (More documentation to follow)
+ *
+ */
+public class ExchangeService extends SyncManager {
+
+    private static final String TAG = "ExchangeService";
+
+    private static final String WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX =
+        MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.TYPE + "!=" +
+        Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + " and " + MailboxColumns.SYNC_INTERVAL +
+        " IN (" + Mailbox.CHECK_INTERVAL_PING + ',' + Mailbox.CHECK_INTERVAL_PUSH + ')';
+    private static final String WHERE_MAILBOX_KEY = Message.MAILBOX_KEY + "=?";
+    private static final String WHERE_CALENDAR_ID = Events.CALENDAR_ID + "=?";
+    private static final String ACCOUNT_KEY_IN = MailboxColumns.ACCOUNT_KEY + " in (";
+
+    // Offsets into the syncStatus data for EAS that indicate type, exit status, and change count
+    // The format is S<type_char>:<exit_char>:<change_count>
+    public static final int STATUS_TYPE_CHAR = 1;
+    public static final int STATUS_EXIT_CHAR = 3;
+    public static final int STATUS_CHANGE_COUNT_OFFSET = 5;
+
+    private static final int EAS_12_CAPABILITIES =
+            AccountCapabilities.SYNCABLE_FOLDERS |
+            AccountCapabilities.SERVER_SEARCH |
+            AccountCapabilities.FOLDER_SERVER_SEARCH |
+            AccountCapabilities.SANITIZED_HTML |
+            AccountCapabilities.SMART_REPLY |
+            AccountCapabilities.SERVER_SEARCH |
+            AccountCapabilities.UNDO;
+
+    private static final int EAS_2_CAPABILITIES =
+            AccountCapabilities.SYNCABLE_FOLDERS |
+            AccountCapabilities.SANITIZED_HTML |
+            AccountCapabilities.SMART_REPLY |
+            AccountCapabilities.UNDO;
+
+    // We synchronize on this for all actions affecting the service and error maps
+    private static final Object sSyncLock = new Object();
+    private String mEasAccountSelector;
+
+    // Concurrent because CalendarSyncAdapter can modify the map during a wipe
+    private final ConcurrentHashMap<Long, CalendarObserver> mCalendarObservers =
+            new ConcurrentHashMap<Long, CalendarObserver>();
+
+    private final Intent mIntent = new Intent(Eas.EXCHANGE_SERVICE_INTENT_ACTION);
+
+    /**
+     * Create our EmailService implementation here.
+     */
+    private final IEmailService.Stub mBinder = new IEmailService.Stub() {
+
+        @Override
+        public int getApiLevel() {
+            return Api.LEVEL;
+        }
+
+        @Override
+        public Bundle validate(HostAuth hostAuth) throws RemoteException {
+            return AbstractSyncService.validate(EasSyncService.class,
+                    hostAuth, ExchangeService.this);
+        }
+
+        @Override
+        public Bundle autoDiscover(String userName, String password) throws RemoteException {
+            HostAuth hostAuth = new HostAuth();
+            hostAuth.mLogin = userName;
+            hostAuth.mPassword = password;
+            hostAuth.mFlags = HostAuth.FLAG_AUTHENTICATE | HostAuth.FLAG_SSL;
+            hostAuth.mPort = 443;
+            return new EasSyncService().tryAutodiscover(ExchangeService.this, hostAuth);
+        }
+
+        /**
+         * This is the remote call from the Email app, currently unused.
+         * TODO: remove this when it's been deleted from IEmailService.aidl.
+         */
+        @Deprecated
+        @Override
+        public void startSync(long mailboxId, boolean userRequest, int deltaMessageCount)
+                throws RemoteException {
+            SyncManager exchangeService = INSTANCE;
+            if (exchangeService == null) return;
+            checkExchangeServiceServiceRunning();
+            Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
+            if (m == null) return;
+            Account acct = Account.restoreAccountWithId(exchangeService, m.mAccountKey);
+            if (acct == null) return;
+            // If this is a user request and we're being held, release the hold; this allows us to
+            // try again (the hold might have been specific to this account and released already)
+            if (userRequest) {
+                if (onSyncDisabledHold(acct)) {
+                    releaseSyncHolds(exchangeService, AbstractSyncService.EXIT_ACCESS_DENIED, acct);
+                    log("User requested sync of account in sync disabled hold; releasing");
+                } else if (onSecurityHold(acct)) {
+                    releaseSyncHolds(exchangeService, AbstractSyncService.EXIT_SECURITY_FAILURE,
+                            acct);
+                    log("User requested sync of account in security hold; releasing");
+                }
+                if (sConnectivityHold) {
+                    return;
+                }
+            }
+            if (m.mType == Mailbox.TYPE_OUTBOX) {
+                // We're using SERVER_ID to indicate an error condition (it has no other use for
+                // sent mail)  Upon request to sync the Outbox, we clear this so that all messages
+                // are candidates for sending.
+                ContentValues cv = new ContentValues();
+                cv.put(SyncColumns.SERVER_ID, 0);
+                exchangeService.getContentResolver().update(Message.CONTENT_URI,
+                    cv, WHERE_MAILBOX_KEY, new String[] {Long.toString(mailboxId)});
+                // Clear the error state; the Outbox sync will be started from checkMailboxes
+                exchangeService.mSyncErrorMap.remove(mailboxId);
+                kick("start outbox");
+                // Outbox can't be synced in EAS
+                return;
+            } else if (!isSyncable(m)) {
+                return;
+            }
+            startManualSync(mailboxId, userRequest ? ExchangeService.SYNC_UI_REQUEST :
+                ExchangeService.SYNC_SERVICE_START_SYNC, null);
+        }
+
+        @Override
+        public void stopSync(long mailboxId) throws RemoteException {
+            stopManualSync(mailboxId);
+        }
+
+        @Override
+        public void loadAttachment(final IEmailServiceCallback callback, final long attachmentId,
+                final boolean background) throws RemoteException {
+            Attachment att = Attachment.restoreAttachmentWithId(ExchangeService.this, attachmentId);
+            log("loadAttachment " + attachmentId + ": " + att.mFileName);
+            sendMessageRequest(new PartRequest(att, null, null));
+        }
+
+        @Override
+        public void updateFolderList(long accountId) throws RemoteException {
+            reloadFolderList(ExchangeService.this, accountId, false);
+        }
+
+        @Override
+        public void hostChanged(long accountId) throws RemoteException {
+            SyncManager exchangeService = INSTANCE;
+            if (exchangeService == null) return;
+            ConcurrentHashMap<Long, SyncError> syncErrorMap = exchangeService.mSyncErrorMap;
+            // Go through the various error mailboxes
+            for (long mailboxId: syncErrorMap.keySet()) {
+                SyncError error = syncErrorMap.get(mailboxId);
+                // If it's a login failure, look a little harder
+                Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
+                // If it's for the account whose host has changed, clear the error
+                // If the mailbox is no longer around, remove the entry in the map
+                if (m == null) {
+                    syncErrorMap.remove(mailboxId);
+                } else if (error != null && m.mAccountKey == accountId) {
+                    error.fatal = false;
+                    error.holdEndTime = 0;
+                }
+            }
+            // Stop any running syncs
+            exchangeService.stopAccountSyncs(accountId, true);
+            // Kick ExchangeService
+            kick("host changed");
+        }
+
+        @Override
+        public void setLogging(int flags) throws RemoteException {
+            // Protocol logging
+            Eas.setUserDebug(flags);
+            // Sync logging
+            setUserDebug(flags);
+        }
+
+        @Override
+        public void sendMeetingResponse(long messageId, int response) throws RemoteException {
+            sendMessageRequest(new MeetingResponseRequest(messageId, response));
+        }
+
+        @Override
+        public void loadMore(long messageId) throws RemoteException {
+        }
+
+        // The following three methods are not implemented in this version
+        @Override
+        public boolean createFolder(long accountId, String name) throws RemoteException {
+            return false;
+        }
+
+        @Override
+        public boolean deleteFolder(long accountId, String name) throws RemoteException {
+            return false;
+        }
+
+        @Override
+        public boolean renameFolder(long accountId, String oldName, String newName)
+                throws RemoteException {
+            return false;
+        }
+
+        /**
+         * Delete PIM (calendar, contacts) data for the specified account
+         *
+         * @param emailAddress the email address for the account whose data should be deleted
+         * @throws RemoteException
+         */
+        @Override
+        public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
+            // ExchangeService is deprecated so I am deleting rather than fixing this function.
+        }
+
+        @Override
+        public int searchMessages(long accountId, SearchParams searchParams, long destMailboxId) {
+            SyncManager exchangeService = INSTANCE;
+            if (exchangeService == null) return 0;
+            return Search.searchMessages(exchangeService, accountId, searchParams,
+                    destMailboxId);
+        }
+
+        @Override
+        public void sendMail(long accountId) throws RemoteException {
+        }
+
+        @Override
+        public int getCapabilities(Account acct) throws RemoteException {
+            String easVersion = acct.mProtocolVersion;
+            Double easVersionDouble = 2.5D;
+            if (easVersion != null) {
+                try {
+                    easVersionDouble = Double.parseDouble(easVersion);
+                } catch (NumberFormatException e) {
+                    // Stick with 2.5
+                }
+            }
+            if (easVersionDouble >= 12.0D) {
+                return EAS_12_CAPABILITIES;
+            } else {
+                return EAS_2_CAPABILITIES;
+            }
+        }
+
+        @Override
+        public void serviceUpdated(String emailAddress) throws RemoteException {
+            // Not required for EAS
+        }
+    };
+
+    /**
+     * Return a list of all Accounts in EmailProvider.  Because the result of this call may be used
+     * in account reconciliation, an exception is thrown if the result cannot be guaranteed accurate
+     * @param context the caller's context
+     * @param accounts a list that Accounts will be added into
+     * @return the list of Accounts
+     * @throws ProviderUnavailableException if the list of Accounts cannot be guaranteed valid
+     */
+    @Override
+    public AccountList collectAccounts(Context context, AccountList accounts) {
+        ContentResolver resolver = context.getContentResolver();
+        Cursor c = resolver.query(Account.CONTENT_URI, Account.CONTENT_PROJECTION, null, null,
+                null);
+        // We must throw here; callers might use the information we provide for reconciliation, etc.
+        if (c == null) throw new ProviderUnavailableException();
+        try {
+            ContentValues cv = new ContentValues();
+            while (c.moveToNext()) {
+                long hostAuthId = c.getLong(Account.CONTENT_HOST_AUTH_KEY_RECV_COLUMN);
+                if (hostAuthId > 0) {
+                    HostAuth ha = HostAuth.restoreHostAuthWithId(context, hostAuthId);
+                    if (ha != null && ha.mProtocol.equals(Eas.PROTOCOL)) {
+                        Account account = new Account();
+                        account.restore(c);
+                        // Cache the HostAuth
+                        account.mHostAuthRecv = ha;
+                        accounts.add(account);
+                        // Fixup flags for inbox (should accept moved mail)
+                        Mailbox inbox = Mailbox.restoreMailboxOfType(context, account.mId,
+                                Mailbox.TYPE_INBOX);
+                        if (inbox != null &&
+                                ((inbox.mFlags & Mailbox.FLAG_ACCEPTS_MOVED_MAIL) == 0)) {
+                            cv.put(MailboxColumns.FLAGS,
+                                    inbox.mFlags | Mailbox.FLAG_ACCEPTS_MOVED_MAIL);
+                            resolver.update(
+                                    ContentUris.withAppendedId(Mailbox.CONTENT_URI, inbox.mId), cv,
+                                    null, null);
+                        }
+                    }
+                }
+            }
+        } finally {
+            c.close();
+        }
+        return accounts;
+    }
+
+    public static void deleteAccountPIMData(final Context context, final long accountId) {
+        Mailbox mailbox =
+            Mailbox.restoreMailboxOfType(context, accountId, Mailbox.TYPE_CONTACTS);
+        if (mailbox != null) {
+            EasSyncService service = EasSyncService.getServiceForMailbox(context, mailbox);
+            ContactsSyncAdapter adapter = new ContactsSyncAdapter(service);
+            adapter.wipe();
+        }
+        mailbox =
+            Mailbox.restoreMailboxOfType(context, accountId, Mailbox.TYPE_CALENDAR);
+        if (mailbox != null) {
+            EasSyncService service = EasSyncService.getServiceForMailbox(context, mailbox);
+            CalendarSyncAdapter adapter = new CalendarSyncAdapter(service);
+            adapter.wipe();
+        }
+    }
+
+    public static boolean onSecurityHold(Account account) {
+        return (account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0;
+    }
+
+    private static boolean onSyncDisabledHold(Account account) {
+        return (account.mFlags & Account.FLAGS_SYNC_DISABLED) != 0;
+    }
+
+    /**
+     * Unregister all CalendarObserver's
+     */
+    static public void unregisterCalendarObservers() {
+        ExchangeService exchangeService = (ExchangeService)INSTANCE;
+        if (exchangeService == null) return;
+        ContentResolver resolver = exchangeService.mResolver;
+        for (CalendarObserver observer: exchangeService.mCalendarObservers.values()) {
+            resolver.unregisterContentObserver(observer);
+        }
+        exchangeService.mCalendarObservers.clear();
+    }
+
+    private class CalendarObserver extends ContentObserver {
+        long mAccountId;
+        long mCalendarId;
+        long mSyncEvents;
+        String mAccountName;
+
+        public CalendarObserver(Handler handler, Account account) {
+            super(handler);
+            mAccountId = account.mId;
+            mAccountName = account.mEmailAddress;
+
+            // Find the Calendar for this account
+            Cursor c = mResolver.query(Calendars.CONTENT_URI,
+                    new String[] {Calendars._ID, Calendars.SYNC_EVENTS},
+                    CalendarSyncAdapter.CALENDAR_SELECTION,
+                    new String[] {account.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE},
+                    null);
+            if (c != null) {
+                // Save its id and its sync events status
+                try {
+                    if (c.moveToFirst()) {
+                        mCalendarId = c.getLong(0);
+                        mSyncEvents = c.getLong(1);
+                    }
+                } finally {
+                    c.close();
+                }
+            }
+        }
+
+        @Override
+        public synchronized void onChange(boolean selfChange) {
+            // See if the user has changed syncing of our calendar
+            if (!selfChange) {
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            Cursor c = mResolver.query(Calendars.CONTENT_URI,
+                                    new String[] {Calendars.SYNC_EVENTS}, Calendars._ID + "=?",
+                                    new String[] {Long.toString(mCalendarId)}, null);
+                            if (c == null) return;
+                            // Get its sync events; if it's changed, we've got work to do
+                            try {
+                                if (c.moveToFirst()) {
+                                    long newSyncEvents = c.getLong(0);
+                                    if (newSyncEvents != mSyncEvents) {
+                                        log("_sync_events changed for calendar in " + mAccountName);
+                                        Mailbox mailbox = Mailbox.restoreMailboxOfType(INSTANCE,
+                                                mAccountId, Mailbox.TYPE_CALENDAR);
+                                        // Sanity check for mailbox deletion
+                                        if (mailbox == null) return;
+                                        ContentValues cv = new ContentValues();
+                                        if (newSyncEvents == 0) {
+                                            // When sync is disabled, we're supposed to delete
+                                            // all events in the calendar
+                                            log("Deleting events and setting syncKey to 0 for " +
+                                                    mAccountName);
+                                            // First, stop any sync that's ongoing
+                                            stopManualSync(mailbox.mId);
+                                            // Set the syncKey to 0 (reset)
+                                            EasSyncService service =
+                                                EasSyncService.getServiceForMailbox(
+                                                        INSTANCE, mailbox);
+                                            CalendarSyncAdapter adapter =
+                                                new CalendarSyncAdapter(service);
+                                            try {
+                                                adapter.setSyncKey("0", false);
+                                            } catch (IOException e) {
+                                                // The provider can't be reached; nothing to be done
+                                            }
+                                            // Reset the sync key locally and stop syncing
+                                            cv.put(Mailbox.SYNC_KEY, "0");
+                                            cv.put(Mailbox.SYNC_INTERVAL,
+                                                    Mailbox.CHECK_INTERVAL_NEVER);
+                                            mResolver.update(ContentUris.withAppendedId(
+                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
+                                                    null);
+                                            // Delete all events using the sync adapter
+                                            // parameter so that the deletion is only local
+                                            Uri eventsAsSyncAdapter =
+                                                CalendarSyncAdapter.asSyncAdapter(
+                                                    Events.CONTENT_URI,
+                                                    mAccountName,
+                                                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+                                            mResolver.delete(eventsAsSyncAdapter, WHERE_CALENDAR_ID,
+                                                    new String[] {Long.toString(mCalendarId)});
+                                        } else {
+                                            // Make this a push mailbox and kick; this will start
+                                            // a resync of the Calendar; the account mailbox will
+                                            // ping on this during the next cycle of the ping loop
+                                            cv.put(Mailbox.SYNC_INTERVAL,
+                                                    Mailbox.CHECK_INTERVAL_PUSH);
+                                            mResolver.update(ContentUris.withAppendedId(
+                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
+                                                    null);
+                                            kick("calendar sync changed");
+                                        }
+
+                                        // Save away the new value
+                                        mSyncEvents = newSyncEvents;
+                                    }
+                                }
+                            } finally {
+                                c.close();
+                            }
+                        } catch (ProviderUnavailableException e) {
+                            LogUtils.w(TAG, "Observer failed; provider unavailable");
+                        }
+                    }}, "Calendar Observer").start();
+            }
+        }
+    }
+
+    /**
+     * Blocking call to the account reconciler
+     */
+    @Override
+    public void runAccountReconcilerSync(Context context) {
+        alwaysLog("Reconciling accounts...");
+        new AccountServiceProxy(context).reconcileAccounts(
+                Eas.PROTOCOL, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+    }
+
+    public static void log(String str) {
+        log(TAG, str);
+    }
+
+    public static void log(String tag, String str) {
+        if (Eas.USER_LOG) {
+            LogUtils.d(tag, str);
+            if (Eas.FILE_LOG) {
+                FileLogger.log(tag, str);
+            }
+        }
+    }
+
+    public static void alwaysLog(String str) {
+        if (!Eas.USER_LOG) {
+            LogUtils.d(TAG, str);
+        } else {
+            log(str);
+        }
+    }
+
+    /**
+     * EAS requires a unique device id, so that sync is possible from a variety of different
+     * devices (e.g. the syncKey is specific to a device)  If we're on an emulator or some other
+     * device that doesn't provide one, we can create it as "device".
+     * This would work on a real device as well, but it would be better to use the "real" id if
+     * it's available
+     */
+    static public String getDeviceId(Context context) {
+        if (sDeviceId == null) {
+            sDeviceId = new AccountServiceProxy(context).getDeviceId();
+            alwaysLog("Received deviceId from Email app: " + sDeviceId);
+        }
+        return sDeviceId;
+    }
+
+    @Override
+    public IBinder onBind(Intent arg0) {
+        return mBinder;
+    }
+
+    static private void reloadFolderListFailed(long accountId) {
+
+    }
+
+    static public void reloadFolderList(Context context, long accountId, boolean force) {
+        SyncManager exchangeService = INSTANCE;
+        if (exchangeService == null) return;
+        Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,
+                Mailbox.CONTENT_PROJECTION, MailboxColumns.ACCOUNT_KEY + "=? AND " +
+                MailboxColumns.TYPE + "=?",
+                new String[] {Long.toString(accountId),
+                    Long.toString(Mailbox.TYPE_EAS_ACCOUNT_MAILBOX)}, null);
+        try {
+            if (c.moveToFirst()) {
+                synchronized(sSyncLock) {
+                    Mailbox mailbox = new Mailbox();
+                    mailbox.restore(c);
+                    Account acct = Account.restoreAccountWithId(context, accountId);
+                    if (acct == null) {
+                        reloadFolderListFailed(accountId);
+                        return;
+                    }
+                    String syncKey = acct.mSyncKey;
+                    // No need to reload the list if we don't have one
+                    if (!force && (syncKey == null || syncKey.equals("0"))) {
+                        reloadFolderListFailed(accountId);
+                        return;
+                    }
+
+                    // Change all ping/push boxes to push/hold
+                    ContentValues cv = new ContentValues();
+                    cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PUSH_HOLD);
+                    context.getContentResolver().update(Mailbox.CONTENT_URI, cv,
+                            WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX,
+                            new String[] {Long.toString(accountId)});
+                    log("Set push/ping boxes to push/hold");
+
+                    long id = mailbox.mId;
+                    AbstractSyncService svc = exchangeService.mServiceMap.get(id);
+                    // Tell the service we're done
+                    if (svc != null) {
+                        synchronized (svc.getSynchronizer()) {
+                            svc.stop();
+                            // Interrupt the thread so that it can stop
+                            Thread thread = svc.mThread;
+                            if (thread != null) {
+                                thread.setName(thread.getName() + " (Stopped)");
+                                thread.interrupt();
+                            }
+                        }
+                        // Abandon the service
+                        exchangeService.releaseMailbox(id);
+                        // And have it start naturally
+                        kick("reload folder list");
+                    }
+                }
+            }
+        } finally {
+            c.close();
+        }
+    }
+
+    /**
+     * Informs ExchangeService that an account has a new folder list; as a result, any existing
+     * folder might have become invalid.  Therefore, we act as if the account has been deleted, and
+     * then we reinitialize it.
+     *
+     * @param acctId
+     */
+    static public void stopNonAccountMailboxSyncsForAccount(long acctId) {
+        SyncManager exchangeService = INSTANCE;
+        if (exchangeService != null) {
+            exchangeService.stopAccountSyncs(acctId, false);
+            kick("reload folder list");
+        }
+    }
+
+    /**
+     * Start up the ExchangeService service if it's not already running
+     * This is a stopgap for cases in which ExchangeService died (due to a crash somewhere in
+     * com.android.email) and hasn't been restarted. See the comment for onCreate for details
+     */
+    static void checkExchangeServiceServiceRunning() {
+        SyncManager exchangeService = INSTANCE;
+        if (exchangeService == null) return;
+        if (sServiceThread == null) {
+            log("!!! checkExchangeServiceServiceRunning; starting service...");
+            exchangeService.startService(new Intent(exchangeService, ExchangeService.class));
+        }
+    }
+
+    @Override
+    public AccountObserver getAccountObserver(
+            Handler handler) {
+        return new AccountObserver(handler) {
+            @Override
+            public void newAccount(long acctId) {
+                Account acct = Account.restoreAccountWithId(getContext(), acctId);
+                if (acct == null) {
+                    // This account is in a bad state; don't create the mailbox.
+                    LogUtils.e(TAG, "Cannot initialize bad acctId: " + acctId);
+                    return;
+                }
+                Mailbox main = new Mailbox();
+                main.mDisplayName = Eas.ACCOUNT_MAILBOX_PREFIX;
+                main.mServerId = Eas.ACCOUNT_MAILBOX_PREFIX + System.nanoTime();
+                main.mAccountKey = acct.mId;
+                main.mType = Mailbox.TYPE_EAS_ACCOUNT_MAILBOX;
+                main.mSyncInterval = Mailbox.CHECK_INTERVAL_PUSH;
+                main.mFlagVisible = false;
+                main.save(getContext());
+                log("Initializing account: " + acct.mDisplayName);
+            }
+        };
+    }
+
+    @Override
+    public void onStartup() {
+        // Do any required work to clean up our Mailboxes (this serves to upgrade
+        // mailboxes that existed prior to EmailProvider database version 17)
+        MailboxUtilities.fixupUninitializedParentKeys(this, getAccountsSelector());
+    }
+
+    @Override
+    public AbstractSyncService getServiceForMailbox(Context context,
+            Mailbox m) {
+        switch(m.mType) {
+            case Mailbox.TYPE_EAS_ACCOUNT_MAILBOX:
+                return new EasAccountService(context, m);
+            case Mailbox.TYPE_OUTBOX:
+                return new EasOutboxService(context, m);
+            default:
+                return new EasSyncService(context, m);
+        }
+    }
+
+    @Override
+    public String getAccountsSelector() {
+        if (mEasAccountSelector == null) {
+            StringBuilder sb = new StringBuilder(ACCOUNT_KEY_IN);
+            boolean first = true;
+            synchronized (mAccountList) {
+                for (Account account : mAccountList) {
+                    if (!first) {
+                        sb.append(',');
+                    } else {
+                        first = false;
+                    }
+                    sb.append(account.mId);
+                }
+            }
+            sb.append(')');
+            mEasAccountSelector = sb.toString();
+        }
+        return mEasAccountSelector;
+    }
+
+    @Override
+    public String getAccountManagerType() {
+        return Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE;
+    }
+
+    @Override
+    public Intent getServiceIntent() {
+        return mIntent;
+    }
+
+    @Override
+    public Stub getCallbackProxy() {
+        return null;
+    }
+
+    /**
+     * Stop any ping in progress if required
+     *
+     * @param mailbox whose service has started
+     */
+    @Override
+    public void onStartService(Mailbox mailbox) {
+        // If this is a ping mailbox, stop the ping
+        if (mailbox.mSyncInterval != Mailbox.CHECK_INTERVAL_PING) return;
+        long accountMailboxId = Mailbox.findMailboxOfType(this, mailbox.mAccountKey,
+                Mailbox.TYPE_EAS_ACCOUNT_MAILBOX);
+        // If our ping is running, stop it
+        final AbstractSyncService svc = getRunningService(accountMailboxId);
+        if (svc != null) {
+            log("Stopping ping due to sync of mailbox: " + mailbox.mDisplayName);
+            // Don't block; reset might perform network activity
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    svc.reset();
+                }}).start();
+        }
+    }
+}

diff --git a/exchange2/src/com/android/exchange/IllegalHeartbeatException.java b/src/com/android/exchange/IllegalHeartbeatException.java
similarity index 100%
rename from exchange2/src/com/android/exchange/IllegalHeartbeatException.java
rename to src/com/android/exchange/IllegalHeartbeatException.java


diff --git a/exchange2/src/com/android/exchange/MeetingResponseRequest.java b/src/com/android/exchange/MeetingResponseRequest.java
similarity index 94%
rename from exchange2/src/com/android/exchange/MeetingResponseRequest.java
rename to src/com/android/exchange/MeetingResponseRequest.java
index ea769e2..69195fb 100644
--- a/exchange2/src/com/android/exchange/MeetingResponseRequest.java
+++ b/src/com/android/exchange/MeetingResponseRequest.java

@@ -16,6 +16,8 @@
 
 package com.android.exchange;
 
+import com.android.emailsync.Request;
+
 /**
  * MeetingResponseRequest is the EAS wrapper for responding to meeting requests.
  */
@@ -29,11 +31,13 @@
 
     // MeetingResponseRequests are unique by their message id (i.e. there's only one response to
     // a given message)
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof MeetingResponseRequest)) return false;
         return ((MeetingResponseRequest)o).mMessageId == mMessageId;
     }
 
+    @Override
     public int hashCode() {
         return (int)mMessageId;
     }

diff --git a/exchange2/src/com/android/exchange/MessageMoveRequest.java b/src/com/android/exchange/MessageMoveRequest.java
similarity index 94%
rename from exchange2/src/com/android/exchange/MessageMoveRequest.java
rename to src/com/android/exchange/MessageMoveRequest.java
index a884bda..f1834bd 100644
--- a/exchange2/src/com/android/exchange/MessageMoveRequest.java
+++ b/src/com/android/exchange/MessageMoveRequest.java

@@ -16,6 +16,8 @@
 
 package com.android.exchange;
 
+import com.android.emailsync.Request;
+
 /**
  * MessageMoveRequest is the EAS wrapper for requesting a "move to folder"
  */
@@ -29,11 +31,13 @@
 
     // MessageMoveRequests are unique by their message id (i.e. it's meaningless to have two
     // separate message moves queued at the same time)
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof MessageMoveRequest)) return false;
         return ((MessageMoveRequest)o).mMessageId == mMessageId;
     }
 
+    @Override
     public int hashCode() {
         return (int)mMessageId;
     }

diff --git a/exchange2/src/com/android/exchange/MockParserStream.java b/src/com/android/exchange/MockParserStream.java
similarity index 100%
rename from exchange2/src/com/android/exchange/MockParserStream.java
rename to src/com/android/exchange/MockParserStream.java


diff --git a/exchange2/src/com/android/exchange/SettingsRedirector.java b/src/com/android/exchange/SettingsRedirector.java
similarity index 97%
rename from exchange2/src/com/android/exchange/SettingsRedirector.java
rename to src/com/android/exchange/SettingsRedirector.java
index 5a50825..bc0d98c 100644
--- a/exchange2/src/com/android/exchange/SettingsRedirector.java
+++ b/src/com/android/exchange/SettingsRedirector.java

@@ -35,7 +35,6 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Intent intent = getIntent();
         Intent redirect = new Intent(
                 Intent.ACTION_EDIT,
                 IntentUtilities.createActivityIntentUrlBuilder("settings").build());

diff --git a/exchange2/src/com/android/exchange/StaleFolderListException.java b/src/com/android/exchange/StaleFolderListException.java
similarity index 100%
rename from exchange2/src/com/android/exchange/StaleFolderListException.java
rename to src/com/android/exchange/StaleFolderListException.java


diff --git a/exchange2/src/com/android/exchange/adapter/AbstractSyncAdapter.java b/src/com/android/exchange/adapter/AbstractSyncAdapter.java
similarity index 86%
rename from exchange2/src/com/android/exchange/adapter/AbstractSyncAdapter.java
rename to src/com/android/exchange/adapter/AbstractSyncAdapter.java
index 04a67d0..c8ffe75 100644
--- a/exchange2/src/com/android/exchange/adapter/AbstractSyncAdapter.java
+++ b/src/com/android/exchange/adapter/AbstractSyncAdapter.java

@@ -17,13 +17,6 @@
 
 package com.android.exchange.adapter;
 
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.CommandStatusException;
-import com.android.exchange.Eas;
-import com.android.exchange.EasSyncService;
-import com.google.common.annotations.VisibleForTesting;
-
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
@@ -34,6 +27,13 @@
 import android.os.RemoteException;
 import android.os.TransactionTooLargeException;
 
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.CommandStatusException;
+import com.android.exchange.Eas;
+import com.android.exchange.EasSyncService;
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -96,14 +96,10 @@
         mService.userLog(strings);
     }
 
-    public void incrementChangeCount() {
-        mService.mChangeCount++;
-    }
-
     /**
      * Set sync options common to PIM's (contacts and calendar)
      * @param protocolVersion the protocol version under which we're syncing
-     * @param the filter to use (or null)
+     * @param filter the filter to use (or null)
      * @param s the Serializer
      * @throws IOException
      */
@@ -192,6 +188,7 @@
             mOffset = 0;
         }
 
+        @Override
         public String toString() {
             StringBuilder sb = new StringBuilder("Op: ");
             ContentProviderOperation op = operationToContentProviderOperation(this, 0);
@@ -213,17 +210,13 @@
      * We apply the batch of CPO's here.  We synchronize on the service to avoid thread-nasties,
      * and we just return quickly if the service has already been stopped.
      */
-    private ContentProviderResult[] execute(String authority,
-            ArrayList<ContentProviderOperation> ops)
+    private static ContentProviderResult[] execute(final ContentResolver contentResolver,
+            final String authority, final ArrayList<ContentProviderOperation> ops)
             throws RemoteException, OperationApplicationException {
-        synchronized (mService.getSynchronizer()) {
-            if (!mService.isStopped()) {
-                if (!ops.isEmpty()) {
-                    ContentProviderResult[] result = mContentResolver.applyBatch(authority, ops);
-                    mService.userLog("Results: " + result.length);
-                    return result;
-                }
-            }
+        if (!ops.isEmpty()) {
+            ContentProviderResult[] result = contentResolver.applyBatch(authority, ops);
+            //mService.userLog("Results: " + result.length);
+            return result;
         }
         return new ContentProviderResult[0];
     }
@@ -249,8 +242,9 @@
     /**
      * Create a list of CPOs from a list of Operations, and then apply them in a batch
      */
-    private ContentProviderResult[] applyBatch(String authority, ArrayList<Operation> ops,
-            int offset) throws RemoteException, OperationApplicationException {
+    private static ContentProviderResult[] applyBatch(final ContentResolver contentResolver,
+            final String authority, final ArrayList<Operation> ops, final int offset)
+            throws RemoteException, OperationApplicationException {
         // Handle the empty case
         if (ops.isEmpty()) {
             return new ContentProviderResult[0];
@@ -259,18 +253,20 @@
         for (Operation op: ops) {
             cpos.add(operationToContentProviderOperation(op, offset));
         }
-        return execute(authority, cpos);
+        return execute(contentResolver, authority, cpos);
     }
 
     /**
      * Apply the list of CPO's in the provider and copy the "mini" result into our full result array
      */
-    private void applyAndCopyResults(String authority, ArrayList<Operation> mini,
-            ContentProviderResult[] result, int offset) throws RemoteException {
+    private static void applyAndCopyResults(final ContentResolver contentResolver,
+            final String authority, final ArrayList<Operation> mini,
+            final ContentProviderResult[] result, final int offset) throws RemoteException {
         // Empty lists are ok; we just ignore them
         if (mini.isEmpty()) return;
         try {
-            ContentProviderResult[] miniResult = applyBatch(authority, mini, offset);
+            ContentProviderResult[] miniResult = applyBatch(contentResolver, authority, mini,
+                    offset);
             // Copy the results from this mini-batch into our results array
             System.arraycopy(miniResult, 0, result, offset, miniResult.length);
         } catch (OperationApplicationException e) {
@@ -290,16 +286,16 @@
      * Callers MAY leave a dangling separator at the end of the list; note that the separators
      * themselves are only markers and are not sent to the provider.
      */
-    protected ContentProviderResult[] safeExecute(String authority, ArrayList<Operation> ops)
-            throws RemoteException {
-        mService.userLog("Try to execute ", ops.size(), " CPO's for " + authority);
+    protected static ContentProviderResult[] safeExecute(final ContentResolver contentResolver,
+            final String authority, final ArrayList<Operation> ops) throws RemoteException {
+        //mService.userLog("Try to execute ", ops.size(), " CPO's for " + authority);
         ContentProviderResult[] result = null;
         try {
             // Try to execute the whole thing
-            return applyBatch(authority, ops, 0);
+            return applyBatch(contentResolver, authority, ops, 0);
         } catch (TransactionTooLargeException e) {
             // Nope; split into smaller chunks, demarcated by the separator operation
-            mService.userLog("Transaction too large; spliting!");
+            //mService.userLog("Transaction too large; spliting!");
             ArrayList<Operation> mini = new ArrayList<Operation>();
             // Build a result array with the total size we're sending
             result = new ContentProviderResult[ops.size()];
@@ -308,8 +304,8 @@
             for (Operation op: ops) {
                 if (op.mSeparator) {
                     try {
-                        mService.userLog("Try mini-batch of ", mini.size(), " CPO's");
-                        applyAndCopyResults(authority, mini, result, offset);
+                        //mService.userLog("Try mini-batch of ", mini.size(), " CPO's");
+                        applyAndCopyResults(contentResolver, authority, mini, result, offset);
                         mini.clear();
                         // Save away the offset here; this will need to be subtracted out of the
                         // value originally set by the adapter
@@ -327,7 +323,7 @@
             // Check out what's left; if it's more than just a separator, apply the batch
             int miniSize = mini.size();
             if ((miniSize > 0) && !(miniSize == 1 && mini.get(0).mSeparator)) {
-                applyAndCopyResults(authority, mini, result, offset);
+                applyAndCopyResults(contentResolver, authority, mini, result, offset);
             }
         } catch (RemoteException e) {
             throw e;
@@ -340,11 +336,10 @@
     /**
      * Called by a sync adapter to indicate a relatively safe place to split a batch of CPO's
      */
-    protected void addSeparatorOperation(ArrayList<Operation> ops, Uri uri) {
+    protected static void addSeparatorOperation(ArrayList<Operation> ops, Uri uri) {
         Operation op = new Operation(
                 ContentProviderOperation.newDelete(ContentUris.withAppendedId(uri, SEPARATOR_ID)));
         op.mSeparator = true;
         ops.add(op);
     }
 }
-

diff --git a/exchange2/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
similarity index 78%
rename from exchange2/src/com/android/exchange/adapter/AbstractSyncParser.java
rename to src/com/android/exchange/adapter/AbstractSyncParser.java
index 1162b66..118c704 100644
--- a/exchange2/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java

@@ -26,8 +26,6 @@
 import com.android.emailcommon.provider.Mailbox;
 import com.android.exchange.CommandStatusException;
 import com.android.exchange.CommandStatusException.CommandStatus;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.ExchangeService;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,16 +37,19 @@
  *
  */
 public abstract class AbstractSyncParser extends Parser {
-
-    protected EasSyncService mService;
     protected Mailbox mMailbox;
     protected Account mAccount;
     protected Context mContext;
     protected ContentResolver mContentResolver;
-    protected AbstractSyncAdapter mAdapter;
 
     private boolean mLooping;
 
+    public AbstractSyncParser(final Context context, final ContentResolver resolver,
+            final InputStream in, final Mailbox mailbox, final Account account) throws IOException {
+        super(in);
+        init(context, resolver, mailbox, account);
+    }
+
     public AbstractSyncParser(InputStream in, AbstractSyncAdapter adapter) throws IOException {
         super(in);
         init(adapter);
@@ -59,13 +60,17 @@
         init(adapter);
     }
 
-    private void init(AbstractSyncAdapter adapter) {
-        mAdapter = adapter;
-        mService = adapter.mService;
-        mContext = mService.mContext;
-        mContentResolver = mContext.getContentResolver();
-        mMailbox = mService.mMailbox;
-        mAccount = mService.mAccount;
+    private void init(final AbstractSyncAdapter adapter) {
+        init(adapter.mContext, adapter.mContext.getContentResolver(), adapter.mMailbox,
+                adapter.mAccount);
+    }
+
+    private void init(final Context context, final ContentResolver resolver, final Mailbox mailbox,
+            final Account account) {
+        mContext = context;
+        mContentResolver = resolver;
+        mMailbox = mailbox;
+        mAccount = account;
     }
 
     /**
@@ -113,7 +118,6 @@
         int status;
         boolean moreAvailable = false;
         boolean newSyncKey = false;
-        int interval = mMailbox.mSyncInterval;
         mLooping = false;
         // If we're not at the top of the xml tree, throw an exception
         if (nextTag(START_DOCUMENT) != Tags.SYNC_SYNC) {
@@ -131,15 +135,11 @@
                 // Status = 1 is success; everything else is a failure
                 status = getValueInt();
                 if (status != 1) {
-                    mService.errorLog("Sync failed: " + CommandStatus.toString(status));
                     if (status == 3 || CommandStatus.isBadSyncKey(status)) {
                         // Must delete all of the data and start over with syncKey of "0"
-                        mAdapter.setSyncKey("0", false);
-                        // Make this a push box through the first sync
-                        // TODO Make frequency conditional on user settings!
-                        mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PUSH;
-                        mService.errorLog("Bad sync key; RESET and delete data");
-                        mAdapter.wipe();
+                        mMailbox.mSyncKey = "0";
+                        // TODO: Implement wipe.
+                        //mAdapter.wipe();
                         // Indicate there's more so that we'll start syncing again
                         moreAvailable = true;
                     } else if (status == 16 || status == 5) {
@@ -151,12 +151,14 @@
                         // Status 8 is Bad; it means the server doesn't recognize the serverId it
                         // sent us.  12 means that we're being asked to refresh the folder list.
                         // We'll do that with 8 also...
-                        ExchangeService.reloadFolderList(mContext, mAccount.mId, true);
+                        // TODO: reloadFolderList simply sets all mailboxes to hold.
+                        //ExchangeService.reloadFolderList(mContext, mAccount.mId, true);
                         // We don't have any provision for telling the user "wait a minute while
                         // we sync folders"...
                         throw new IOException();
                     } else if (status == 7) {
-                        mService.mUpsyncFailed = true;
+                        // TODO: Fix this. The handling here used to be pretty bogus, and it's not
+                        // obvious that simply forcing another resync makes sense here.
                         moreAvailable = true;
                     } else {
                         // Access, provisioning, transient, etc.
@@ -170,21 +172,17 @@
             } else if (tag == Tags.SYNC_MORE_AVAILABLE) {
                 moreAvailable = true;
             } else if (tag == Tags.SYNC_SYNC_KEY) {
-                if (mAdapter.getSyncKey().equals("0")) {
+                if (mMailbox.mSyncKey.equals("0")) {
                     moreAvailable = true;
                 }
                 String newKey = getValue();
                 userLog("Parsed key for ", mMailbox.mDisplayName, ": ", newKey);
                 if (!newKey.equals(mMailbox.mSyncKey)) {
-                    mAdapter.setSyncKey(newKey, true);
+                    mMailbox.mSyncKey = newKey;
                     cv.put(MailboxColumns.SYNC_KEY, newKey);
                     mailboxUpdated = true;
                     newSyncKey = true;
                 }
-                // If we were pushing (i.e. auto-start), now we'll become ping-triggered
-                if (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
-                    mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PING;
-                }
            } else {
                 skipTag();
            }
@@ -198,14 +196,16 @@
         // Commit any changes
         commit();
 
-        boolean abortSyncs = false;
 
+        // TODO: I don't think this is still relevant. Syncing should not trigger changes in the
+        // sync interval.
+        /*
         // If the sync interval has changed, we need to save it
         if (mMailbox.mSyncInterval != interval) {
             cv.put(MailboxColumns.SYNC_INTERVAL, mMailbox.mSyncInterval);
             mailboxUpdated = true;
         // If there are changes, and we were bounced from push/ping, try again
-        } else if (mService.mChangeCount > 0 &&
+        } else if (mAdapter.mChangeCount > 0 &&
                 mAccount.mSyncInterval == Account.CHECK_INTERVAL_PUSH &&
                 mMailbox.mSyncInterval > 0) {
             userLog("Changes found to ping loop mailbox ", mMailbox.mDisplayName, ": will ping.");
@@ -213,18 +213,9 @@
             mailboxUpdated = true;
             abortSyncs = true;
         }
-
+         */
         if (mailboxUpdated) {
-             synchronized (mService.getSynchronizer()) {
-                if (!mService.isStopped()) {
-                     mMailbox.update(mContext, cv);
-                }
-            }
-        }
-
-        if (abortSyncs) {
-            userLog("Aborting account syncs due to mailbox change to ping...");
-            ExchangeService.stopAccountSyncs(mAccount.mId);
+            mMailbox.update(mContext, cv);
         }
 
         // Let the caller know that there's more to do
@@ -235,10 +226,12 @@
     }
 
     void userLog(String ...strings) {
-        mService.userLog(strings);
+        // TODO: Convert to other logging types?
+        //mService.userLog(strings);
     }
 
     void userLog(String string, int num, String string2) {
-        mService.userLog(string, num, string2);
+        // TODO: Convert to other logging types?
+        //mService.userLog(string, num, string2);
     }
 }

diff --git a/exchange2/src/com/android/exchange/adapter/AccountSyncAdapter.java b/src/com/android/exchange/adapter/AccountSyncAdapter.java
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/AccountSyncAdapter.java
rename to src/com/android/exchange/adapter/AccountSyncAdapter.java


diff --git a/src/com/android/exchange/adapter/AttachmentLoader.java b/src/com/android/exchange/adapter/AttachmentLoader.java
new file mode 100644
index 0000000..854bd77
--- /dev/null
+++ b/src/com/android/exchange/adapter/AttachmentLoader.java

@@ -0,0 +1,205 @@
+/* Copyright (C) 2011 The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.adapter;
+
+import android.content.Context;
+
+import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.service.EmailServiceStatus;
+import com.android.emailcommon.utility.AttachmentUtilities;
+import com.android.emailsync.PartRequest;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.EasSyncService;
+import com.android.exchange.utility.UriCodec;
+import com.google.common.annotations.VisibleForTesting;
+
+import org.apache.http.HttpStatus;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Handle EAS attachment loading, regardless of protocol version
+ */
+public class AttachmentLoader {
+    private final EasSyncService mService;
+    private final Context mContext;
+    private final Attachment mAttachment;
+    private final long mAttachmentId;
+    private final int mAttachmentSize;
+    private final long mMessageId;
+    private final Message mMessage;
+
+    public AttachmentLoader(EasSyncService service, PartRequest req) {
+        mService = service;
+        mContext = service.mContext;
+        mAttachment = req.mAttachment;
+        mAttachmentId = mAttachment.mId;
+        mAttachmentSize = (int)mAttachment.mSize;
+        mMessageId = mAttachment.mMessageKey;
+        mMessage = Message.restoreMessageWithId(mContext, mMessageId);
+    }
+
+    private void doStatusCallback(int status) {
+
+    }
+
+    private void doProgressCallback(int progress) {
+
+    }
+
+    @VisibleForTesting
+    static String encodeForExchange2003(String str) {
+        AttachmentNameEncoder enc = new AttachmentNameEncoder();
+        StringBuilder sb = new StringBuilder(str.length() + 16);
+        enc.appendPartiallyEncoded(sb, str);
+        return sb.toString();
+    }
+
+    /**
+     * Encoder for Exchange 2003 attachment names.  They come from the server partially encoded,
+     * but there are still possible characters that need to be encoded (Why, MSFT, why?)
+     */
+    private static class AttachmentNameEncoder extends UriCodec {
+        @Override protected boolean isRetained(char c) {
+            // These four characters are commonly received in EAS 2.5 attachment names and are
+            // valid (verified by testing); we won't encode them
+            return c == '_' || c == ':' || c == '/' || c == '.';
+        }
+    }
+
+    /**
+     * Close, ignoring errors (as during cleanup)
+     * @param c a Closeable
+     */
+    private static void close(Closeable c) {
+        try {
+            c.close();
+        } catch (IOException e) {
+        }
+    }
+
+    /**
+     * Save away the contentUri for this Attachment and notify listeners
+     * @throws IOException
+     */
+    private void finishLoadAttachment(File file) throws IOException {
+        InputStream in = null;
+        try {
+            in = new FileInputStream(file);
+            AttachmentUtilities.saveAttachment(mContext, in, mAttachment);
+            doStatusCallback(EmailServiceStatus.SUCCESS);
+        } catch (FileNotFoundException e) {
+            // Not bloody likely, as we just created it successfully
+            throw new IOException("Attachment file not found?");
+        } finally {
+            close(in);
+        }
+    }
+
+    /**
+     * Loads an attachment, based on the PartRequest passed in the constructor
+     * @throws IOException
+     */
+    public void loadAttachment() throws IOException {
+        if (mMessage == null) {
+            doStatusCallback(EmailServiceStatus.MESSAGE_NOT_FOUND);
+            return;
+        }
+        // Say we've started loading the attachment
+        doProgressCallback(0);
+
+        EasResponse resp = null;
+        // The method of attachment loading is different in EAS 14.0 than in earlier versions
+        boolean eas14 = mService.mProtocolVersionDouble >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE;
+        try {
+            if (eas14) {
+                Serializer s = new Serializer();
+                s.start(Tags.ITEMS_ITEMS).start(Tags.ITEMS_FETCH);
+                s.data(Tags.ITEMS_STORE, "Mailbox");
+                s.data(Tags.BASE_FILE_REFERENCE, mAttachment.mLocation);
+                s.end().end().done(); // ITEMS_FETCH, ITEMS_ITEMS
+                resp = mService.sendHttpClientPost("ItemOperations", s.toByteArray());
+            } else {
+                String location = mAttachment.mLocation;
+                // For Exchange 2003 (EAS 2.5), we have to look for illegal chars in the file name
+                // that EAS sent to us!
+                if (mService.mProtocolVersionDouble < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                    location = encodeForExchange2003(location);
+                }
+                String cmd = "GetAttachment&AttachmentName=" + location;
+                resp = mService.sendHttpClientPost(cmd, null, EasSyncService.COMMAND_TIMEOUT);
+            }
+
+            int status = resp.getStatus();
+            if (status == HttpStatus.SC_OK) {
+                if (!resp.isEmpty()) {
+                    InputStream is = resp.getInputStream();
+                    OutputStream os = null;
+                    File tmpFile = null;
+                    try {
+                        tmpFile = File.createTempFile("eas_", "tmp", mContext.getCacheDir());
+                        os = new FileOutputStream(tmpFile);
+                        if (eas14) {
+                            ItemOperationsParser p = new ItemOperationsParser(is, os,
+                                    mAttachmentSize, null);
+                            p.parse();
+                            if (p.getStatusCode() == 1 /* Success */) {
+                                finishLoadAttachment(tmpFile);
+                                return;
+                            }
+                        } else {
+                            int len = resp.getLength();
+                            if (len != 0) {
+                                // len > 0 means that Content-Length was set in the headers
+                                // len < 0 means "chunked" transfer-encoding
+                                ItemOperationsParser.readChunked(is, os,
+                                        (len < 0) ? mAttachmentSize : len, null);
+                                finishLoadAttachment(tmpFile);
+                                return;
+                            }
+                        }
+                    } catch (FileNotFoundException e) {
+                        mService.errorLog("Can't get attachment; write file not found?");
+                        doStatusCallback(EmailServiceStatus.ATTACHMENT_NOT_FOUND);
+                    } finally {
+                        close(is);
+                        close(os);
+                        if (tmpFile != null) {
+                            tmpFile.delete();
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // Report the error, but also report back to the service
+            doStatusCallback(EmailServiceStatus.CONNECTION_ERROR);
+            throw e;
+        } finally {
+            if (resp != null) {
+                resp.close();
+            }
+        }
+    }
+}

diff --git a/exchange2/src/com/android/exchange/adapter/Base64InputStream.java b/src/com/android/exchange/adapter/Base64InputStream.java
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/Base64InputStream.java
rename to src/com/android/exchange/adapter/Base64InputStream.java


diff --git a/exchange2/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
similarity index 75%
rename from exchange2/src/com/android/exchange/adapter/CalendarSyncAdapter.java
rename to src/com/android/exchange/adapter/CalendarSyncAdapter.java
index c9c3ba2..71b5fbe 100644
--- a/exchange2/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java

@@ -19,10 +19,10 @@
 
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.Entity;
 import android.content.Entity.NamedContentValues;
 import android.content.EntityIterator;
@@ -41,20 +41,21 @@
 import android.provider.ContactsContract.RawContacts;
 import android.provider.SyncStateContract;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.android.calendarcommon2.DateException;
 import com.android.calendarcommon2.Duration;
-import com.android.emailcommon.AccountManagerTypes;
+import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.utility.Utility;
 import com.android.exchange.CommandStatusException;
 import com.android.exchange.Eas;
-import com.android.exchange.EasOutboxService;
 import com.android.exchange.EasSyncService;
 import com.android.exchange.ExchangeService;
+import com.android.exchange.R;
 import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -71,7 +72,7 @@
  */
 public class CalendarSyncAdapter extends AbstractSyncAdapter {
 
-    private static final String TAG = "EasCalendarSyncAdapter";
+    private static final String TAG = "EasCalSyncAdapter";
 
     private static final String EVENT_SAVED_TIMEZONE_COLUMN = Events.SYNC_DATA1;
     /**
@@ -102,13 +103,6 @@
     private static final String EVENT_ID_AND_NAME =
         ExtendedProperties.EVENT_ID + "=? AND " + ExtendedProperties.NAME + "=?";
 
-    // Note that we use LIKE below for its case insensitivity
-    private static final String EVENT_AND_EMAIL  =
-        Attendees.EVENT_ID + "=? AND "+ Attendees.ATTENDEE_EMAIL + " LIKE ?";
-    private static final int ATTENDEE_STATUS_COLUMN_STATUS = 0;
-    private static final String[] ATTENDEE_STATUS_PROJECTION =
-        new String[] {Attendees.ATTENDEE_STATUS};
-
     public static final String CALENDAR_SELECTION =
         Calendars.ACCOUNT_NAME + "=? AND " + Calendars.ACCOUNT_TYPE + "=?";
     private static final int CALENDAR_SELECTION_ID = 0;
@@ -163,25 +157,10 @@
     private ArrayList<Long> mSendCancelIdList = new ArrayList<Long>();
     private ArrayList<Message> mOutgoingMailList = new ArrayList<Message>();
 
-    private final Uri mAsSyncAdapterAttendees;
-    private final Uri mAsSyncAdapterEvents;
-    private final Uri mAsSyncAdapterReminders;
-    private final Uri mAsSyncAdapterExtendedProperties;
-
     public CalendarSyncAdapter(EasSyncService service) {
         super(service);
         mEmailAddress = mAccount.mEmailAddress;
 
-        String amType = Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE;
-        mAsSyncAdapterAttendees =
-                asSyncAdapter(Attendees.CONTENT_URI, mEmailAddress, amType);
-        mAsSyncAdapterEvents =
-                asSyncAdapter(Events.CONTENT_URI, mEmailAddress, amType);
-        mAsSyncAdapterReminders =
-                asSyncAdapter(Reminders.CONTENT_URI, mEmailAddress, amType);
-        mAsSyncAdapterExtendedProperties =
-                asSyncAdapter(ExtendedProperties.CONTENT_URI, mEmailAddress, amType);
-
         Cursor c = mService.mContentResolver.query(Calendars.CONTENT_URI,
                 new String[] {Calendars._ID}, CALENDAR_SELECTION,
                 new String[] {mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE}, null);
@@ -190,7 +169,8 @@
             if (c.moveToFirst()) {
                 mCalendarId = c.getLong(CALENDAR_SELECTION_ID);
             } else {
-                mCalendarId = CalendarUtilities.createCalendar(mService, mAccount, mMailbox);
+                mCalendarId = CalendarUtilities.createCalendar(mService.mContext,
+                        mService.mContentResolver, mAccount, mMailbox);
             }
             mCalendarIdString = Long.toString(mCalendarId);
             mCalendarIdArgument = new String[] {mCalendarIdString};
@@ -212,12 +192,13 @@
     public void wipe() {
         // Delete the calendar associated with this account
         // CalendarProvider2 does NOT handle selection arguments in deletions
+        String amType = mContext.getString(R.string.account_manager_type_exchange);
         mContentResolver.delete(
                 asSyncAdapter(Calendars.CONTENT_URI, mEmailAddress,
                         Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
                 Calendars.ACCOUNT_NAME + "=" + DatabaseUtils.sqlEscapeString(mEmailAddress)
                         + " AND " + Calendars.ACCOUNT_TYPE + "="
-                        + DatabaseUtils.sqlEscapeString(AccountManagerTypes.TYPE_EXCHANGE), null);
+                        + DatabaseUtils.sqlEscapeString(amType), null);
         // Invalidate our calendar observers
         ExchangeService.unregisterCalendarObservers();
     }
@@ -313,20 +294,41 @@
         }
     }
 
-    public class EasCalendarSyncParser extends AbstractSyncParser {
+    public static class EasCalendarSyncParser extends AbstractSyncParser {
+        private final TimeZone mLocalTimeZone = TimeZone.getDefault();
+        private final long mCalendarId;
+        private final android.accounts.Account mAccountManagerAccount;
+        private final Uri mAsSyncAdapterAttendees;
+        private final Uri mAsSyncAdapterEvents;
 
         String[] mBindArgument = new String[1];
-        Uri mAccountUri;
-        CalendarOperations mOps = new CalendarOperations();
+        final CalendarOperations mOps;
+
+        public EasCalendarSyncParser(final Context context, final ContentResolver resolver,
+                final InputStream in, final Mailbox mailbox, final Account account,
+                final android.accounts.Account accountManagerAccount,
+                final long calendarId) throws IOException {
+            super(context, resolver, in, mailbox, account);
+            mAccountManagerAccount = accountManagerAccount;
+            mCalendarId = calendarId;
+            mAsSyncAdapterAttendees = asSyncAdapter(Attendees.CONTENT_URI,
+                    mAccount.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+            mAsSyncAdapterEvents = asSyncAdapter(Events.CONTENT_URI,
+                    mAccount.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+            mOps = new CalendarOperations(resolver, mAsSyncAdapterAttendees, mAsSyncAdapterEvents,
+                    asSyncAdapter(Reminders.CONTENT_URI, mAccount.mEmailAddress,
+                            Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+                    asSyncAdapter(ExtendedProperties.CONTENT_URI, mAccount.mEmailAddress,
+                            Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE));
+        }
 
         public EasCalendarSyncParser(InputStream in, CalendarSyncAdapter adapter)
                 throws IOException {
-            super(in, adapter);
-            setLoggingTag("CalendarParser");
-            mAccountUri = Events.CONTENT_URI;
+            this(adapter.mContext, adapter.mContentResolver, in, adapter.mMailbox, adapter.mAccount,
+                    adapter.mAccountManagerAccount, adapter.mCalendarId);
         }
 
-        private void addOrganizerToAttendees(CalendarOperations ops, long eventId,
+        private static void addOrganizerToAttendees(CalendarOperations ops, long eventId,
                 String organizerName, String organizerEmail) {
             // Handle the organizer (who IS an attendee on device, but NOT in EAS)
             if (organizerName != null || organizerEmail != null) {
@@ -388,7 +390,7 @@
                 Integer ade = cv.getAsInteger(Events.ORIGINAL_ALL_DAY);
                 if (ade != null && ade != 0) {
                     long exceptionTime = cv.getAsLong(Events.ORIGINAL_INSTANCE_TIME);
-                    GregorianCalendar cal = new GregorianCalendar(UTC_TIMEZONE);
+                    final GregorianCalendar cal = new GregorianCalendar(UTC_TIMEZONE);
                     exceptionTime = CalendarUtilities.getUtcAllDayCalendarTime(exceptionTime,
                             mLocalTimeZone);
                     cal.setTimeInMillis(exceptionTime);
@@ -510,7 +512,7 @@
                         break;
                     case Tags.CALENDAR_ATTENDEES:
                         // If eventId >= 0, this is an update; otherwise, a new Event
-                        attendeeValues = attendeesParser(ops, eventId);
+                        attendeeValues = attendeesParser();
                         break;
                     case Tags.BASE_BODY:
                         cv.put(Events.DESCRIPTION, bodyParser());
@@ -594,7 +596,7 @@
                         responseType = getValueInt();
                         break;
                     case Tags.CALENDAR_CATEGORIES:
-                        String categories = categoriesParser(ops);
+                        String categories = categoriesParser();
                         if (categories.length() > 0) {
                             ops.newExtendedProperty(EXTENDED_PROPERTY_CATEGORIES, categories);
                         }
@@ -616,7 +618,7 @@
             }
 
             // Note that organizerEmail can be null with a DTSTAMP only change from the server
-            boolean selfOrganizer = (mEmailAddress.equals(organizerEmail));
+            boolean selfOrganizer = (mAccount.mEmailAddress.equals(organizerEmail));
 
             // Store email addresses of attendees (in a tokenizable string) in ExtendedProperties
             // If the user is an attendee, set the attendee status using busyStatus (note that the
@@ -647,14 +649,14 @@
                 }
                 // Tell UI that we don't have any attendees
                 cv.put(Events.HAS_ATTENDEE_DATA, "0");
-                mService.userLog("Maximum number of attendees exceeded; redacting");
+                LogUtils.i(TAG, "Maximum number of attendees exceeded; redacting");
             } else if (numAttendees > 0) {
                 StringBuilder sb = new StringBuilder();
                 for (ContentValues attendee: attendeeValues) {
                     String attendeeEmail = attendee.getAsString(Attendees.ATTENDEE_EMAIL);
                     sb.append(attendeeEmail);
                     sb.append(ATTENDEE_TOKENIZER_DELIMITER);
-                    if (mEmailAddress.equalsIgnoreCase(attendeeEmail)) {
+                    if (mAccount.mEmailAddress.equalsIgnoreCase(attendeeEmail)) {
                         int attendeeStatus;
                         // We'll use the response type (EAS 14), if we've got one; otherwise, we'll
                         // try to infer it from busy status
@@ -947,7 +949,7 @@
                     // Note that the exception at which we surpass the redaction limit might have
                     // any number of attendees shown; since this is an edge case and a workaround,
                     // it seems to be an acceptable implementation
-                    if (mEmailAddress.equalsIgnoreCase(attendeeEmail)) {
+                    if (mAccount.mEmailAddress.equalsIgnoreCase(attendeeEmail)) {
                         attValues.put(Attendees.ATTENDEE_STATUS,
                                 CalendarUtilities.attendeeStatusFromBusyStatus(busyStatus));
                         ops.newAttendee(attValues, exceptionStart);
@@ -963,11 +965,11 @@
                 ops.newReminder(reminderMins, exceptionStart);
             }
             if (attendeesRedacted) {
-                mService.userLog("Attendees redacted in this exception");
+                LogUtils.i(TAG, "Attendees redacted in this exception");
             }
         }
 
-        private int encodeVisibility(int easVisibility) {
+        private static int encodeVisibility(int easVisibility) {
             int visibility = 0;
             switch(easVisibility) {
                 case 0:
@@ -1001,7 +1003,7 @@
             }
         }
 
-        private String categoriesParser(CalendarOperations ops) throws IOException {
+        private String categoriesParser() throws IOException {
             StringBuilder categories = new StringBuilder();
             while (nextTag(Tags.CALENDAR_CATEGORIES) != END) {
                 switch (tag) {
@@ -1033,14 +1035,14 @@
             }
         }
 
-        private ArrayList<ContentValues> attendeesParser(CalendarOperations ops, long eventId)
+        private ArrayList<ContentValues> attendeesParser()
                 throws IOException {
             int attendeeCount = 0;
             ArrayList<ContentValues> attendeeValues = new ArrayList<ContentValues>();
             while (nextTag(Tags.CALENDAR_ATTENDEES) != END) {
                 switch (tag) {
                     case Tags.CALENDAR_ATTENDEE:
-                        ContentValues cv = attendeeParser(ops, eventId);
+                        ContentValues cv = attendeeParser();
                         // If we're going to redact these attendees anyway, let's avoid unnecessary
                         // memory pressure, and not keep them around
                         // We still need to parse them all, however
@@ -1058,7 +1060,7 @@
             return attendeeValues;
         }
 
-        private ContentValues attendeeParser(CalendarOperations ops, long eventId)
+        private ContentValues attendeeParser()
                 throws IOException {
             ContentValues cv = new ContentValues();
             while (nextTag(Tags.CALENDAR_ATTENDEE) != END) {
@@ -1134,13 +1136,14 @@
         }
 
         private Cursor getServerIdCursor(String serverId) {
-            return mContentResolver.query(mAccountUri, ID_PROJECTION, SERVER_ID_AND_CALENDAR_ID,
-                    new String[] {serverId, mCalendarIdString}, null);
+            return mContentResolver.query(Events.CONTENT_URI, ID_PROJECTION,
+                    SERVER_ID_AND_CALENDAR_ID, new String[] {serverId, Long.toString(mCalendarId)},
+                    null);
         }
 
         private Cursor getClientIdCursor(String clientId) {
             mBindArgument[0] = clientId;
-            return mContentResolver.query(mAccountUri, ID_PROJECTION, CLIENT_ID_SELECTION,
+            return mContentResolver.query(Events.CONTENT_URI, ID_PROJECTION, CLIENT_ID_SELECTION,
                     mBindArgument, null);
         }
 
@@ -1195,13 +1198,10 @@
             while (nextTag(Tags.SYNC_COMMANDS) != END) {
                 if (tag == Tags.SYNC_ADD) {
                     addParser(mOps);
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_DELETE) {
                     deleteParser(mOps);
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_CHANGE) {
                     changeParser(mOps);
-                    incrementChangeCount();
                 } else
                     skipTag();
             }
@@ -1212,63 +1212,17 @@
             userLog("Calendar SyncKey saved as: ", mMailbox.mSyncKey);
             // Save the syncKey here, using the Helper provider by Calendar provider
             mOps.add(new Operation(SyncStateContract.Helpers.newSetOperation(
-                    asSyncAdapter(SyncState.CONTENT_URI, mEmailAddress,
+                    asSyncAdapter(SyncState.CONTENT_URI, mAccount.mEmailAddress,
                             Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
                     mAccountManagerAccount,
                     mMailbox.mSyncKey.getBytes())));
 
-            // We need to send cancellations now, because the Event won't exist after the commit
-            for (long eventId: mSendCancelIdList) {
-                EmailContent.Message msg;
-                try {
-                    msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
-                            EmailContent.Message.FLAG_OUTGOING_MEETING_CANCEL, null,
-                            mAccount);
-                } catch (RemoteException e) {
-                    // Nothing to do here; the Event may no longer exist
-                    continue;
-                }
-                if (msg != null) {
-                    EasOutboxService.sendMessage(mContext, mAccount.mId, msg);
-                }
-            }
-
             // Execute our CPO's safely
             try {
-                mOps.mResults = safeExecute(CalendarContract.AUTHORITY, mOps);
+                safeExecute(mContentResolver, CalendarContract.AUTHORITY, mOps);
             } catch (RemoteException e) {
                 throw new IOException("Remote exception caught; will retry");
             }
-
-            if (mOps.mResults != null) {
-                // Clear dirty and mark flags for updates sent to server
-                if (!mUploadedIdList.isEmpty())  {
-                    ContentValues cv = new ContentValues();
-                    cv.put(Events.DIRTY, 0);
-                    cv.put(EVENT_SYNC_MARK, "0");
-                    for (long eventId : mUploadedIdList) {
-                        mContentResolver.update(
-                                asSyncAdapter(
-                                        ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
-                                        mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv,
-                                null, null);
-                    }
-                }
-                // Delete events marked for deletion
-                if (!mDeletedIdList.isEmpty()) {
-                    for (long eventId : mDeletedIdList) {
-                        mContentResolver.delete(
-                                asSyncAdapter(
-                                        ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
-                                        mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null,
-                                null);
-                    }
-                }
-                // Send any queued up email (invitations replies, etc.)
-                for (Message msg: mOutgoingMailList) {
-                    EasOutboxService.sendMessage(mContext, mAccount.mId, msg);
-                }
-            }
         }
 
         public void addResponsesParser() throws IOException {
@@ -1353,11 +1307,25 @@
         }
     }
 
-    protected class CalendarOperations extends ArrayList<Operation> {
+    protected static class CalendarOperations extends ArrayList<Operation> {
         private static final long serialVersionUID = 1L;
         public int mCount = 0;
-        private ContentProviderResult[] mResults = null;
         private int mEventStart = 0;
+        private final ContentResolver mContentResolver;
+        private final Uri mAsSyncAdapterAttendees;
+        private final Uri mAsSyncAdapterEvents;
+        private final Uri mAsSyncAdapterReminders;
+        private final Uri mAsSyncAdapterExtendedProperties;
+
+        public CalendarOperations(final ContentResolver contentResolver,
+                final Uri asSyncAdapterAttendees, final Uri asSyncAdapterEvents,
+                final Uri asSyncAdapterReminders, final Uri asSyncAdapterExtendedProperties) {
+            mContentResolver = contentResolver;
+            mAsSyncAdapterAttendees = asSyncAdapterAttendees;
+            mAsSyncAdapterEvents = asSyncAdapterEvents;
+            mAsSyncAdapterReminders = asSyncAdapterReminders;
+            mAsSyncAdapterExtendedProperties = asSyncAdapterExtendedProperties;
+        }
 
         @Override
         public boolean add(Operation op) {
@@ -1410,7 +1378,7 @@
 
         public void updatedExtendedProperty(String name, String value, long id) {
             // Find an existing ExtendedProperties row for this event and property name
-            Cursor c = mService.mContentResolver.query(ExtendedProperties.CONTENT_URI,
+            Cursor c = mContentResolver.query(ExtendedProperties.CONTENT_URI,
                     EXTENDED_PROPERTY_PROJECTION, EVENT_ID_AND_NAME,
                     new String[] {Long.toString(id), name}, null);
             long extendedPropertyId = -1;
@@ -1459,7 +1427,7 @@
         }
     }
 
-    private String decodeVisibility(int visibility) {
+    private static String decodeVisibility(int visibility) {
         int easVisibility = 0;
         switch(visibility) {
             case Events.ACCESS_DEFAULT:
@@ -1478,7 +1446,7 @@
         return Integer.toString(easVisibility);
     }
 
-    private int getInt(ContentValues cv, String column) {
+    private static int getInt(ContentValues cv, String column) {
         Integer i = cv.getAsInteger(column);
         if (i == null) return 0;
         return i;
@@ -1774,385 +1742,380 @@
             return false;
         }
 
+        // We've got to handle exceptions as part of the parent when changes occur, so we need
+        // to find new/changed exceptions and mark the parent dirty
+        ArrayList<Long> orphanedExceptions = new ArrayList<Long>();
+        Cursor c = cr.query(Events.CONTENT_URI, ORIGINAL_EVENT_PROJECTION,
+                DIRTY_EXCEPTION_IN_CALENDAR, mCalendarIdArgument, null);
         try {
-            // We've got to handle exceptions as part of the parent when changes occur, so we need
-            // to find new/changed exceptions and mark the parent dirty
-            ArrayList<Long> orphanedExceptions = new ArrayList<Long>();
-            Cursor c = cr.query(Events.CONTENT_URI, ORIGINAL_EVENT_PROJECTION,
-                    DIRTY_EXCEPTION_IN_CALENDAR, mCalendarIdArgument, null);
-            try {
-                ContentValues cv = new ContentValues();
-                // We use _sync_mark here to distinguish dirty parents from parents with dirty
-                // exceptions
-                cv.put(EVENT_SYNC_MARK, "1");
-                while (c.moveToNext()) {
-                    // Mark the parents of dirty exceptions
-                    long parentId = c.getLong(0);
-                    int cnt = cr.update(
-                            asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
-                                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv,
-                            EVENT_ID_AND_CALENDAR_ID, new String[] {
-                                    Long.toString(parentId), mCalendarIdString
-                            });
-                    // Keep track of any orphaned exceptions
-                    if (cnt == 0) {
-                        orphanedExceptions.add(c.getLong(1));
+            ContentValues cv = new ContentValues();
+            // We use _sync_mark here to distinguish dirty parents from parents with dirty
+            // exceptions
+            cv.put(EVENT_SYNC_MARK, "1");
+            while (c.moveToNext()) {
+                // Mark the parents of dirty exceptions
+                long parentId = c.getLong(0);
+                int cnt = cr.update(
+                        asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
+                                Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv,
+                        EVENT_ID_AND_CALENDAR_ID, new String[] {
+                                Long.toString(parentId), mCalendarIdString
+                        });
+                // Keep track of any orphaned exceptions
+                if (cnt == 0) {
+                    orphanedExceptions.add(c.getLong(1));
+                }
+            }
+        } finally {
+            c.close();
+        }
+
+        // Delete any orphaned exceptions
+        for (long orphan : orphanedExceptions) {
+            userLog(TAG, "Deleted orphaned exception: " + orphan);
+            cr.delete(
+                    asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, orphan),
+                            mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null, null);
+        }
+        orphanedExceptions.clear();
+
+        // Now we can go through dirty/marked top-level events and send them
+        // back to the server
+        EntityIterator eventIterator = EventsEntity.newEntityIterator(cr.query(
+                asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
+                        Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null,
+                DIRTY_OR_MARKED_TOP_LEVEL_IN_CALENDAR, mCalendarIdArgument, null), cr);
+        ContentValues cidValues = new ContentValues();
+
+        try {
+            boolean first = true;
+            while (eventIterator.hasNext()) {
+                Entity entity = eventIterator.next();
+
+                // For each of these entities, create the change commands
+                ContentValues entityValues = entity.getEntityValues();
+                String serverId = entityValues.getAsString(Events._SYNC_ID);
+
+                // We first need to check whether we can upsync this event; our test for this
+                // is currently the value of EXTENDED_PROPERTY_ATTENDEES_REDACTED
+                // If this is set to "1", we can't upsync the event
+                for (NamedContentValues ncv: entity.getSubValues()) {
+                    if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
+                        ContentValues ncvValues = ncv.values;
+                        if (ncvValues.getAsString(ExtendedProperties.NAME).equals(
+                                EXTENDED_PROPERTY_UPSYNC_PROHIBITED)) {
+                            if ("1".equals(ncvValues.getAsString(ExtendedProperties.VALUE))) {
+                                // Make sure we mark this to clear the dirty flag
+                                mUploadedIdList.add(entityValues.getAsLong(Events._ID));
+                                continue;
+                            }
+                        }
                     }
                 }
-            } finally {
-                c.close();
-            }
 
-            // Delete any orphaned exceptions
-            for (long orphan : orphanedExceptions) {
-                userLog(TAG, "Deleted orphaned exception: " + orphan);
-                cr.delete(
-                        asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, orphan),
-                                mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null, null);
-            }
-            orphanedExceptions.clear();
+                // Find our uid in the entity; otherwise create one
+                String clientId = entityValues.getAsString(Events.SYNC_DATA2);
+                if (clientId == null) {
+                    clientId = UUID.randomUUID().toString();
+                }
 
-            // Now we can go through dirty/marked top-level events and send them
-            // back to the server
-            EntityIterator eventIterator = EventsEntity.newEntityIterator(cr.query(
-                    asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
-                            Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null,
-                    DIRTY_OR_MARKED_TOP_LEVEL_IN_CALENDAR, mCalendarIdArgument, null), cr);
-            ContentValues cidValues = new ContentValues();
+                // EAS 2.5 needs: BusyStatus DtStamp EndTime Sensitivity StartTime TimeZone UID
+                // We can generate all but what we're testing for below
+                String organizerEmail = entityValues.getAsString(Events.ORGANIZER);
+                boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mEmailAddress);
 
-            try {
-                boolean first = true;
-                while (eventIterator.hasNext()) {
-                    Entity entity = eventIterator.next();
+                if (!entityValues.containsKey(Events.DTSTART)
+                        || (!entityValues.containsKey(Events.DURATION) &&
+                                !entityValues.containsKey(Events.DTEND))) {
+                    continue;
+                }
 
-                    // For each of these entities, create the change commands
-                    ContentValues entityValues = entity.getEntityValues();
-                    String serverId = entityValues.getAsString(Events._SYNC_ID);
-
-                    // We first need to check whether we can upsync this event; our test for this
-                    // is currently the value of EXTENDED_PROPERTY_ATTENDEES_REDACTED
-                    // If this is set to "1", we can't upsync the event
-                    for (NamedContentValues ncv: entity.getSubValues()) {
-                        if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
-                            ContentValues ncvValues = ncv.values;
-                            if (ncvValues.getAsString(ExtendedProperties.NAME).equals(
-                                    EXTENDED_PROPERTY_UPSYNC_PROHIBITED)) {
-                                if ("1".equals(ncvValues.getAsString(ExtendedProperties.VALUE))) {
-                                    // Make sure we mark this to clear the dirty flag
-                                    mUploadedIdList.add(entityValues.getAsLong(Events._ID));
-                                    continue;
-                                }
-                            }
+                if (first) {
+                    s.start(Tags.SYNC_COMMANDS);
+                    userLog("Sending Calendar changes to the server");
+                    first = false;
+                }
+                long eventId = entityValues.getAsLong(Events._ID);
+                if (serverId == null) {
+                    // This is a new event; create a clientId
+                    userLog("Creating new event with clientId: ", clientId);
+                    s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
+                    // And save it in the Event as the local id
+                    cidValues.put(Events.SYNC_DATA2, clientId);
+                    cidValues.put(EVENT_SYNC_VERSION, "0");
+                    cr.update(
+                            asSyncAdapter(
+                                    ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
+                                    mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+                            cidValues, null, null);
+                } else {
+                    if (entityValues.getAsInteger(Events.DELETED) == 1) {
+                        userLog("Deleting event with serverId: ", serverId);
+                        s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
+                        mDeletedIdList.add(eventId);
+                        if (selfOrganizer) {
+                            mSendCancelIdList.add(eventId);
+                        } else {
+                            sendDeclinedEmail(entity, clientId);
                         }
-                    }
-
-                    // Find our uid in the entity; otherwise create one
-                    String clientId = entityValues.getAsString(Events.SYNC_DATA2);
-                    if (clientId == null) {
-                        clientId = UUID.randomUUID().toString();
-                    }
-
-                    // EAS 2.5 needs: BusyStatus DtStamp EndTime Sensitivity StartTime TimeZone UID
-                    // We can generate all but what we're testing for below
-                    String organizerEmail = entityValues.getAsString(Events.ORGANIZER);
-                    boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mEmailAddress);
-
-                    if (!entityValues.containsKey(Events.DTSTART)
-                            || (!entityValues.containsKey(Events.DURATION) &&
-                                    !entityValues.containsKey(Events.DTEND))
-                                    || organizerEmail == null) {
                         continue;
                     }
-
-                    if (first) {
-                        s.start(Tags.SYNC_COMMANDS);
-                        userLog("Sending Calendar changes to the server");
-                        first = false;
-                    }
-                    long eventId = entityValues.getAsLong(Events._ID);
-                    if (serverId == null) {
-                        // This is a new event; create a clientId
-                        userLog("Creating new event with clientId: ", clientId);
-                        s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
-                        // And save it in the Event as the local id
-                        cidValues.put(Events.SYNC_DATA2, clientId);
-                        cidValues.put(EVENT_SYNC_VERSION, "0");
-                        cr.update(
-                                asSyncAdapter(
-                                        ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
-                                        mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
-                                cidValues, null, null);
+                    userLog("Upsync change to event with serverId: " + serverId);
+                    // Get the current version
+                    String version = entityValues.getAsString(EVENT_SYNC_VERSION);
+                    // This should never be null, but catch this error anyway
+                    // Version should be "0" when we create the event, so use that
+                    if (version == null) {
+                        version = "0";
                     } else {
-                        if (entityValues.getAsInteger(Events.DELETED) == 1) {
-                            userLog("Deleting event with serverId: ", serverId);
-                            s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
-                            mDeletedIdList.add(eventId);
-                            if (selfOrganizer) {
-                                mSendCancelIdList.add(eventId);
-                            } else {
-                                sendDeclinedEmail(entity, clientId);
-                            }
-                            continue;
-                        }
-                        userLog("Upsync change to event with serverId: " + serverId);
-                        // Get the current version
-                        String version = entityValues.getAsString(EVENT_SYNC_VERSION);
-                        // This should never be null, but catch this error anyway
-                        // Version should be "0" when we create the event, so use that
-                        if (version == null) {
+                        // Increment and save
+                        try {
+                            version = Integer.toString((Integer.parseInt(version) + 1));
+                        } catch (Exception e) {
+                            // Handle the case in which someone writes a non-integer here;
+                            // shouldn't happen, but we don't want to kill the sync for his
                             version = "0";
-                        } else {
-                            // Increment and save
-                            try {
-                                version = Integer.toString((Integer.parseInt(version) + 1));
-                            } catch (Exception e) {
-                                // Handle the case in which someone writes a non-integer here;
-                                // shouldn't happen, but we don't want to kill the sync for his
-                                version = "0";
-                            }
-                        }
-                        cidValues.put(EVENT_SYNC_VERSION, version);
-                        // Also save in entityValues so that we send it this time around
-                        entityValues.put(EVENT_SYNC_VERSION, version);
-                        cr.update(
-                                asSyncAdapter(
-                                        ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
-                                        mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
-                                cidValues, null, null);
-                        s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
-                    }
-                    s.start(Tags.SYNC_APPLICATION_DATA);
-
-                    sendEvent(entity, clientId, s);
-
-                    // Now, the hard part; find exceptions for this event
-                    if (serverId != null) {
-                        EntityIterator exIterator = EventsEntity.newEntityIterator(cr.query(
-                                asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
-                                        Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null,
-                                ORIGINAL_EVENT_AND_CALENDAR, new String[] {
-                                        serverId, mCalendarIdString
-                                }, null), cr);
-                        boolean exFirst = true;
-                        while (exIterator.hasNext()) {
-                            Entity exEntity = exIterator.next();
-                            if (exFirst) {
-                                s.start(Tags.CALENDAR_EXCEPTIONS);
-                                exFirst = false;
-                            }
-                            s.start(Tags.CALENDAR_EXCEPTION);
-                            sendEvent(exEntity, null, s);
-                            ContentValues exValues = exEntity.getEntityValues();
-                            if (getInt(exValues, Events.DIRTY) == 1) {
-                                // This is a new/updated exception, so we've got to notify our
-                                // attendees about it
-                                long exEventId = exValues.getAsLong(Events._ID);
-                                int flag;
-
-                                // Copy subvalues into the exception; otherwise, we won't see the
-                                // attendees when preparing the message
-                                for (NamedContentValues ncv: entity.getSubValues()) {
-                                    exEntity.addSubValue(ncv.uri, ncv.values);
-                                }
-
-                                if ((getInt(exValues, Events.DELETED) == 1) ||
-                                        (getInt(exValues, Events.STATUS) ==
-                                            Events.STATUS_CANCELED)) {
-                                    flag = Message.FLAG_OUTGOING_MEETING_CANCEL;
-                                    if (!selfOrganizer) {
-                                        // Send a cancellation notice to the organizer
-                                        // Since CalendarProvider2 sets the organizer of exceptions
-                                        // to the user, we have to reset it first to the original
-                                        // organizer
-                                        exValues.put(Events.ORGANIZER,
-                                                entityValues.getAsString(Events.ORGANIZER));
-                                        sendDeclinedEmail(exEntity, clientId);
-                                    }
-                                } else {
-                                    flag = Message.FLAG_OUTGOING_MEETING_INVITE;
-                                }
-                                // Add the eventId of the exception to the uploaded id list, so that
-                                // the dirty/mark bits are cleared
-                                mUploadedIdList.add(exEventId);
-
-                                // Copy version so the ics attachment shows the proper sequence #
-                                exValues.put(EVENT_SYNC_VERSION,
-                                        entityValues.getAsString(EVENT_SYNC_VERSION));
-                                // Copy location so that it's included in the outgoing email
-                                if (entityValues.containsKey(Events.EVENT_LOCATION)) {
-                                    exValues.put(Events.EVENT_LOCATION,
-                                            entityValues.getAsString(Events.EVENT_LOCATION));
-                                }
-
-                                if (selfOrganizer) {
-                                    Message msg =
-                                        CalendarUtilities.createMessageForEntity(mContext,
-                                                exEntity, flag, clientId, mAccount);
-                                    if (msg != null) {
-                                        userLog("Queueing exception update to " + msg.mTo);
-                                        mOutgoingMailList.add(msg);
-                                    }
-                                }
-                            }
-                            s.end(); // EXCEPTION
-                        }
-                        if (!exFirst) {
-                            s.end(); // EXCEPTIONS
                         }
                     }
-
-                    s.end().end(); // ApplicationData & Change
-                    mUploadedIdList.add(eventId);
-
-                    // Go through the extended properties of this Event and pull out our tokenized
-                    // attendees list and the user attendee status; we will need them later
-                    String attendeeString = null;
-                    long attendeeStringId = -1;
-                    String userAttendeeStatus = null;
-                    long userAttendeeStatusId = -1;
-                    for (NamedContentValues ncv: entity.getSubValues()) {
-                        if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
-                            ContentValues ncvValues = ncv.values;
-                            String propertyName =
-                                ncvValues.getAsString(ExtendedProperties.NAME);
-                            if (propertyName.equals(EXTENDED_PROPERTY_ATTENDEES)) {
-                                attendeeString =
-                                    ncvValues.getAsString(ExtendedProperties.VALUE);
-                                attendeeStringId =
-                                    ncvValues.getAsLong(ExtendedProperties._ID);
-                            } else if (propertyName.equals(
-                                    EXTENDED_PROPERTY_USER_ATTENDEE_STATUS)) {
-                                userAttendeeStatus =
-                                    ncvValues.getAsString(ExtendedProperties.VALUE);
-                                userAttendeeStatusId =
-                                    ncvValues.getAsLong(ExtendedProperties._ID);
-                            }
-                        }
-                    }
-
-                    // Send the meeting invite if there are attendees and we're the organizer AND
-                    // if the Event itself is dirty (we might be syncing only because an exception
-                    // is dirty, in which case we DON'T send email about the Event)
-                    if (selfOrganizer &&
-                            (getInt(entityValues, Events.DIRTY) == 1)) {
-                        EmailContent.Message msg =
-                            CalendarUtilities.createMessageForEventId(mContext, eventId,
-                                    EmailContent.Message.FLAG_OUTGOING_MEETING_INVITE, clientId,
-                                    mAccount);
-                        if (msg != null) {
-                            userLog("Queueing invitation to ", msg.mTo);
-                            mOutgoingMailList.add(msg);
-                        }
-                        // Make a list out of our tokenized attendees, if we have any
-                        ArrayList<String> originalAttendeeList = new ArrayList<String>();
-                        if (attendeeString != null) {
-                            StringTokenizer st =
-                                new StringTokenizer(attendeeString, ATTENDEE_TOKENIZER_DELIMITER);
-                            while (st.hasMoreTokens()) {
-                                originalAttendeeList.add(st.nextToken());
-                            }
-                        }
-                        StringBuilder newTokenizedAttendees = new StringBuilder();
-                        // See if any attendees have been dropped and while we're at it, build
-                        // an updated String with tokenized attendee addresses
-                        for (NamedContentValues ncv: entity.getSubValues()) {
-                            if (ncv.uri.equals(Attendees.CONTENT_URI)) {
-                                String attendeeEmail =
-                                    ncv.values.getAsString(Attendees.ATTENDEE_EMAIL);
-                                // Remove all found attendees
-                                originalAttendeeList.remove(attendeeEmail);
-                                newTokenizedAttendees.append(attendeeEmail);
-                                newTokenizedAttendees.append(ATTENDEE_TOKENIZER_DELIMITER);
-                            }
-                        }
-                        // Update extended properties with the new attendee list, if we have one
-                        // Otherwise, create one (this would be the case for Events created on
-                        // device or "legacy" events (before this code was added)
-                        ContentValues cv = new ContentValues();
-                        cv.put(ExtendedProperties.VALUE, newTokenizedAttendees.toString());
-                        if (attendeeString != null) {
-                            cr.update(asSyncAdapter(ContentUris.withAppendedId(
-                                    ExtendedProperties.CONTENT_URI, attendeeStringId),
+                    cidValues.put(EVENT_SYNC_VERSION, version);
+                    // Also save in entityValues so that we send it this time around
+                    entityValues.put(EVENT_SYNC_VERSION, version);
+                    cr.update(
+                            asSyncAdapter(
+                                    ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
                                     mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
-                                    cv, null, null);
-                        } else {
-                            // If there wasn't an "attendees" property, insert one
-                            cv.put(ExtendedProperties.NAME, EXTENDED_PROPERTY_ATTENDEES);
-                            cv.put(ExtendedProperties.EVENT_ID, eventId);
-                            cr.insert(asSyncAdapter(ExtendedProperties.CONTENT_URI,
-                                    mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv);
+                            cidValues, null, null);
+                    s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
+                }
+                s.start(Tags.SYNC_APPLICATION_DATA);
+
+                sendEvent(entity, clientId, s);
+
+                // Now, the hard part; find exceptions for this event
+                if (serverId != null) {
+                    EntityIterator exIterator = EventsEntity.newEntityIterator(cr.query(
+                            asSyncAdapter(Events.CONTENT_URI, mEmailAddress,
+                                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), null,
+                            ORIGINAL_EVENT_AND_CALENDAR, new String[] {
+                                    serverId, mCalendarIdString
+                            }, null), cr);
+                    boolean exFirst = true;
+                    while (exIterator.hasNext()) {
+                        Entity exEntity = exIterator.next();
+                        if (exFirst) {
+                            s.start(Tags.CALENDAR_EXCEPTIONS);
+                            exFirst = false;
                         }
-                        // Whoever is left has been removed from the attendee list; send them
-                        // a cancellation
-                        for (String removedAttendee: originalAttendeeList) {
-                            // Send a cancellation message to each of them
-                            msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
-                                    Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount,
-                                    removedAttendee);
-                            if (msg != null) {
-                                // Just send it to the removed attendee
-                                userLog("Queueing cancellation to removed attendee " + msg.mTo);
-                                mOutgoingMailList.add(msg);
+                        s.start(Tags.CALENDAR_EXCEPTION);
+                        sendEvent(exEntity, null, s);
+                        ContentValues exValues = exEntity.getEntityValues();
+                        if (getInt(exValues, Events.DIRTY) == 1) {
+                            // This is a new/updated exception, so we've got to notify our
+                            // attendees about it
+                            long exEventId = exValues.getAsLong(Events._ID);
+                            int flag;
+
+                            // Copy subvalues into the exception; otherwise, we won't see the
+                            // attendees when preparing the message
+                            for (NamedContentValues ncv: entity.getSubValues()) {
+                                exEntity.addSubValue(ncv.uri, ncv.values);
                             }
-                        }
-                    } else if (!selfOrganizer) {
-                        // If we're not the organizer, see if we've changed our attendee status
-                        // Our last synced attendee status is in ExtendedProperties, and we've
-                        // retrieved it above as userAttendeeStatus
-                        int currentStatus = entityValues.getAsInteger(Events.SELF_ATTENDEE_STATUS);
-                        int syncStatus = Attendees.ATTENDEE_STATUS_NONE;
-                        if (userAttendeeStatus != null) {
-                            try {
-                                syncStatus = Integer.parseInt(userAttendeeStatus);
-                            } catch (NumberFormatException e) {
-                                // Just in case somebody else mucked with this and it's not Integer
+
+                            if ((getInt(exValues, Events.DELETED) == 1) ||
+                                    (getInt(exValues, Events.STATUS) ==
+                                        Events.STATUS_CANCELED)) {
+                                flag = Message.FLAG_OUTGOING_MEETING_CANCEL;
+                                if (!selfOrganizer) {
+                                    // Send a cancellation notice to the organizer
+                                    // Since CalendarProvider2 sets the organizer of exceptions
+                                    // to the user, we have to reset it first to the original
+                                    // organizer
+                                    exValues.put(Events.ORGANIZER,
+                                            entityValues.getAsString(Events.ORGANIZER));
+                                    sendDeclinedEmail(exEntity, clientId);
+                                }
+                            } else {
+                                flag = Message.FLAG_OUTGOING_MEETING_INVITE;
                             }
-                        }
-                        if ((currentStatus != syncStatus) &&
-                                (currentStatus != Attendees.ATTENDEE_STATUS_NONE)) {
-                            // If so, send a meeting reply
-                            int messageFlag = 0;
-                            switch (currentStatus) {
-                                case Attendees.ATTENDEE_STATUS_ACCEPTED:
-                                    messageFlag = Message.FLAG_OUTGOING_MEETING_ACCEPT;
-                                    break;
-                                case Attendees.ATTENDEE_STATUS_DECLINED:
-                                    messageFlag = Message.FLAG_OUTGOING_MEETING_DECLINE;
-                                    break;
-                                case Attendees.ATTENDEE_STATUS_TENTATIVE:
-                                    messageFlag = Message.FLAG_OUTGOING_MEETING_TENTATIVE;
-                                    break;
+                            // Add the eventId of the exception to the uploaded id list, so that
+                            // the dirty/mark bits are cleared
+                            mUploadedIdList.add(exEventId);
+
+                            // Copy version so the ics attachment shows the proper sequence #
+                            exValues.put(EVENT_SYNC_VERSION,
+                                    entityValues.getAsString(EVENT_SYNC_VERSION));
+                            // Copy location so that it's included in the outgoing email
+                            if (entityValues.containsKey(Events.EVENT_LOCATION)) {
+                                exValues.put(Events.EVENT_LOCATION,
+                                        entityValues.getAsString(Events.EVENT_LOCATION));
                             }
-                            // Make sure we have a valid status (messageFlag should never be zero)
-                            if (messageFlag != 0 && userAttendeeStatusId >= 0) {
-                                // Save away the new status
-                                cidValues.clear();
-                                cidValues.put(ExtendedProperties.VALUE,
-                                        Integer.toString(currentStatus));
-                                cr.update(asSyncAdapter(ContentUris.withAppendedId(
-                                        ExtendedProperties.CONTENT_URI, userAttendeeStatusId),
-                                        mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
-                                        cidValues, null, null);
-                                // Send mail to the organizer advising of the new status
-                                EmailContent.Message msg =
-                                    CalendarUtilities.createMessageForEventId(mContext, eventId,
-                                            messageFlag, clientId, mAccount);
+
+                            if (selfOrganizer) {
+                                Message msg =
+                                    CalendarUtilities.createMessageForEntity(mContext,
+                                            exEntity, flag, clientId, mAccount);
                                 if (msg != null) {
-                                    userLog("Queueing invitation reply to " + msg.mTo);
+                                    userLog("Queueing exception update to " + msg.mTo);
                                     mOutgoingMailList.add(msg);
                                 }
                             }
                         }
+                        s.end(); // EXCEPTION
+                    }
+                    if (!exFirst) {
+                        s.end(); // EXCEPTIONS
                     }
                 }
-                if (!first) {
-                    s.end(); // Commands
+
+                s.end().end(); // ApplicationData & Change
+                mUploadedIdList.add(eventId);
+
+                // Go through the extended properties of this Event and pull out our tokenized
+                // attendees list and the user attendee status; we will need them later
+                String attendeeString = null;
+                long attendeeStringId = -1;
+                String userAttendeeStatus = null;
+                long userAttendeeStatusId = -1;
+                for (NamedContentValues ncv: entity.getSubValues()) {
+                    if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
+                        ContentValues ncvValues = ncv.values;
+                        String propertyName =
+                            ncvValues.getAsString(ExtendedProperties.NAME);
+                        if (propertyName.equals(EXTENDED_PROPERTY_ATTENDEES)) {
+                            attendeeString =
+                                ncvValues.getAsString(ExtendedProperties.VALUE);
+                            attendeeStringId =
+                                ncvValues.getAsLong(ExtendedProperties._ID);
+                        } else if (propertyName.equals(
+                                EXTENDED_PROPERTY_USER_ATTENDEE_STATUS)) {
+                            userAttendeeStatus =
+                                ncvValues.getAsString(ExtendedProperties.VALUE);
+                            userAttendeeStatusId =
+                                ncvValues.getAsLong(ExtendedProperties._ID);
+                        }
+                    }
                 }
-            } finally {
-                eventIterator.close();
+
+                // Send the meeting invite if there are attendees and we're the organizer AND
+                // if the Event itself is dirty (we might be syncing only because an exception
+                // is dirty, in which case we DON'T send email about the Event)
+                if (selfOrganizer &&
+                        (getInt(entityValues, Events.DIRTY) == 1)) {
+                    EmailContent.Message msg =
+                        CalendarUtilities.createMessageForEventId(mContext, eventId,
+                                EmailContent.Message.FLAG_OUTGOING_MEETING_INVITE, clientId,
+                                mAccount);
+                    if (msg != null) {
+                        userLog("Queueing invitation to ", msg.mTo);
+                        mOutgoingMailList.add(msg);
+                    }
+                    // Make a list out of our tokenized attendees, if we have any
+                    ArrayList<String> originalAttendeeList = new ArrayList<String>();
+                    if (attendeeString != null) {
+                        StringTokenizer st =
+                            new StringTokenizer(attendeeString, ATTENDEE_TOKENIZER_DELIMITER);
+                        while (st.hasMoreTokens()) {
+                            originalAttendeeList.add(st.nextToken());
+                        }
+                    }
+                    StringBuilder newTokenizedAttendees = new StringBuilder();
+                    // See if any attendees have been dropped and while we're at it, build
+                    // an updated String with tokenized attendee addresses
+                    for (NamedContentValues ncv: entity.getSubValues()) {
+                        if (ncv.uri.equals(Attendees.CONTENT_URI)) {
+                            String attendeeEmail =
+                                ncv.values.getAsString(Attendees.ATTENDEE_EMAIL);
+                            // Remove all found attendees
+                            originalAttendeeList.remove(attendeeEmail);
+                            newTokenizedAttendees.append(attendeeEmail);
+                            newTokenizedAttendees.append(ATTENDEE_TOKENIZER_DELIMITER);
+                        }
+                    }
+                    // Update extended properties with the new attendee list, if we have one
+                    // Otherwise, create one (this would be the case for Events created on
+                    // device or "legacy" events (before this code was added)
+                    ContentValues cv = new ContentValues();
+                    cv.put(ExtendedProperties.VALUE, newTokenizedAttendees.toString());
+                    if (attendeeString != null) {
+                        cr.update(asSyncAdapter(ContentUris.withAppendedId(
+                                ExtendedProperties.CONTENT_URI, attendeeStringId),
+                                mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+                                cv, null, null);
+                    } else {
+                        // If there wasn't an "attendees" property, insert one
+                        cv.put(ExtendedProperties.NAME, EXTENDED_PROPERTY_ATTENDEES);
+                        cv.put(ExtendedProperties.EVENT_ID, eventId);
+                        cr.insert(asSyncAdapter(ExtendedProperties.CONTENT_URI,
+                                mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv);
+                    }
+                    // Whoever is left has been removed from the attendee list; send them
+                    // a cancellation
+                    for (String removedAttendee: originalAttendeeList) {
+                        // Send a cancellation message to each of them
+                        msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
+                                Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount,
+                                removedAttendee);
+                        if (msg != null) {
+                            // Just send it to the removed attendee
+                            userLog("Queueing cancellation to removed attendee " + msg.mTo);
+                            mOutgoingMailList.add(msg);
+                        }
+                    }
+                } else if (!selfOrganizer) {
+                    // If we're not the organizer, see if we've changed our attendee status
+                    // Our last synced attendee status is in ExtendedProperties, and we've
+                    // retrieved it above as userAttendeeStatus
+                    int currentStatus = entityValues.getAsInteger(Events.SELF_ATTENDEE_STATUS);
+                    int syncStatus = Attendees.ATTENDEE_STATUS_NONE;
+                    if (userAttendeeStatus != null) {
+                        try {
+                            syncStatus = Integer.parseInt(userAttendeeStatus);
+                        } catch (NumberFormatException e) {
+                            // Just in case somebody else mucked with this and it's not Integer
+                        }
+                    }
+                    if ((currentStatus != syncStatus) &&
+                            (currentStatus != Attendees.ATTENDEE_STATUS_NONE)) {
+                        // If so, send a meeting reply
+                        int messageFlag = 0;
+                        switch (currentStatus) {
+                            case Attendees.ATTENDEE_STATUS_ACCEPTED:
+                                messageFlag = Message.FLAG_OUTGOING_MEETING_ACCEPT;
+                                break;
+                            case Attendees.ATTENDEE_STATUS_DECLINED:
+                                messageFlag = Message.FLAG_OUTGOING_MEETING_DECLINE;
+                                break;
+                            case Attendees.ATTENDEE_STATUS_TENTATIVE:
+                                messageFlag = Message.FLAG_OUTGOING_MEETING_TENTATIVE;
+                                break;
+                        }
+                        // Make sure we have a valid status (messageFlag should never be zero)
+                        if (messageFlag != 0 && userAttendeeStatusId >= 0) {
+                            // Save away the new status
+                            cidValues.clear();
+                            cidValues.put(ExtendedProperties.VALUE,
+                                    Integer.toString(currentStatus));
+                            cr.update(asSyncAdapter(ContentUris.withAppendedId(
+                                    ExtendedProperties.CONTENT_URI, userAttendeeStatusId),
+                                    mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+                                    cidValues, null, null);
+                            // Send mail to the organizer advising of the new status
+                            EmailContent.Message msg =
+                                CalendarUtilities.createMessageForEventId(mContext, eventId,
+                                        messageFlag, clientId, mAccount);
+                            if (msg != null) {
+                                userLog("Queueing invitation reply to " + msg.mTo);
+                                mOutgoingMailList.add(msg);
+                            }
+                        }
+                    }
+                }
             }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Could not read dirty events.");
+            if (!first) {
+                s.end(); // Commands
+            }
+        } finally {
+            eventIterator.close();
         }
 
         return false;

diff --git a/exchange2/src/com/android/exchange/adapter/ContactsSyncAdapter.java b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
similarity index 93%
rename from exchange2/src/com/android/exchange/adapter/ContactsSyncAdapter.java
rename to src/com/android/exchange/adapter/ContactsSyncAdapter.java
index c0c3a48..7daaf5b 100644
--- a/exchange2/src/com/android/exchange/adapter/ContactsSyncAdapter.java
+++ b/src/com/android/exchange/adapter/ContactsSyncAdapter.java

@@ -24,6 +24,7 @@
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.Entity;
 import android.content.Entity.NamedContentValues;
 import android.content.EntityIterator;
@@ -56,13 +57,15 @@
 import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
 import android.util.Base64;
-import android.util.Log;
 
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.utility.Utility;
 import com.android.exchange.CommandStatusException;
 import com.android.exchange.Eas;
 import com.android.exchange.EasSyncService;
 import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -137,7 +140,8 @@
 
     public ContactsSyncAdapter(EasSyncService service) {
         super(service);
-        mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI);
+        mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI,
+                mAccount.mEmailAddress);
         mContentResolver = mContext.getContentResolver();
     }
 
@@ -225,11 +229,12 @@
 
     @Override
     public boolean parse(InputStream is) throws IOException, CommandStatusException {
-        EasContactsSyncParser p = new EasContactsSyncParser(is, this);
-        return p.parse();
+        final EasContactsSyncParser p = new EasContactsSyncParser(is, this);
+        final boolean returnValue = p.parse();
+        mGroupsUsed = p.isGroupsUsed();
+        return returnValue;
     }
 
-
     @Override
     public void wipe() {
         mContentResolver.delete(mAccountUri, null, null);
@@ -346,7 +351,7 @@
         }
     }
 
-    class EmailRow implements UntypedRow {
+    static class EmailRow implements UntypedRow {
         String email;
         String displayName;
 
@@ -375,7 +380,7 @@
         }
     }
 
-    class ImRow implements UntypedRow {
+    static class ImRow implements UntypedRow {
         String im;
 
         public ImRow(String _im) {
@@ -393,7 +398,7 @@
         }
     }
 
-    class PhoneRow implements UntypedRow {
+    static class PhoneRow implements UntypedRow {
         String phone;
         int type;
 
@@ -414,15 +419,32 @@
         }
     }
 
-   class EasContactsSyncParser extends AbstractSyncParser {
-
+    public static class EasContactsSyncParser extends AbstractSyncParser {
         String[] mBindArgument = new String[1];
-        String mMailboxIdAsString;
         ContactOperations ops = new ContactOperations();
+        private final android.accounts.Account mAccountManagerAccount;
+        private final Uri mAccountUri;
+        private boolean mGroupsUsed = false;
+
+        public EasContactsSyncParser(final Context context, final ContentResolver resolver,
+                final InputStream in, final Mailbox mailbox, final Account account,
+                final android.accounts.Account accountManagerAccount) throws IOException {
+            super(context, resolver, in, mailbox, account);
+            mAccountManagerAccount = accountManagerAccount;
+            mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI,
+                    mAccount.mEmailAddress);
+        }
+
+        public boolean isGroupsUsed() {
+            return mGroupsUsed;
+        }
 
         public EasContactsSyncParser(InputStream in, ContactsSyncAdapter adapter)
                 throws IOException {
             super(in, adapter);
+            mAccountManagerAccount = adapter.mAccountManagerAccount;
+            mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI,
+                    mAccount.mEmailAddress);
         }
 
         public void addData(String serverId, ContactOperations ops, Entity entity)
@@ -450,7 +472,7 @@
             ArrayList<UntypedRow> homePhones = new ArrayList<UntypedRow>();
             ArrayList<UntypedRow> workPhones = new ArrayList<UntypedRow>();
             if (entity == null) {
-                ops.newContact(serverId);
+                ops.newContact(serverId, mAccount.mEmailAddress);
             }
 
             while (nextTag(Tags.SYNC_APPLICATION_DATA) != END) {
@@ -644,21 +666,7 @@
                 }
             }
 
-            // We must have first name, last name, or company name
-            String name = null;
-            if (firstName != null || lastName != null) {
-                if (firstName == null) {
-                    name = lastName;
-                } else if (lastName == null) {
-                    name = firstName;
-                } else {
-                    name = firstName + ' ' + lastName;
-                }
-            } else if (companyName != null) {
-                name = companyName;
-            }
-
-            ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name,
+            ops.addName(entity, prefix, firstName, lastName, middleName, suffix,
                     yomiFirstName, yomiLastName);
             ops.addBusiness(entity, business);
             ops.addPersonal(entity, personal);
@@ -850,13 +858,10 @@
             while (nextTag(Tags.SYNC_COMMANDS) != END) {
                 if (tag == Tags.SYNC_ADD) {
                     addParser(ops);
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_DELETE) {
                     deleteParser(ops);
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_CHANGE) {
                     changeParser(ops);
-                    incrementChangeCount();
                 } else
                     skipTag();
             }
@@ -870,7 +875,7 @@
                     mAccountManagerAccount, mMailbox.mSyncKey.getBytes()));
 
             // Execute these all at once...
-            ops.execute();
+            ops.execute(mContext);
 
             if (ops.mResults != null) {
                 ContentValues cv = new ContentValues();
@@ -965,9 +970,9 @@
     }
 
 
-    private Uri uriWithAccountAndIsSyncAdapter(Uri uri) {
+    private static Uri uriWithAccountAndIsSyncAdapter(final Uri uri, final String emailAddress) {
         return uri.buildUpon()
-            .appendQueryParameter(RawContacts.ACCOUNT_NAME, mAccount.mEmailAddress)
+            .appendQueryParameter(RawContacts.ACCOUNT_NAME, emailAddress)
             .appendQueryParameter(RawContacts.ACCOUNT_TYPE, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE)
             .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
             .build();
@@ -980,7 +985,7 @@
      * see whether an update is even necessary.  The methods on SmartBuilder are delegated to
      * the Builder.
      */
-    private class RowBuilder {
+    private static class RowBuilder {
         Builder builder;
         ContentValues cv;
 
@@ -993,11 +998,6 @@
             cv = _ncv.values;
         }
 
-        RowBuilder withValues(ContentValues values) {
-            builder.withValues(values);
-            return this;
-        }
-
         RowBuilder withValueBackReference(String key, int previousResult) {
             builder.withValueBackReference(key, previousResult);
             return this;
@@ -1013,7 +1013,7 @@
         }
     }
 
-    private class ContactOperations extends ArrayList<ContentProviderOperation> {
+    public static class ContactOperations extends ArrayList<ContentProviderOperation> {
         private static final long serialVersionUID = 1L;
         private int mCount = 0;
         private int mContactBackValue = mCount;
@@ -1030,9 +1030,9 @@
             return true;
         }
 
-        public void newContact(String serverId) {
-            Builder builder = ContentProviderOperation
-                .newInsert(uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI));
+        public void newContact(final String serverId, final String emailAddress) {
+            Builder builder = ContentProviderOperation.newInsert(
+                    uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI, emailAddress));
             ContentValues values = new ContentValues();
             values.put(RawContacts.SOURCE_ID, serverId);
             builder.withValues(values);
@@ -1050,23 +1050,18 @@
                     .build());
         }
 
-        public void execute() {
-            synchronized (mService.getSynchronizer()) {
-                if (!mService.isStopped()) {
-                    try {
-                        if (!isEmpty()) {
-                            mService.userLog("Executing ", size(), " CPO's");
-                            mResults = mContext.getContentResolver().applyBatch(
-                                    ContactsContract.AUTHORITY, this);
-                        }
-                    } catch (RemoteException e) {
-                        // There is nothing sensible to be done here
-                        Log.e(TAG, "problem inserting contact during server update", e);
-                    } catch (OperationApplicationException e) {
-                        // There is nothing sensible to be done here
-                        Log.e(TAG, "problem inserting contact during server update", e);
-                    }
+        public void execute(final Context context) {
+            try {
+                if (!isEmpty()) {
+                    mResults = context.getContentResolver().applyBatch(
+                            ContactsContract.AUTHORITY, this);
                 }
+            } catch (RemoteException e) {
+                // There is nothing sensible to be done here
+                LogUtils.e(TAG, "problem inserting contact during server update", e);
+            } catch (OperationApplicationException e) {
+                // There is nothing sensible to be done here
+                LogUtils.e(TAG, "problem inserting contact during server update", e);
             }
         }
 
@@ -1078,7 +1073,7 @@
          * @param type the subtype (e.g. HOME, WORK, etc.)
          * @return the matching NCV or null if not found
          */
-        private NamedContentValues findTypedData(ArrayList<NamedContentValues> list,
+        private static NamedContentValues findTypedData(ArrayList<NamedContentValues> list,
                 String contentItemType, int type, String stringType) {
             NamedContentValues result = null;
 
@@ -1123,8 +1118,8 @@
          * @param type the subtype (e.g. HOME, WORK, etc.)
          * @return the matching NCVs
          */
-        private ArrayList<NamedContentValues> findUntypedData(ArrayList<NamedContentValues> list,
-                int type, String contentItemType) {
+        private static ArrayList<NamedContentValues> findUntypedData(
+                ArrayList<NamedContentValues> list, int type, String contentItemType) {
             ArrayList<NamedContentValues> result = new ArrayList<NamedContentValues>();
 
             // Loop through the ncv's, looking for an existing row
@@ -1234,7 +1229,7 @@
          * @param oldValue an old value (or null) to check against
          * @return whether the column's value in the ContentValues matches oldValue
          */
-        private boolean cvCompareString(ContentValues cv, String column, String oldValue) {
+        private static boolean cvCompareString(ContentValues cv, String column, String oldValue) {
             if (cv.containsKey(column)) {
                 if (oldValue != null && cv.getAsString(column).equals(oldValue)) {
                     return true;
@@ -1281,8 +1276,7 @@
         }
 
         public void addName(Entity entity, String prefix, String givenName, String familyName,
-                String middleName, String suffix, String displayName, String yomiFirstName,
-                String yomiLastName) {
+                String middleName, String suffix, String yomiFirstName, String yomiLastName) {
             RowBuilder builder = untypedRowBuilder(entity, StructuredName.CONTENT_ITEM_TYPE);
             ContentValues cv = builder.cv;
             if (cv != null && cvCompareString(cv, StructuredName.GIVEN_NAME, givenName) &&
@@ -1535,7 +1529,7 @@
      * @param ncv the NamedContentValues object
      * @return a uri that can be used to refer to this row
      */
-    public Uri dataUriFromNamedContentValues(NamedContentValues ncv) {
+    public static Uri dataUriFromNamedContentValues(NamedContentValues ncv) {
         long id = ncv.values.getAsLong(RawContacts._ID);
         Uri dataUri = ContentUris.withAppendedId(ncv.uri, id);
         return dataUri;
@@ -1562,14 +1556,15 @@
                             .build())
                     .build());
         }
-        ops.execute();
+        ops.execute(mContext);
         ContentResolver cr = mContext.getContentResolver();
         if (mGroupsUsed) {
             // Make sure the title column is set for all of our groups
             // And that all of our groups are visible
             // TODO Perhaps the visible part should only happen when the group is created, but
             // this is fine for now.
-            Uri groupsUri = uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI);
+            Uri groupsUri = uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI,
+                    mAccount.mEmailAddress);
             Cursor c = cr.query(groupsUri, new String[] {Groups.SOURCE_ID, Groups.TITLE},
                     Groups.TITLE + " IS NULL", null, null);
             ContentValues values = new ContentValues();
@@ -1578,8 +1573,8 @@
                 while (c.moveToNext()) {
                     String sourceId = c.getString(0);
                     values.put(Groups.TITLE, sourceId);
-                    cr.update(uriWithAccountAndIsSyncAdapter(groupsUri), values,
-                            Groups.SOURCE_ID + "=?", new String[] {sourceId});
+                    cr.update(uriWithAccountAndIsSyncAdapter(groupsUri, mAccount.mEmailAddress),
+                            values, Groups.SOURCE_ID + "=?", new String[] {sourceId});
                 }
             } finally {
                 c.close();
@@ -1620,7 +1615,7 @@
         }
     }
 
-    private void sendIm(Serializer s, ContentValues cv, int count) throws IOException {
+    private static void sendIm(Serializer s, ContentValues cv, int count) throws IOException {
         String value = cv.getAsString(Im.DATA);
         if (value == null) return;
         if (count < MAX_IM_ROWS) {
@@ -1628,7 +1623,7 @@
         }
     }
 
-    private void sendOnePostal(Serializer s, ContentValues cv, int[] fieldNames)
+    private static void sendOnePostal(Serializer s, ContentValues cv, int[] fieldNames)
             throws IOException{
         sendStringData(s, cv, StructuredPostal.CITY, fieldNames[0]);
         sendStringData(s, cv, StructuredPostal.COUNTRY, fieldNames[1]);
@@ -1637,7 +1632,7 @@
         sendStringData(s, cv, StructuredPostal.STREET, fieldNames[4]);
     }
 
-    private void sendStructuredPostal(Serializer s, ContentValues cv) throws IOException {
+    private static void sendStructuredPostal(Serializer s, ContentValues cv) throws IOException {
         switch (cv.getAsInteger(StructuredPostal.TYPE)) {
             case StructuredPostal.TYPE_HOME:
                 sendOnePostal(s, cv, HOME_ADDRESS_TAGS);
@@ -1653,7 +1648,7 @@
         }
     }
 
-    private void sendStringData(Serializer s, ContentValues cv, String column, int tag)
+    private static void sendStringData(Serializer s, ContentValues cv, String column, int tag)
             throws IOException {
         if (cv.containsKey(column)) {
             String value = cv.getAsString(column);
@@ -1663,7 +1658,7 @@
         }
     }
 
-    private String sendStructuredName(Serializer s, ContentValues cv) throws IOException {
+    private static String sendStructuredName(Serializer s, ContentValues cv) throws IOException {
         String displayName = null;
         sendStringData(s, cv, StructuredName.FAMILY_NAME, Tags.CONTACTS_LAST_NAME);
         sendStringData(s, cv, StructuredName.GIVEN_NAME, Tags.CONTACTS_FIRST_NAME);
@@ -1675,22 +1670,22 @@
         return displayName;
     }
 
-    private void sendBusiness(Serializer s, ContentValues cv) throws IOException {
+    private static void sendBusiness(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, EasBusiness.ACCOUNT_NAME, Tags.CONTACTS2_ACCOUNT_NAME);
         sendStringData(s, cv, EasBusiness.CUSTOMER_ID, Tags.CONTACTS2_CUSTOMER_ID);
         sendStringData(s, cv, EasBusiness.GOVERNMENT_ID, Tags.CONTACTS2_GOVERNMENT_ID);
     }
 
-    private void sendPersonal(Serializer s, ContentValues cv) throws IOException {
+    private static void sendPersonal(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, EasPersonal.ANNIVERSARY, Tags.CONTACTS_ANNIVERSARY);
         sendStringData(s, cv, EasPersonal.FILE_AS, Tags.CONTACTS_FILE_AS);
     }
 
-    private void sendBirthday(Serializer s, ContentValues cv) throws IOException {
+    private static void sendBirthday(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, Event.START_DATE, Tags.CONTACTS_BIRTHDAY);
     }
 
-    private void sendPhoto(Serializer s, ContentValues cv) throws IOException {
+    private static void sendPhoto(Serializer s, ContentValues cv) throws IOException {
         if (cv.containsKey(Photo.PHOTO)) {
             byte[] bytes = cv.getAsByteArray(Photo.PHOTO);
             String pic = Base64.encodeToString(bytes, Base64.NO_WRAP);
@@ -1701,18 +1696,18 @@
         }
     }
 
-    private void sendOrganization(Serializer s, ContentValues cv) throws IOException {
+    private static void sendOrganization(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, Organization.TITLE, Tags.CONTACTS_JOB_TITLE);
         sendStringData(s, cv, Organization.COMPANY, Tags.CONTACTS_COMPANY_NAME);
         sendStringData(s, cv, Organization.DEPARTMENT, Tags.CONTACTS_DEPARTMENT);
         sendStringData(s, cv, Organization.OFFICE_LOCATION, Tags.CONTACTS_OFFICE_LOCATION);
     }
 
-    private void sendNickname(Serializer s, ContentValues cv) throws IOException {
+    private static void sendNickname(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, Nickname.NAME, Tags.CONTACTS2_NICKNAME);
     }
 
-    private void sendWebpage(Serializer s, ContentValues cv) throws IOException {
+    private static void sendWebpage(Serializer s, ContentValues cv) throws IOException {
         sendStringData(s, cv, Website.URL, Tags.CONTACTS_WEBPAGE);
     }
 
@@ -1734,7 +1729,7 @@
         }
     }
 
-    private void sendChildren(Serializer s, ContentValues cv) throws IOException {
+    private static void sendChildren(Serializer s, ContentValues cv) throws IOException {
         boolean first = true;
         for (int i = 0; i < EasChildren.MAX_CHILDREN; i++) {
             String row = EasChildren.ROWS[i];
@@ -1751,7 +1746,7 @@
         }
     }
 
-    private void sendPhone(Serializer s, ContentValues cv, int workCount, int homeCount)
+    private static void sendPhone(Serializer s, ContentValues cv, int workCount, int homeCount)
             throws IOException {
         String value = cv.getAsString(Phone.NUMBER);
         if (value == null) return;
@@ -1798,7 +1793,7 @@
         }
     }
 
-    private void sendRelation(Serializer s, ContentValues cv) throws IOException {
+    private static void sendRelation(Serializer s, ContentValues cv) throws IOException {
         String value = cv.getAsString(Relation.DATA);
         if (value == null) return;
         switch (cv.getAsInteger(Relation.TYPE)) {
@@ -1818,7 +1813,8 @@
 
     private void dirtyContactsWithinDirtyGroups() {
         ContentResolver cr = mService.mContentResolver;
-        Cursor c = cr.query(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI),
+        final String emailAddress = mAccount.mEmailAddress;
+        Cursor c = cr.query(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
                 GROUPS_ID_PROJECTION, Groups.DIRTY + "=1", null, null);
         try {
             if (c.getCount() > 0) {
@@ -1835,13 +1831,13 @@
                             MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS, updateArgs);
                 }
                 // Really delete groups that are marked deleted
-                cr.delete(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI), Groups.DELETED + "=1",
-                        null);
+                cr.delete(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
+                        Groups.DELETED + "=1", null);
                 // Clear the dirty flag for all of our groups
                 updateValues.clear();
                 updateValues.put(Groups.DIRTY, 0);
-                cr.update(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI), updateValues, null,
-                        null);
+                cr.update(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
+                        updateValues, null, null);
             }
         } finally {
             c.close();
@@ -1856,7 +1852,8 @@
         dirtyContactsWithinDirtyGroups();
 
         // First, let's find Contacts that have changed.
-        Uri uri = uriWithAccountAndIsSyncAdapter(RawContactsEntity.CONTENT_URI);
+        Uri uri = uriWithAccountAndIsSyncAdapter(RawContactsEntity.CONTENT_URI,
+                mAccount.mEmailAddress);
         if (getSyncKey().equals("0")) {
             return false;
         }

diff --git a/exchange2/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
similarity index 88%
rename from exchange2/src/com/android/exchange/adapter/EmailSyncAdapter.java
rename to src/com/android/exchange/adapter/EmailSyncAdapter.java
index d795475..9c5fa0c 100644
--- a/exchange2/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java

@@ -21,6 +21,7 @@
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
@@ -31,7 +32,6 @@
 import android.text.SpannedString;
 import android.text.TextUtils;
 import android.util.Base64;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import com.android.emailcommon.internet.MimeMessage;
@@ -65,6 +65,7 @@
 import com.android.exchange.MessageMoveRequest;
 import com.android.exchange.R;
 import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import org.apache.http.HttpStatus;
@@ -76,7 +77,6 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.List;
 import java.util.TimeZone;
 
 /**
@@ -111,8 +111,6 @@
 
     private static final String EMAIL_WINDOW_SIZE = "5";
 
-    private static final int MAX_NUM_FETCH_SIZE_REDUCTIONS = 5;
-
     @VisibleForTesting
     static final int LAST_VERB_REPLY = 1;
     @VisibleForTesting
@@ -120,30 +118,17 @@
     @VisibleForTesting
     static final int LAST_VERB_FORWARD = 3;
 
-    private final String[] mBindArguments = new String[2];
-    private final String[] mBindArgument = new String[1];
-
     @VisibleForTesting
     ArrayList<Long> mDeletedIdList = new ArrayList<Long>();
     @VisibleForTesting
     ArrayList<Long> mUpdatedIdList = new ArrayList<Long>();
     private final ArrayList<FetchRequest> mFetchRequestList = new ArrayList<FetchRequest>();
-    private boolean mFetchNeeded = false;
 
     // Holds the parser's value for isLooping()
     private boolean mIsLooping = false;
 
-    // The policy (if any) for this adapter's Account
-    private final Policy mPolicy;
-
     public EmailSyncAdapter(EasSyncService service) {
         super(service);
-        // If we've got an account with a policy, cache it now
-        if (mAccount.mPolicyKey != 0) {
-            mPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
-        } else {
-            mPolicy = null;
-        }
     }
 
     @Override
@@ -162,13 +147,11 @@
 
     private String getEmailFilter() {
         int syncLookback = mMailbox.mSyncLookback;
-        if (syncLookback == SyncWindow.SYNC_WINDOW_UNKNOWN
+        if (syncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
                 || mMailbox.mType == Mailbox.TYPE_INBOX) {
             syncLookback = mAccount.mSyncLookback;
         }
         switch (syncLookback) {
-            case SyncWindow.SYNC_WINDOW_AUTO:
-                return Eas.FILTER_AUTO;
             case SyncWindow.SYNC_WINDOW_1_DAY:
                 return Eas.FILTER_1_DAY;
             case SyncWindow.SYNC_WINDOW_3_DAYS:
@@ -182,6 +165,7 @@
             case SyncWindow.SYNC_WINDOW_ALL:
                 return Eas.FILTER_ALL;
             default:
+                // Auto window is deprecated and will also use the default.
                 return Eas.FILTER_1_WEEK;
         }
     }
@@ -243,12 +227,7 @@
             s.data(Tags.SYNC_WINDOW_SIZE, EMAIL_WINDOW_SIZE);
             s.start(Tags.SYNC_OPTIONS);
             // Set the lookback appropriately (EAS calls this a "filter")
-            String filter = getEmailFilter();
-            // We shouldn't get FILTER_AUTO here, but if we do, make it something legal...
-            if (filter.equals(Eas.FILTER_AUTO)) {
-                filter = Eas.FILTER_3_DAYS;
-            }
-            s.data(Tags.SYNC_FILTER_TYPE, filter);
+            s.data(Tags.SYNC_FILTER_TYPE, getEmailFilter());
             // Set the truncation amount for all classes
             if (protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
                 s.start(Tags.BASE_BODY_PREFERENCE);
@@ -275,26 +254,22 @@
     @Override
     public boolean parse(InputStream is) throws IOException, CommandStatusException {
         EasEmailSyncParser p = new EasEmailSyncParser(is, this);
-        mFetchNeeded = false;
         boolean res = p.parse();
         // Hold on to the parser's value for isLooping() to pass back to the service
         mIsLooping = p.isLooping();
         // If we've need a body fetch, or we've just finished one, return true in order to continue
-        if (mFetchNeeded || !mFetchRequestList.isEmpty()) {
+        if (p.fetchNeeded() || !mFetchRequestList.isEmpty()) {
             return true;
         }
 
-        // Don't check for "auto" on the initial sync
-        if (!("0".equals(mMailbox.mSyncKey))) {
-            // We've completed the first successful sync
-            if (getEmailFilter().equals(Eas.FILTER_AUTO)) {
-                getAutomaticLookback();
-             }
-        }
-
         return res;
     }
 
+    /**
+     * This function is no longer used, but keeping it here in case we revive this functionality.
+     * @throws IOException
+     */
+    @Deprecated
     private void getAutomaticLookback() throws IOException {
         // If we're using an auto lookback, check how many items in the past week
         // TODO Make the literal ints below constants once we twiddle them a bit
@@ -352,11 +327,10 @@
 
         CharSequence[] windowEntries = mContext.getResources().getTextArray(
                 R.array.account_settings_mail_window_entries);
-        Log.d(TAG, "Auto lookback: " + windowEntries[lookback]);
+        LogUtils.d(TAG, "Auto lookback: " + windowEntries[lookback]);
     }
 
     private static class GetItemEstimateParser extends Parser {
-        @SuppressWarnings("hiding")
         private static final String TAG = "GetItemEstimateParser";
         private int mEstimate = -1;
 
@@ -390,7 +364,7 @@
         public void parseResponse() throws IOException {
             while (nextTag(Tags.GIE_RESPONSE) != END) {
                 if (tag == Tags.GIE_STATUS) {
-                    Log.d(TAG, "GIE status: " + getValue());
+                    LogUtils.d(TAG, "GIE status: " + getValue());
                 } else if (tag == Tags.GIE_COLLECTION) {
                     parseCollection();
                 } else {
@@ -402,12 +376,12 @@
         public void parseCollection() throws IOException {
             while (nextTag(Tags.GIE_COLLECTION) != END) {
                 if (tag == Tags.GIE_CLASS) {
-                    Log.d(TAG, "GIE class: " + getValue());
+                    LogUtils.d(TAG, "GIE class: " + getValue());
                 } else if (tag == Tags.GIE_COLLECTION_ID) {
-                    Log.d(TAG, "GIE collectionId: " + getValue());
+                    LogUtils.d(TAG, "GIE collectionId: " + getValue());
                 } else if (tag == Tags.GIE_ESTIMATE) {
                     mEstimate = getValueInt();
-                    Log.d(TAG, "GIE estimate: " + mEstimate);
+                    LogUtils.d(TAG, "GIE estimate: " + mEstimate);
                 } else {
                     skipTag();
                 }
@@ -486,7 +460,7 @@
         return true;
     }
 
-    public class EasEmailSyncParser extends AbstractSyncParser {
+    public static class EasEmailSyncParser extends AbstractSyncParser {
 
         private static final String WHERE_SERVER_ID_AND_MAILBOX_KEY =
             SyncColumns.SERVER_ID + "=? and " + MessageColumns.MAILBOX_KEY + "=?";
@@ -498,14 +472,43 @@
         private final ArrayList<Long> deletedEmails = new ArrayList<Long>();
         private final ArrayList<ServerChange> changedEmails = new ArrayList<ServerChange>();
 
+        private final Policy mPolicy;
+        private boolean mFetchNeeded = false;
+
         public EasEmailSyncParser(InputStream in, EmailSyncAdapter adapter) throws IOException {
             super(in, adapter);
             mMailboxIdAsString = Long.toString(mMailbox.mId);
+            if (mAccount.mPolicyKey != 0) {
+                mPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+            } else {
+                mPolicy = null;
+            }
+        }
+
+        public EasEmailSyncParser(final Context context, final ContentResolver resolver,
+                final InputStream in, final Mailbox mailbox, final Account account)
+                        throws IOException {
+            super(context, resolver, in, mailbox, account);
+            mMailboxIdAsString = Long.toString(mMailbox.mId);
+            if (mAccount.mPolicyKey != 0) {
+                mPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+            } else {
+                mPolicy = null;
+            }
         }
 
         public EasEmailSyncParser(Parser parser, EmailSyncAdapter adapter) throws IOException {
             super(parser, adapter);
             mMailboxIdAsString = Long.toString(mMailbox.mId);
+            if (mAccount.mPolicyKey != 0) {
+                mPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+            } else {
+                mPolicy = null;
+            }
+        }
+
+        public boolean fetchNeeded() {
+            return mFetchNeeded;
         }
 
         public void addData (Message msg, int endingTag) throws IOException {
@@ -642,7 +645,7 @@
             }
         }
 
-        private void putFromMeeting(PackedString ps, String field, ContentValues values,
+        private static void putFromMeeting(PackedString ps, String field, ContentValues values,
                 String column) {
             String val = ps.get(field);
             if (!TextUtils.isEmpty(val)) {
@@ -795,7 +798,7 @@
          * @param mimeData the MIME data we've received from the server
          * @throws IOException
          */
-        private void mimeBodyParser(Message msg, String mimeData) throws IOException {
+        private static void mimeBodyParser(Message msg, String mimeData) throws IOException {
             try {
                 ByteArrayInputStream in = new ByteArrayInputStream(mimeData.getBytes());
                 // The constructor parses the message
@@ -805,12 +808,14 @@
                 // We'll ignore the attachments, as we'll get them directly from EAS
                 ArrayList<Part> attachments = new ArrayList<Part>();
                 MimeUtility.collectParts(mimeMessage, viewables, attachments);
-                Body tempBody = new Body();
-                // updateBodyFields fills in the content fields of the Body
-                ConversionUtilities.updateBodyFields(tempBody, msg, viewables);
+                // parseBodyFields fills in the content fields of the Body
+                ConversionUtilities.BodyFieldData data =
+                        ConversionUtilities.parseBodyFields(viewables);
                 // But we need them in the message itself for handling during commit()
-                msg.mHtml = tempBody.mHtmlContent;
-                msg.mText = tempBody.mTextContent;
+                msg.setFlags(data.isQuotedReply, data.isQuotedForward);
+                msg.mSnippet = data.snippet;
+                msg.mHtml = data.htmlContent;
+                msg.mText = data.textContent;
             } catch (MessagingException e) {
                 // This would most likely indicate a broken stream
                 throw new IOException(e);
@@ -870,7 +875,7 @@
                 att.mFileName = fileName;
                 att.mLocation = location;
                 att.mMimeType = getMimeTypeFromFileName(fileName);
-                att.mAccountKey = mService.mAccount.mId;
+                att.mAccountKey = mAccount.mId;
                 // Save away the contentId, if we've got one (for inline images); note that the
                 // EAS docs appear to be wrong about the tags used; inline images come with
                 // contentId rather than contentLocation, when sent from Ex03, Ex07, and Ex10
@@ -919,10 +924,9 @@
         }
 
         private Cursor getServerIdCursor(String serverId, String[] projection) {
-            mBindArguments[0] = serverId;
-            mBindArguments[1] = mMailboxIdAsString;
             Cursor c = mContentResolver.query(Message.CONTENT_URI, projection,
-                    WHERE_SERVER_ID_AND_MAILBOX_KEY, mBindArguments, null);
+                    WHERE_SERVER_ID_AND_MAILBOX_KEY, new String[] {serverId, mMailboxIdAsString},
+                    null);
             if (c == null) throw new ProviderUnavailableException();
             if (c.getCount() > 1) {
                 userLog("Multiple messages with the same serverId/mailbox: " + serverId);
@@ -1047,13 +1051,10 @@
             while (nextTag(Tags.SYNC_COMMANDS) != END) {
                 if (tag == Tags.SYNC_ADD) {
                     newEmails.add(addParser());
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_DELETE || tag == Tags.SYNC_SOFT_DELETE) {
                     deleteParser(deletedEmails, tag);
-                    incrementChangeCount();
                 } else if (tag == Tags.SYNC_CHANGE) {
                     changeParser(changedEmails);
-                    incrementChangeCount();
                 } else
                     skipTag();
             }
@@ -1075,9 +1076,9 @@
                         try {
                             if (c.moveToFirst()) {
                                 Long id = c.getLong(Message.ID_PROJECTION_COLUMN);
-                                mService.userLog("Update of " + serverId + " failed; will retry");
-                                mUpdatedIdList.remove(id);
-                                mService.mUpsyncFailed = true;
+                                userLog("Update of " + serverId + " failed; will retry");
+                                //mUpdatedIdList.remove(id);
+                                //mService.mUpsyncFailed = true;
                             }
                         } finally {
                             c.close();
@@ -1104,10 +1105,9 @@
                             // 8 = object not found; delete the message from EmailProvider
                             // No other status should be seen in a fetch response, except, perhaps,
                             // for some temporary server failure
-                            mBindArguments[0] = sse.mItemId;
-                            mBindArguments[1] = mMailboxIdAsString;
                             mContentResolver.delete(Message.CONTENT_URI,
-                                    WHERE_SERVER_ID_AND_MAILBOX_KEY, mBindArguments);
+                                    WHERE_SERVER_ID_AND_MAILBOX_KEY,
+                                    new String[] {sse.mItemId, mMailboxIdAsString});
                         }
                     }
                 }
@@ -1119,10 +1119,9 @@
             commitImpl(0);
         }
 
-        public void commitImpl(final int tryCount) {
+        public void commitImpl(int tryCount) {
             // Use a batch operation to handle the changes
-            final ArrayList<ContentProviderOperation> ops =
-                    new ArrayList<ContentProviderOperation>();
+            ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
 
             // Maximum size of message text per fetch
             int numFetched = fetchedEmails.size();
@@ -1156,27 +1155,18 @@
                 // If we find one, we do two things atomically: 1) set the body text for the
                 // message, and 2) mark the message loaded (i.e. completely loaded)
                 if (id != null) {
-                    mBindArgument[0] = id;
-                    if (msg.mText != null && (maxPerFetch > 0) &&
-                            (msg.mText.length() > maxPerFetch)) {
-                        userLog("Truncating TEXT to " + maxPerFetch);
+                    userLog("Fetched body successfully for ", id);
+                    final String[] bindArgument = new String[] {id};
+                    if ((maxPerFetch > 0) && (msg.mText.length() > maxPerFetch)) {
+                        userLog("Truncating message to " + maxPerFetch);
                         msg.mText = msg.mText.substring(0, maxPerFetch) + "...";
                     }
-                    if (msg.mHtml != null && (maxPerFetch > 0) &&
-                            (msg.mHtml.length() > maxPerFetch)) {
-                        userLog("Truncating HTML to " + maxPerFetch);
-                        msg.mHtml = msg.mHtml.substring(0, maxPerFetch) + "...";
-                    }
                     ops.add(ContentProviderOperation.newUpdate(Body.CONTENT_URI)
-                            .withSelection(Body.MESSAGE_KEY + "=?", mBindArgument)
+                            .withSelection(Body.MESSAGE_KEY + "=?", bindArgument)
                             .withValue(Body.TEXT_CONTENT, msg.mText)
                             .build());
-                    ops.add(ContentProviderOperation.newUpdate(Body.CONTENT_URI)
-                            .withSelection(Body.MESSAGE_KEY + "=?", mBindArgument)
-                            .withValue(Body.HTML_CONTENT, msg.mHtml)
-                            .build());
                     ops.add(ContentProviderOperation.newUpdate(Message.CONTENT_URI)
-                            .withSelection(EmailContent.RECORD_ID + "=?", mBindArgument)
+                            .withSelection(EmailContent.RECORD_ID + "=?", bindArgument)
                             .withValue(Message.FLAG_LOADED, Message.FLAG_LOADED_COMPLETE)
                             .build());
                 }
@@ -1195,7 +1185,7 @@
             if (!changedEmails.isEmpty()) {
                 // Server wins in a conflict...
                 for (ServerChange change : changedEmails) {
-                    ContentValues cv = new ContentValues();
+                     ContentValues cv = new ContentValues();
                     if (change.read != null) {
                         cv.put(MessageColumns.FLAG_READ, change.read);
                     }
@@ -1207,8 +1197,8 @@
                     }
                     ops.add(ContentProviderOperation.newUpdate(
                             ContentUris.withAppendedId(Message.CONTENT_URI, change.id))
-                            .withValues(cv)
-                            .build());
+                                .withValues(cv)
+                                .build());
                 }
             }
 
@@ -1217,86 +1207,22 @@
             mailboxValues.put(Mailbox.SYNC_KEY, mMailbox.mSyncKey);
             ops.add(ContentProviderOperation.newUpdate(
                     ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailbox.mId))
-                    .withValues(mailboxValues).build());
+                        .withValues(mailboxValues).build());
 
-            // No commits if we're stopped
-            synchronized (mService.getSynchronizer()) {
-                if (mService.isStopped()) return;
-                try {
-                    mContentResolver.applyBatch(EmailContent.AUTHORITY, ops);
-                    userLog(mMailbox.mDisplayName, " SyncKey saved as: ", mMailbox.mSyncKey);
-                } catch (TransactionTooLargeException e) {
-                    Log.w(TAG, "Transaction failed on fetched message; retrying...");
-
-                    if (tryCount <= MAX_NUM_FETCH_SIZE_REDUCTIONS || ops.size() == 1) {
-                        // We haven't tried reducing the message body size enough yet. Try this
-                        // commit again.
-                        commitImpl(tryCount + 1);
-                    } else {
-                        // We have tried too many time to with just reducing the fetch size.
-                        // Try applying the batch operations in smaller chunks
-                        applyBatchOperations(ops);
-                    }
-                } catch (RemoteException e) {
-                    // There is nothing to be done here; fail by returning null
-                } catch (OperationApplicationException e) {
-                    // There is nothing to be done here; fail by returning null
-                }
+            try {
+                mContentResolver.applyBatch(EmailContent.AUTHORITY, ops);
+                userLog(mMailbox.mDisplayName, " SyncKey saved as: ", mMailbox.mSyncKey);
+            } catch (TransactionTooLargeException e) {
+                LogUtils.w(TAG, "Transaction failed on fetched message; retrying...");
+                commitImpl(++tryCount);
+             } catch (RemoteException e) {
+                // There is nothing to be done here; fail by returning null
+            } catch (OperationApplicationException e) {
+                // There is nothing to be done here; fail by returning null
             }
         }
     }
 
-    private void applyBatchOperations(List<ContentProviderOperation> operations) {
-        // Assume that since this method is being called, we want to break this batch up in chunks
-        // First assume that we want to take the list and do it in two chunks
-        int numberOfBatches = 2;
-
-        // Make a copy of the operation list
-        final List<ContentProviderOperation> remainingOperations = new ArrayList(operations);
-
-        // determin the batch size
-        int batchSize = remainingOperations.size() / numberOfBatches;
-        try {
-            while (remainingOperations.size() > 0) {
-                // Ensure that batch size is smaller than the list size
-                if (batchSize > remainingOperations.size()) {
-                    batchSize = remainingOperations.size();
-                }
-
-                final List<ContentProviderOperation> workingBatch;
-                // If the batch size and the list size is the same, just use the whole list
-                if (batchSize == remainingOperations.size()) {
-                    workingBatch = remainingOperations;
-                } else {
-                    // Get the sublist of of the remaining batch that contains only the batch size
-                    workingBatch = remainingOperations.subList(0, batchSize - 1);
-                }
-
-                try {
-                    // This is a waste, but ContentResolver#applyBatch requies an ArrayList, but
-                    // List#subList retuns only a List
-                    final ArrayList<ContentProviderOperation> batch = new ArrayList(workingBatch);
-                    mContentResolver.applyBatch(EmailContent.AUTHORITY, batch);
-
-                    // We successfully applied that batch.  Remove it from the remaining work
-                    workingBatch.clear();
-                } catch (TransactionTooLargeException e) {
-                    if (batchSize == 1) {
-                        Log.w(TAG, "Transaction failed applying batch. smallest possible batch.");
-                        throw e;
-                    }
-                    Log.w(TAG, "Transaction failed applying batch. trying smaller size...");
-                    numberOfBatches++;
-                    batchSize = remainingOperations.size() / numberOfBatches;
-                }
-            }
-        } catch (RemoteException e) {
-            // There is nothing to be done here; fail by returning null
-        } catch (OperationApplicationException e) {
-            // There is nothing to be done here; fail by returning null
-        }
-    }
-
     @Override
     public String getCollectionName() {
         return "Email";
@@ -1320,9 +1246,9 @@
         ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
         // Delete any moved messages (since we've just synced the mailbox, and no longer need the
         // placeholder message); this prevents duplicates from appearing in the mailbox.
-        mBindArgument[0] = Long.toString(mMailbox.mId);
         ops.add(ContentProviderOperation.newDelete(Message.CONTENT_URI)
-                .withSelection(WHERE_MAILBOX_KEY_AND_MOVED, mBindArgument).build());
+                .withSelection(WHERE_MAILBOX_KEY_AND_MOVED,
+                        new String[] {Long.toString(mMailbox.mId)}).build());
         // If we've done deletions/updates, clean up the deleted/updated tables
         if (!mDeletedIdList.isEmpty() || !mUpdatedIdList.isEmpty()) {
             addCleanupOps(ops);
@@ -1337,7 +1263,7 @@
         }
     }
 
-    private String formatTwo(int num) {
+    private static String formatTwo(int num) {
         if (num < 10) {
             return "0" + (char)('0' + num);
         } else
@@ -1372,11 +1298,10 @@
      * can utilize this id to find references to the message.  The only reference situation at this
      * point is in the Body table; it is when sending messages via SmartForward and SmartReply
      */
-    private boolean messageReferenced(ContentResolver cr, long id) {
-        mBindArgument[0] = Long.toString(id);
+    private static boolean messageReferenced(ContentResolver cr, long id) {
         // See if this id is referenced in a body
         Cursor c = cr.query(Body.CONTENT_URI, Body.ID_PROJECTION, WHERE_BODY_SOURCE_MESSAGE_KEY,
-                mBindArgument, null);
+                new String[] {Long.toString(id)}, null);
         try {
             return c.moveToFirst();
         } finally {

diff --git a/src/com/android/exchange/adapter/FolderSyncParser.java b/src/com/android/exchange/adapter/FolderSyncParser.java
new file mode 100644
index 0000000..2826533
--- /dev/null
+++ b/src/com/android/exchange/adapter/FolderSyncParser.java

@@ -0,0 +1,766 @@
+/*
+ * Copyright (C) 2008-2009 Marc Blank
+ * Licensed to The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.adapter;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.SparseBooleanArray;
+import android.util.SparseIntArray;
+
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.SyncWindow;
+import com.android.emailcommon.utility.AttachmentUtilities;
+import com.android.exchange.CommandStatusException;
+import com.android.exchange.CommandStatusException.CommandStatus;
+import com.android.exchange.Eas;
+import com.android.exchange.ExchangeService;
+import com.android.mail.utils.LogUtils;
+import com.google.common.annotations.VisibleForTesting;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Parse the result of a FolderSync command
+ *
+ * Handles the addition, deletion, and changes to folders in the user's Exchange account.
+ **/
+
+public class FolderSyncParser extends AbstractSyncParser {
+
+    public static final String TAG = "FolderSyncParser";
+
+    /**
+     * Mapping from EAS type values to {@link Mailbox} types.
+     * See http://msdn.microsoft.com/en-us/library/gg650877(v=exchg.80).aspx for the list of EAS
+     * type values.
+     * If an EAS type is not in the map, or is inserted with a value of {@link Mailbox#TYPE_NONE},
+     * then we don't support that type and we should ignore it.
+     * TODO: Maybe we should store the mailbox anyway, otherwise it'll be annoying to upgrade.
+     */
+    private static final SparseIntArray MAILBOX_TYPE_MAP;
+    static {
+        MAILBOX_TYPE_MAP = new SparseIntArray(11);
+        MAILBOX_TYPE_MAP.put(1,  Mailbox.TYPE_MAIL);       // User-created folder (generic)
+        MAILBOX_TYPE_MAP.put(2,  Mailbox.TYPE_INBOX);      // Default Inbox folder
+        MAILBOX_TYPE_MAP.put(3,  Mailbox.TYPE_DRAFTS);     // Default Drafts folder
+        MAILBOX_TYPE_MAP.put(4,  Mailbox.TYPE_TRASH);      // Default Deleted Items folder
+        MAILBOX_TYPE_MAP.put(5,  Mailbox.TYPE_SENT);       // Default Sent Items folder
+        MAILBOX_TYPE_MAP.put(6,  Mailbox.TYPE_OUTBOX);     // Default Outbox folder
+        //MAILBOX_TYPE_MAP.put(7,  Mailbox.TYPE_TASKS);      // Default Tasks folder
+        MAILBOX_TYPE_MAP.put(8,  Mailbox.TYPE_CALENDAR);   // Default Calendar folder
+        MAILBOX_TYPE_MAP.put(9,  Mailbox.TYPE_CONTACTS);   // Default Contacts folder
+        //MAILBOX_TYPE_MAP.put(10, Mailbox.TYPE_NONE);       // Default Notes folder
+        //MAILBOX_TYPE_MAP.put(11, Mailbox.TYPE_NONE);       // Default Journal folder
+        MAILBOX_TYPE_MAP.put(12, Mailbox.TYPE_MAIL);       // User-created Mail folder
+        MAILBOX_TYPE_MAP.put(13, Mailbox.TYPE_CALENDAR);   // User-created Calendar folder
+        MAILBOX_TYPE_MAP.put(14, Mailbox.TYPE_CONTACTS);   // User-created Contacts folder
+        //MAILBOX_TYPE_MAP.put(15, Mailbox.TYPE_TASKS);      // User-created Tasks folder
+        //MAILBOX_TYPE_MAP.put(16, Mailbox.TYPE_NONE);       // User-created Journal folder
+        //MAILBOX_TYPE_MAP.put(17, Mailbox.TYPE_NONE);       // User-created Notes folder
+        //MAILBOX_TYPE_MAP.put(18, Mailbox.TYPE_NONE);       // Unknown folder type
+        //MAILBOX_TYPE_MAP.put(19, Mailbox.TYPE_NONE);       // Recipient information cache
+    }
+
+    /** Content selection for all mailboxes belonging to an account. */
+    private static final String WHERE_ACCOUNT_KEY = MailboxColumns.ACCOUNT_KEY + "=?";
+
+    /**
+     * Content selection to find a specific mailbox by server id. Since server ids aren't unique
+     * across all accounts, this must also check account id.
+     */
+    private static final String WHERE_SERVER_ID_AND_ACCOUNT = MailboxColumns.SERVER_ID + "=? and " +
+        MailboxColumns.ACCOUNT_KEY + "=?";
+
+    /**
+     * Content selection to find a specific mailbox by display name and account.
+     */
+    private static final String WHERE_DISPLAY_NAME_AND_ACCOUNT = MailboxColumns.DISPLAY_NAME +
+        "=? and " + MailboxColumns.ACCOUNT_KEY + "=?";
+
+    /**
+     * Content selection to find children by parent's server id. Since server ids aren't unique
+     * across accounts, this must also use account id.
+     */
+    private static final String WHERE_PARENT_SERVER_ID_AND_ACCOUNT =
+        MailboxColumns.PARENT_SERVER_ID +"=? and " + MailboxColumns.ACCOUNT_KEY + "=?";
+
+    /** Projection used when fetching a Mailbox's ids. */
+    private static final String[] MAILBOX_ID_COLUMNS_PROJECTION =
+        new String[] {MailboxColumns.ID, MailboxColumns.SERVER_ID, MailboxColumns.PARENT_SERVER_ID};
+    private static final int MAILBOX_ID_COLUMNS_ID = 0;
+    private static final int MAILBOX_ID_COLUMNS_SERVER_ID = 1;
+    private static final int MAILBOX_ID_COLUMNS_PARENT_SERVER_ID = 2;
+
+    /** Projection used for changed parents during parent/child fixup. */
+    private static final String[] FIXUP_PARENT_PROJECTION =
+            { MailboxColumns.ID, MailboxColumns.DISPLAY_NAME, MailboxColumns.HIERARCHICAL_NAME,
+                    MailboxColumns.FLAGS };
+    private static final int FIXUP_PARENT_ID_COLUMN = 0;
+    private static final int FIXUP_PARENT_DISPLAY_NAME_COLUMN = 1;
+    private static final int FIXUP_PARENT_HIERARCHICAL_NAME_COLUMN = 2;
+    private static final int FIXUP_PARENT_FLAGS_COLUMN = 3;
+
+    /** Projection used for changed children during parent/child fixup. */
+    private static final String[] FIXUP_CHILD_PROJECTION =
+            { MailboxColumns.ID, MailboxColumns.DISPLAY_NAME };
+    private static final int FIXUP_CHILD_ID_COLUMN = 0;
+    private static final int FIXUP_CHILD_DISPLAY_NAME_COLUMN = 1;
+
+    /** Flags that are set or cleared when a mailbox's child status changes. */
+    private static final int HAS_CHILDREN_FLAGS =
+            Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE;
+
+    /** Mailbox.NO_MAILBOX, as a string (convenience since this is used in several places). */
+    private static final String NO_MAILBOX_STRING = Long.toString(Mailbox.NO_MAILBOX);
+
+    @VisibleForTesting
+    long mAccountId;
+    @VisibleForTesting
+    String mAccountIdAsString;
+    @VisibleForTesting
+    boolean mInUnitTest = false;
+
+    private String[] mBindArguments = new String[2];
+
+    /** List of pending operations to send as a batch to the content provider. */
+    private ArrayList<ContentProviderOperation> mOperations =
+            new ArrayList<ContentProviderOperation>();
+    /** Indicates whether this sync is an initial FolderSync. */
+    private boolean mInitialSync;
+    /** List of folder server ids whose children changed with this sync. */
+    private ArrayList<String> mParentFixupsNeeded = new ArrayList<String>();
+    /** Indicates whether the sync response provided a different sync key than we had. */
+    private boolean mSyncKeyChanged = false;
+
+    // If true, we only care about status (this is true when validating an account) and ignore
+    // other data
+    private final boolean mStatusOnly;
+
+    /** Map of folder types that have been created during this sync. */
+    private final SparseBooleanArray mCreatedFolderTypes =
+            new SparseBooleanArray(Mailbox.REQUIRED_FOLDER_TYPES.length);
+
+    private static final ContentValues UNINITIALIZED_PARENT_KEY = new ContentValues();
+
+    {
+        UNINITIALIZED_PARENT_KEY.put(MailboxColumns.PARENT_KEY, Mailbox.PARENT_KEY_UNINITIALIZED);
+    }
+
+    public FolderSyncParser(final Context context, final ContentResolver resolver,
+            final InputStream in, final Account account, final boolean statusOnly)
+                    throws IOException {
+        super(context, resolver, in, null, account);
+        mAccountId = mAccount.mId;
+        mAccountIdAsString = Long.toString(mAccountId);
+        mStatusOnly = statusOnly;
+    }
+
+    public FolderSyncParser(InputStream in, AbstractSyncAdapter adapter) throws IOException {
+        this(in, adapter, false);
+    }
+
+    public FolderSyncParser(InputStream in, AbstractSyncAdapter adapter, boolean statusOnly)
+            throws IOException {
+        super(in, adapter);
+        mAccountId = mAccount.mId;
+        mAccountIdAsString = Long.toString(mAccountId);
+        mStatusOnly = statusOnly;
+    }
+
+    @Override
+    public boolean parse() throws IOException, CommandStatusException {
+        int status;
+        boolean res = false;
+        boolean resetFolders = false;
+        mInitialSync = (mAccount.mSyncKey == null) || "0".equals(mAccount.mSyncKey);
+        if (mInitialSync) {
+            // We're resyncing all folders for this account, so nuke any existing ones.
+            mContentResolver.delete(Mailbox.CONTENT_URI, WHERE_ACCOUNT_KEY,
+                    new String[] {mAccountIdAsString});
+        }
+        if (nextTag(START_DOCUMENT) != Tags.FOLDER_FOLDER_SYNC)
+            throw new EasParserException();
+        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
+            if (tag == Tags.FOLDER_STATUS) {
+                status = getValueInt();
+                // Do a sanity check on the account here; if we have any duplicated folders, we'll
+                // act as though we have a bad folder sync key (wipe/reload mailboxes)
+                // Note: The ContentValues isn't used, but no point creating a new one
+                int dupes = 0;
+                if (mAccountId > 0) {
+                    dupes = mContentResolver.update(
+                            ContentUris.withAppendedId(EmailContent.ACCOUNT_CHECK_URI, mAccountId),
+                            UNINITIALIZED_PARENT_KEY, null, null);
+                }
+                if (dupes > 0) {
+                    LogUtils.w(TAG, "Duplicate mailboxes found for account %d: %d", mAccountId,
+                            dupes);
+                    status = Eas.FOLDER_STATUS_INVALID_KEY;
+                }
+                if (status != Eas.FOLDER_STATUS_OK) {
+                    // If the account hasn't been saved, this is a validation attempt, so we don't
+                    // try reloading the folder list...
+                    if (CommandStatus.isDeniedAccess(status) ||
+                            CommandStatus.isNeedsProvisioning(status) ||
+                            (mAccount.mId == Account.NOT_SAVED)) {
+                        throw new CommandStatusException(status);
+                    // Note that we need to catch both old-style (Eas.FOLDER_STATUS_INVALID_KEY)
+                    // and EAS 14 style command status
+                    } else if (status == Eas.FOLDER_STATUS_INVALID_KEY ||
+                            CommandStatus.isBadSyncKey(status)) {
+                        // Delete PIM data
+                        ExchangeService.deleteAccountPIMData(mContext, mAccountId);
+                        // Save away any mailbox sync information that is NOT default
+                        saveMailboxSyncOptions();
+                        // And only then, delete mailboxes
+                        mContentResolver.delete(Mailbox.CONTENT_URI, WHERE_ACCOUNT_KEY,
+                                new String[] {mAccountIdAsString});
+                        // Reconstruct _main
+                        res = true;
+                        resetFolders = true;
+                        // Reset the sync key and save (this should trigger the AccountObserver
+                        // in ExchangeService, which will recreate the account mailbox, which
+                        // will then start syncing folders, etc.)
+                        mAccount.mSyncKey = "0";
+                        ContentValues cv = new ContentValues();
+                        cv.put(AccountColumns.SYNC_KEY, mAccount.mSyncKey);
+                        mContentResolver.update(ContentUris.withAppendedId(Account.CONTENT_URI,
+                                mAccount.mId), cv, null, null);
+                    } else {
+                        // Other errors are at the server, so let's throw an error that will
+                        // cause this sync to be retried at a later time
+                        throw new EasParserException("Folder status error");
+                    }
+                }
+            } else if (tag == Tags.FOLDER_SYNC_KEY) {
+                final String newKey = getValue();
+                if (newKey != null && !resetFolders) {
+                    mSyncKeyChanged = !newKey.equals(mAccount.mSyncKey);
+                    mAccount.mSyncKey = newKey;
+                }
+            } else if (tag == Tags.FOLDER_CHANGES) {
+                if (mStatusOnly) return res;
+                changesParser();
+            } else
+                skipTag();
+        }
+        if (!mStatusOnly) {
+            commit();
+        }
+        return res;
+    }
+
+    /**
+     * Get a cursor with folder ids for a specific folder.
+     * @param serverId The server id for the folder we are interested in.
+     * @return A cursor for the folder specified by serverId for this account.
+     */
+    private Cursor getServerIdCursor(final String serverId) {
+        mBindArguments[0] = serverId;
+        mBindArguments[1] = mAccountIdAsString;
+        return mContentResolver.query(Mailbox.CONTENT_URI, MAILBOX_ID_COLUMNS_PROJECTION,
+                WHERE_SERVER_ID_AND_ACCOUNT, mBindArguments, null);
+    }
+
+    /**
+     * Add the appropriate {@link ContentProviderOperation} to {@link #mOperations} for a Delete
+     * change in the FolderSync response.
+     * @throws IOException
+     */
+    private void deleteParser() throws IOException {
+        while (nextTag(Tags.FOLDER_DELETE) != END) {
+            switch (tag) {
+                case Tags.FOLDER_SERVER_ID:
+                    final String serverId = getValue();
+                    // Find the mailbox in this account with the given serverId
+                    final Cursor c = getServerIdCursor(serverId);
+                    try {
+                        if (c.moveToFirst()) {
+                            LogUtils.i(TAG, "Deleting %s", serverId);
+                            final long mailboxId = c.getLong(MAILBOX_ID_COLUMNS_ID);
+                            mOperations.add(ContentProviderOperation.newDelete(
+                                    ContentUris.withAppendedId(Mailbox.CONTENT_URI,
+                                            mailboxId)).build());
+                            AttachmentUtilities.deleteAllMailboxAttachmentFiles(mContext,
+                                    mAccountId, mailboxId);
+                            final String parentId =
+                                    c.getString(MAILBOX_ID_COLUMNS_PARENT_SERVER_ID);
+                            if (!TextUtils.isEmpty(parentId)) {
+                                mParentFixupsNeeded.add(parentId);
+                            }
+                        }
+                    } finally {
+                        c.close();
+                    }
+                    break;
+                default:
+                    skipTag();
+            }
+        }
+    }
+
+    private static class SyncOptions {
+        private final int mInterval;
+        private final int mLookback;
+
+        private SyncOptions(int interval, int lookback) {
+            mInterval = interval;
+            mLookback = lookback;
+        }
+    }
+
+    private static final String MAILBOX_STATE_SELECTION =
+        MailboxColumns.ACCOUNT_KEY + "=? AND (" + MailboxColumns.SYNC_INTERVAL + "!=" +
+            Account.CHECK_INTERVAL_NEVER + " OR " + Mailbox.SYNC_LOOKBACK + "!=" +
+            SyncWindow.SYNC_WINDOW_ACCOUNT + ")";
+
+    private static final String[] MAILBOX_STATE_PROJECTION = new String[] {
+        MailboxColumns.SERVER_ID, MailboxColumns.SYNC_INTERVAL, MailboxColumns.SYNC_LOOKBACK};
+    private static final int MAILBOX_STATE_SERVER_ID = 0;
+    private static final int MAILBOX_STATE_INTERVAL = 1;
+    private static final int MAILBOX_STATE_LOOKBACK = 2;
+    @VisibleForTesting
+    final HashMap<String, SyncOptions> mSyncOptionsMap = new HashMap<String, SyncOptions>();
+
+    /**
+     * For every mailbox in this account that has a non-default interval or lookback, save those
+     * values.
+     */
+    @VisibleForTesting
+    void saveMailboxSyncOptions() {
+        // Shouldn't be necessary, but...
+        mSyncOptionsMap.clear();
+        Cursor c = mContentResolver.query(Mailbox.CONTENT_URI, MAILBOX_STATE_PROJECTION,
+                MAILBOX_STATE_SELECTION, new String[] {mAccountIdAsString}, null);
+        if (c != null) {
+            try {
+                while (c.moveToNext()) {
+                    mSyncOptionsMap.put(c.getString(MAILBOX_STATE_SERVER_ID),
+                            new SyncOptions(c.getInt(MAILBOX_STATE_INTERVAL),
+                                    c.getInt(MAILBOX_STATE_LOOKBACK)));
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    /**
+     * For every set of saved mailbox sync options, try to find and restore those values
+     */
+    @VisibleForTesting
+    void restoreMailboxSyncOptions() {
+        try {
+            ContentValues cv = new ContentValues();
+            mBindArguments[1] = mAccountIdAsString;
+            for (String serverId: mSyncOptionsMap.keySet()) {
+                SyncOptions options = mSyncOptionsMap.get(serverId);
+                cv.put(MailboxColumns.SYNC_INTERVAL, options.mInterval);
+                cv.put(MailboxColumns.SYNC_LOOKBACK, options.mLookback);
+                mBindArguments[0] = serverId;
+                // If we match account and server id, set the sync options
+                mContentResolver.update(Mailbox.CONTENT_URI, cv, WHERE_SERVER_ID_AND_ACCOUNT,
+                        mBindArguments);
+            }
+        } finally {
+            mSyncOptionsMap.clear();
+        }
+    }
+
+    /**
+     * Add a {@link ContentProviderOperation} to {@link #mOperations} to add a mailbox.
+     * @param name The new mailbox's name.
+     * @param serverId The new mailbox's server id.
+     * @param parentServerId The server id of the new mailbox's parent ("0" if none).
+     * @param mailboxType The mailbox's type, which is one of the values defined in {@link Mailbox}.
+     * @param fromServer Whether this mailbox was synced from server (as opposed to local-only).
+     * @throws IOException
+     */
+    private void addMailboxOp(final String name, final String serverId,
+            final String parentServerId, final int mailboxType, final boolean fromServer)
+            throws IOException {
+        final ContentValues cv = new ContentValues(10);
+        cv.put(MailboxColumns.DISPLAY_NAME, name);
+        if (fromServer) {
+            cv.put(MailboxColumns.SERVER_ID, serverId);
+            final String parentId;
+            if (parentServerId.equals("0")) {
+                parentId = NO_MAILBOX_STRING;
+                cv.put(MailboxColumns.PARENT_KEY, Mailbox.NO_MAILBOX);
+            } else {
+                parentId = parentServerId;
+                mParentFixupsNeeded.add(parentId);
+            }
+            cv.put(MailboxColumns.PARENT_SERVER_ID, parentId);
+        } else {
+            cv.put(MailboxColumns.SERVER_ID, "");
+            cv.put(MailboxColumns.PARENT_KEY, Mailbox.NO_MAILBOX);
+            cv.put(MailboxColumns.PARENT_SERVER_ID, NO_MAILBOX_STRING);
+            cv.put(MailboxColumns.TOTAL_COUNT, -1);
+        }
+        cv.put(MailboxColumns.ACCOUNT_KEY, mAccountId);
+        cv.put(MailboxColumns.TYPE, mailboxType);
+
+        final boolean shouldSync = fromServer && Mailbox.getDefaultSyncStateForType(mailboxType);
+        cv.put(MailboxColumns.SYNC_INTERVAL, shouldSync ? 1 : 0);
+
+        // Set basic flags
+        int flags = 0;
+        if (mailboxType <= Mailbox.TYPE_NOT_EMAIL) {
+            flags |= Mailbox.FLAG_HOLDS_MAIL + Mailbox.FLAG_SUPPORTS_SETTINGS;
+        }
+        // Outbox, Drafts, and Sent don't allow mail to be moved to them
+        if (mailboxType == Mailbox.TYPE_MAIL || mailboxType == Mailbox.TYPE_TRASH ||
+                mailboxType == Mailbox.TYPE_JUNK || mailboxType == Mailbox.TYPE_INBOX) {
+            flags |= Mailbox.FLAG_ACCEPTS_MOVED_MAIL;
+        }
+        cv.put(MailboxColumns.FLAGS, flags);
+
+        // Make boxes like Contacts and Calendar invisible in the folder list
+        cv.put(MailboxColumns.FLAG_VISIBLE, (mailboxType < Mailbox.TYPE_NOT_EMAIL));
+
+        mOperations.add(
+                ContentProviderOperation.newInsert(Mailbox.CONTENT_URI).withValues(cv).build());
+
+        mCreatedFolderTypes.put(mailboxType, true);
+    }
+
+    /**
+     * Add the appropriate {@link ContentProviderOperation} to {@link #mOperations} for an Add
+     * change in the FolderSync response.
+     * @throws IOException
+     */
+    private void addParser() throws IOException {
+        String name = null;
+        String serverId = null;
+        String parentId = null;
+        int type = 0;
+
+        while (nextTag(Tags.FOLDER_ADD) != END) {
+            switch (tag) {
+                case Tags.FOLDER_DISPLAY_NAME: {
+                    name = getValue();
+                    break;
+                }
+                case Tags.FOLDER_TYPE: {
+                    type = getValueInt();
+                    break;
+                }
+                case Tags.FOLDER_PARENT_ID: {
+                    parentId = getValue();
+                    break;
+                }
+                case Tags.FOLDER_SERVER_ID: {
+                    serverId = getValue();
+                    break;
+                }
+                default:
+                    skipTag();
+            }
+        }
+        if (name != null && serverId != null && parentId != null) {
+            final int mailboxType = MAILBOX_TYPE_MAP.get(type, Mailbox.TYPE_NONE);
+            if (mailboxType != Mailbox.TYPE_NONE) {
+                addMailboxOp(name, serverId, parentId, mailboxType, true);
+            }
+        }
+    }
+
+    /**
+     * Add the appropriate {@link ContentProviderOperation} to {@link #mOperations} for an Update
+     * change in the FolderSync response.
+     * @throws IOException
+     */
+    private void updateParser() throws IOException {
+        String serverId = null;
+        String displayName = null;
+        String parentId = null;
+        while (nextTag(Tags.FOLDER_UPDATE) != END) {
+            switch (tag) {
+                case Tags.FOLDER_SERVER_ID:
+                    serverId = getValue();
+                    break;
+                case Tags.FOLDER_DISPLAY_NAME:
+                    displayName = getValue();
+                    break;
+                case Tags.FOLDER_PARENT_ID:
+                    parentId = getValue();
+                    break;
+                default:
+                    skipTag();
+                    break;
+            }
+        }
+        // We'll make a change if one of parentId or displayName are specified
+        // serverId is required, but let's be careful just the same
+        if (serverId != null && (displayName != null || parentId != null)) {
+            final Cursor c = getServerIdCursor(serverId);
+            try {
+                // If we find the mailbox (using serverId), make the change
+                if (c.moveToFirst()) {
+                    LogUtils.i(TAG, "Updating %s", serverId);
+                    final ContentValues cv = new ContentValues();
+                    // Store the new parent key.
+                    cv.put(Mailbox.PARENT_SERVER_ID, parentId);
+                    // Fix up old and new parents, as needed
+                    if (!TextUtils.isEmpty(parentId)) {
+                        mParentFixupsNeeded.add(parentId);
+                    } else {
+                        cv.put(Mailbox.PARENT_KEY, Mailbox.NO_MAILBOX);
+                    }
+                    final String oldParentId = c.getString(MAILBOX_ID_COLUMNS_PARENT_SERVER_ID);
+                    if (!TextUtils.isEmpty(oldParentId)) {
+                        mParentFixupsNeeded.add(oldParentId);
+                    }
+                    // Set display name if we've got one
+                    if (displayName != null) {
+                        cv.put(Mailbox.DISPLAY_NAME, displayName);
+                    }
+                    mOperations.add(ContentProviderOperation.newUpdate(
+                            ContentUris.withAppendedId(Mailbox.CONTENT_URI,
+                                    c.getLong(MAILBOX_ID_COLUMNS_ID))).withValues(cv).build());
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    /**
+     * Handle the Changes element of the FolderSync response. This is the container for Add, Delete,
+     * and Update elements.
+     * @throws IOException
+     */
+    private void changesParser() throws IOException {
+        while (nextTag(Tags.FOLDER_CHANGES) != END) {
+            if (tag == Tags.FOLDER_ADD) {
+                addParser();
+            } else if (tag == Tags.FOLDER_DELETE) {
+                deleteParser();
+            } else if (tag == Tags.FOLDER_UPDATE) {
+                updateParser();
+            } else if (tag == Tags.FOLDER_COUNT) {
+                // TODO: Maybe we can make use of this count somehow.
+                getValueInt();
+            } else
+                skipTag();
+        }
+    }
+
+    /**
+     * Commit the contents of {@link #mOperations} to the content provider.
+     * @throws IOException
+     */
+    private void flushOperations() throws IOException {
+        if (mOperations.isEmpty()) {
+            return;
+        }
+        // Execute the batch; throw IOExceptions if this fails, hoping the issue isn't repeatable
+        // If it IS repeatable, there's no good result, since the folder list will be invalid
+        try {
+            mContentResolver.applyBatch(EmailContent.AUTHORITY, mOperations);
+        } catch (final RemoteException e) {
+            LogUtils.e(TAG, "RemoteException in commit");
+            throw new IOException("RemoteException in commit");
+        } catch (final OperationApplicationException e) {
+            LogUtils.e(TAG, "OperationApplicationException in commit");
+            throw new IOException("OperationApplicationException in commit");
+        }
+        mOperations.clear();
+    }
+
+    /**
+     * Fix folder data for any folders whose parent or children changed during this sync.
+     * Unfortunately this cannot be done in the same pass as the actual sync: newly synced folders
+     * lack ids until they're committed to the content provider, so we can't set the parentKey
+     * for their children.
+     * During parsing, we only track the parents who have changed. We need to do a query for
+     * children anyway (to determine whether a parent still has any) so it's simpler to not bother
+     * tracking which folders have had their parents changed.
+     * TODO: Figure out if we can avoid the two-pass.
+     * @throws IOException
+     */
+    private void doParentFixups() throws IOException {
+        if (mParentFixupsNeeded.isEmpty()) {
+            return;
+        }
+
+        // These objects will be used in every loop iteration, so create them here for efficiency
+        // and just reset the values inside the loop as necessary.
+        final String[] bindArguments = new String[2];
+        bindArguments[1] = mAccountIdAsString;
+        final ContentValues cv = new ContentValues(2);
+
+        for (final String parentServerId : mParentFixupsNeeded) {
+            // Get info about this parent.
+            bindArguments[0] = parentServerId;
+            final Cursor parentCursor = mContentResolver.query(Mailbox.CONTENT_URI,
+                    FIXUP_PARENT_PROJECTION, WHERE_SERVER_ID_AND_ACCOUNT, bindArguments, null);
+            if (parentCursor == null) {
+                // TODO: Error handling.
+                continue;
+            }
+            final long parentId;
+            final String parentHierarchicalName;
+            final int parentFlags;
+            try {
+                if (parentCursor.moveToFirst()) {
+                    parentId = parentCursor.getLong(FIXUP_PARENT_ID_COLUMN);
+                    final String hierarchicalName = parentCursor.getString(
+                            FIXUP_PARENT_HIERARCHICAL_NAME_COLUMN);
+                    if (hierarchicalName != null) {
+                        parentHierarchicalName = hierarchicalName;
+                    } else {
+                        parentHierarchicalName = parentCursor.getString(
+                                FIXUP_PARENT_DISPLAY_NAME_COLUMN);
+                    }
+                    parentFlags = parentCursor.getInt(FIXUP_PARENT_FLAGS_COLUMN);
+                } else {
+                    // TODO: Error handling.
+                    continue;
+                }
+            } finally {
+                parentCursor.close();
+            }
+
+            // Fix any children for this parent.
+            final Cursor childCursor = mContentResolver.query(Mailbox.CONTENT_URI,
+                    FIXUP_CHILD_PROJECTION, WHERE_PARENT_SERVER_ID_AND_ACCOUNT, bindArguments,
+                    null);
+            boolean hasChildren = false;
+            if (childCursor != null) {
+                try {
+                    // Clear the results of the last iteration.
+                    cv.clear();
+                    // All children in this loop share the same parentId.
+                    cv.put(MailboxColumns.PARENT_KEY, parentId);
+                    while (childCursor.moveToNext()) {
+                        final long childId = childCursor.getLong(FIXUP_CHILD_ID_COLUMN);
+                        final String childName =
+                                childCursor.getString(FIXUP_CHILD_DISPLAY_NAME_COLUMN);
+                        cv.put(MailboxColumns.HIERARCHICAL_NAME,
+                                parentHierarchicalName + "/" + childName);
+                        mOperations.add(ContentProviderOperation.newUpdate(
+                                ContentUris.withAppendedId(Mailbox.CONTENT_URI, childId)).
+                                withValues(cv).build());
+                        hasChildren = true;
+                    }
+                } finally {
+                    childCursor.close();
+                }
+            }
+
+            // Fix the parent's flags based on whether it now has children.
+            final int newFlags;
+
+            if (hasChildren) {
+                newFlags = parentFlags | HAS_CHILDREN_FLAGS;
+            } else {
+                newFlags = parentFlags & ~HAS_CHILDREN_FLAGS;
+            }
+            if (newFlags != parentFlags) {
+                cv.clear();
+                cv.put(MailboxColumns.FLAGS, newFlags);
+                mOperations.add(ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+                        Mailbox.CONTENT_URI, parentId)).withValues(cv).build());
+            }
+        }
+
+        flushOperations();
+    }
+
+    @Override
+    public void commandsParser() throws IOException {
+    }
+
+    @Override
+    public void commit() throws IOException {
+        // Set the account sync key.
+        if (mSyncKeyChanged) {
+            final ContentValues cv = new ContentValues(1);
+            cv.put(AccountColumns.SYNC_KEY, mAccount.mSyncKey);
+            mOperations.add(
+                    ContentProviderOperation.newUpdate(mAccount.getUri()).withValues(cv).build());
+        }
+
+        // If this is the initial sync, make sure we have all the required folder types.
+        if (mInitialSync) {
+            for (final int requiredType : Mailbox.REQUIRED_FOLDER_TYPES) {
+                if (!mCreatedFolderTypes.get(requiredType)) {
+                    addMailboxOp(Mailbox.getSystemMailboxName(mContext, requiredType),
+                            null, null, requiredType, false);
+                }
+            }
+        }
+
+        // Send all operations so far.
+        flushOperations();
+
+        // Now that new mailboxes are committed, let's do parent fixups.
+        doParentFixups();
+
+        // Look for sync issues and its children and delete them
+        // I'm not aware of any other way to deal with this properly
+        mBindArguments[0] = "Sync Issues";
+        mBindArguments[1] = mAccountIdAsString;
+        Cursor c = mContentResolver.query(Mailbox.CONTENT_URI,
+                MAILBOX_ID_COLUMNS_PROJECTION, WHERE_DISPLAY_NAME_AND_ACCOUNT,
+                mBindArguments, null);
+        String parentServerId = null;
+        long id = 0;
+        try {
+            if (c.moveToFirst()) {
+                id = c.getLong(MAILBOX_ID_COLUMNS_ID);
+                parentServerId = c.getString(MAILBOX_ID_COLUMNS_SERVER_ID);
+            }
+        } finally {
+            c.close();
+        }
+        if (parentServerId != null) {
+            mContentResolver.delete(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id),
+                    null, null);
+            mBindArguments[0] = parentServerId;
+            mContentResolver.delete(Mailbox.CONTENT_URI, WHERE_PARENT_SERVER_ID_AND_ACCOUNT,
+                    mBindArguments);
+        }
+
+        // If we have saved options, restore them now
+        if (mInitialSync) {
+            restoreMailboxSyncOptions();
+        }
+    }
+
+    @Override
+    public void responsesParser() throws IOException {
+    }
+
+}

diff --git a/exchange2/src/com/android/exchange/adapter/GalParser.java b/src/com/android/exchange/adapter/GalParser.java
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/GalParser.java
rename to src/com/android/exchange/adapter/GalParser.java


diff --git a/src/com/android/exchange/adapter/ItemOperationsParser.java b/src/com/android/exchange/adapter/ItemOperationsParser.java
new file mode 100644
index 0000000..b383993
--- /dev/null
+++ b/src/com/android/exchange/adapter/ItemOperationsParser.java

@@ -0,0 +1,144 @@
+/* Copyright (C) 2011 The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.adapter;
+
+import com.android.exchange.service.EasAttachmentLoader.ProgressCallback;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Parse the result of an ItemOperations command; we use this to load attachments in EAS 14.0
+ */
+public class ItemOperationsParser extends Parser {
+    private static final int CHUNK_SIZE = 16*1024;
+
+    private int mStatusCode = 0;
+    private final OutputStream mAttachmentOutputStream;
+    private final long mAttachmentSize;
+    private final ProgressCallback mCallback;
+
+    public ItemOperationsParser(final InputStream in, final OutputStream out, final long size,
+            final ProgressCallback callback) throws IOException {
+        super(in);
+        mAttachmentOutputStream = out;
+        mAttachmentSize = size;
+        mCallback = callback;
+    }
+
+    public int getStatusCode() {
+        return mStatusCode;
+    }
+
+    private void parseProperties() throws IOException {
+        while (nextTag(Tags.ITEMS_PROPERTIES) != END) {
+            if (tag == Tags.ITEMS_DATA) {
+                // Wrap the input stream in our custom base64 input stream
+                Base64InputStream bis = new Base64InputStream(getInput());
+                // Read the attachment
+                readChunked(bis, mAttachmentOutputStream, mAttachmentSize, mCallback);
+            } else {
+                skipTag();
+            }
+        }
+    }
+
+    private void parseFetch() throws IOException {
+        while (nextTag(Tags.ITEMS_FETCH) != END) {
+            if (tag == Tags.ITEMS_PROPERTIES) {
+                parseProperties();
+            } else {
+                skipTag();
+            }
+        }
+    }
+
+    private void parseResponse() throws IOException {
+        while (nextTag(Tags.ITEMS_RESPONSE) != END) {
+            if (tag == Tags.ITEMS_FETCH) {
+                parseFetch();
+            } else {
+                skipTag();
+            }
+        }
+    }
+
+    @Override
+    public boolean parse() throws IOException {
+        boolean res = false;
+        if (nextTag(START_DOCUMENT) != Tags.ITEMS_ITEMS) {
+            throw new IOException();
+        }
+        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
+            if (tag == Tags.ITEMS_STATUS) {
+                // Save the status code
+                mStatusCode = getValueInt();
+            } else if (tag == Tags.ITEMS_RESPONSE) {
+                parseResponse();
+            } else {
+                skipTag();
+            }
+        }
+        return res;
+    }
+
+    /**
+     * Read the attachment data in chunks and write the data back out to our attachment file
+     * @param inputStream the InputStream we're reading the attachment from
+     * @param outputStream the OutputStream the attachment will be written to
+     * @param length the number of expected bytes we're going to read
+     * @param callback A {@link ProgressCallback} to use to send progress updates to the UI.
+     * @throws IOException
+     */
+    public static void readChunked(final InputStream inputStream, final OutputStream outputStream,
+            final long length, final ProgressCallback callback) throws IOException {
+        final byte[] bytes = new byte[CHUNK_SIZE];
+        // Loop terminates 1) when EOF is reached or 2) IOException occurs
+        // One of these is guaranteed to occur
+        int totalRead = 0;
+        long lastCallbackPct = -1;
+        int lastCallbackTotalRead = 0;
+        while (true) {
+            final int read = inputStream.read(bytes, 0, CHUNK_SIZE);
+            if (read < 0) {
+                // -1 means EOF
+                break;
+            }
+
+            // Keep track of how much we've read for progress callback
+            totalRead += read;
+            // Write these bytes out
+            outputStream.write(bytes, 0, read);
+
+            // We can't report percentage if data is chunked; the length of incoming data is unknown
+            if (length > 0) {
+                final int pct = (int)((totalRead * 100) / length);
+                // Callback only if we've read at least 1% more and have read more than CHUNK_SIZE
+                // We don't want to spam the Email app
+                if ((pct > lastCallbackPct) && (totalRead > (lastCallbackTotalRead + CHUNK_SIZE))) {
+                    // Report progress back to the UI
+                    callback.doCallback(pct);
+
+                    // TODO: Fix this.
+                    //doProgressCallback(pct);
+                    lastCallbackTotalRead = totalRead;
+                    lastCallbackPct = pct;
+                }
+            }
+        }
+    }
+}

diff --git a/exchange2/src/com/android/exchange/adapter/MeetingResponseParser.java b/src/com/android/exchange/adapter/MeetingResponseParser.java
similarity index 79%
rename from exchange2/src/com/android/exchange/adapter/MeetingResponseParser.java
rename to src/com/android/exchange/adapter/MeetingResponseParser.java
index 142c419..dbfda19 100644
--- a/exchange2/src/com/android/exchange/adapter/MeetingResponseParser.java
+++ b/src/com/android/exchange/adapter/MeetingResponseParser.java

@@ -15,7 +15,7 @@
 
 package com.android.exchange.adapter;
 
-import com.android.exchange.EasSyncService;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,22 +24,21 @@
  * Parse the result of a MeetingRequest command.
  */
 public class MeetingResponseParser extends Parser {
-    private EasSyncService mService;
+    private static final String TAG = "MeetingResponseParser";
 
-    public MeetingResponseParser(InputStream in, EasSyncService service) throws IOException {
+    public MeetingResponseParser(final InputStream in) throws IOException {
         super(in);
-        mService = service;
     }
 
-    public void parseResult() throws IOException {
+    private void parseResult() throws IOException {
         while (nextTag(Tags.MREQ_RESULT) != END) {
             if (tag == Tags.MREQ_STATUS) {
                 int status = getValueInt();
                 if (status != 1) {
-                    mService.userLog("Error in meeting response: " + status);
+                    LogUtils.i(TAG, "Error in meeting response: %d", status);
                 }
             } else if (tag == Tags.MREQ_CAL_ID) {
-                mService.userLog("Meeting response calendar id: " + getValue());
+                LogUtils.i(TAG, "Meeting response calender id: %s", getValue());
             } else {
                 skipTag();
             }

diff --git a/exchange2/src/com/android/exchange/adapter/MoveItemsParser.java b/src/com/android/exchange/adapter/MoveItemsParser.java
similarity index 91%
rename from exchange2/src/com/android/exchange/adapter/MoveItemsParser.java
rename to src/com/android/exchange/adapter/MoveItemsParser.java
index 542331d..a654c76 100644
--- a/exchange2/src/com/android/exchange/adapter/MoveItemsParser.java
+++ b/src/com/android/exchange/adapter/MoveItemsParser.java

@@ -15,7 +15,7 @@
 
 package com.android.exchange.adapter;
 
-import com.android.exchange.EasSyncService;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +24,7 @@
  * Parse the result of a MoveItems command.
  */
 public class MoveItemsParser extends Parser {
-    private final EasSyncService mService;
+    private static final String TAG = "MoveItemsParser";
     private int mStatusCode = 0;
     private String mNewServerId;
 
@@ -42,9 +42,8 @@
     public static final int STATUS_CODE_REVERT = 2;
     public static final int STATUS_CODE_RETRY = 3;
 
-    public MoveItemsParser(InputStream in, EasSyncService service) throws IOException {
+    public MoveItemsParser(InputStream in) throws IOException {
         super(in);
-        mService = service;
     }
 
     public int getStatusCode() {
@@ -83,11 +82,11 @@
                 }
                 if (status != STATUS_SUCCESS) {
                     // There's not much to be done if this fails
-                    mService.userLog("Error in MoveItems: " + status);
+                    LogUtils.i(TAG, "Error in MoveItems: %d", status);
                 }
             } else if (tag == Tags.MOVE_DSTMSGID) {
                 mNewServerId = getValue();
-                mService.userLog("Moved message id is now: " + mNewServerId);
+                LogUtils.i(TAG, "Moved message id is now: %s", mNewServerId);
             } else {
                 skipTag();
             }

diff --git a/exchange2/src/com/android/exchange/adapter/Parser.java b/src/com/android/exchange/adapter/Parser.java
similarity index 97%
rename from exchange2/src/com/android/exchange/adapter/Parser.java
rename to src/com/android/exchange/adapter/Parser.java
index d24e6c1..8064e8b 100644
--- a/exchange2/src/com/android/exchange/adapter/Parser.java
+++ b/src/com/android/exchange/adapter/Parser.java

@@ -18,11 +18,11 @@
 package com.android.exchange.adapter;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.android.exchange.Eas;
 import com.android.exchange.EasException;
 import com.android.exchange.utility.FileLogger;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.io.ByteArrayOutputStream;
@@ -40,6 +40,8 @@
 public abstract class Parser {
     private static final boolean LOG_VERBOSE = false;
 
+    private static final String LOG_TAG = "EAS Parser";
+
     // The following constants are Wbxml standard
     public static final int START_DOCUMENT = 0;
     public static final int DONE = 1;
@@ -50,13 +52,13 @@
     private static final int NOT_FETCHED = Integer.MIN_VALUE;
     private static final int NOT_ENDED = Integer.MIN_VALUE;
     private static final int EOF_BYTE = -1;
-    private boolean logging = false;
-    private boolean capture = false;
-    private String logTag = "EAS Parser";
 
     // Where tags start in a page
     private static final int TAG_BASE = 5;
 
+    private boolean logging = false;
+    private boolean capture = false;
+
     private ArrayList<Integer> captureArray;
 
     // The input stream for this parser
@@ -111,6 +113,8 @@
     // The value read, as bytes
     public byte[] bytes;
 
+    // TODO: Define a new parse exception type rather than lumping these in as IOExceptions.
+
     /**
      * Generated when the parser comes to EOF prematurely during parsing (i.e. in error)
      */
@@ -176,8 +180,8 @@
     }
 
     /**
-     * Set the debug state of the parser.  When debugging is on, every token is logged (Log.v) to
-     * the console.
+     * Set the debug state of the parser.  When debugging is on, every token is logged (LogUtils.v)
+     * to the console.
      *
      * @param val the desired state for debug output
      */
@@ -190,16 +194,6 @@
     }
 
     /**
-     * Set the tag used for logging.  When debugging is on, every token is logged (Log.v) to
-     * the console.
-     *
-     * @param val the logging tag
-     */
-    public void setLoggingTag(String val) {
-        logTag = val;
-    }
-
-    /**
      * Turns on data capture; this is used to create test streams that represent "live" data and
      * can be used against the various parsers.
      */
@@ -390,9 +384,9 @@
         if (cr > 0) {
             str = str.substring(0, cr);
         }
-        Log.v(logTag, str);
+        LogUtils.v(LOG_TAG, str);
         if (Eas.FILE_LOG) {
-            FileLogger.log(logTag, str);
+            FileLogger.log(LOG_TAG, str);
         }
     }
 

diff --git a/src/com/android/exchange/adapter/PingParser.java b/src/com/android/exchange/adapter/PingParser.java
new file mode 100644
index 0000000..9c0c424
--- /dev/null
+++ b/src/com/android/exchange/adapter/PingParser.java

@@ -0,0 +1,240 @@
+/* Copyright (C) 2008-2009 Marc Blank
+ * Licensed to The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.adapter;
+
+import com.android.mail.utils.LogUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+/**
+ * Parse the result of a Ping command.
+ * After {@link #parse()}, {@link #getPingStatus()} will give a valid status value. Also, when
+ * appropriate one of {@link #getSyncList()}, {@link #getMaxFolders()}, or
+ * {@link #getHeartbeatInterval()} will contain further detailed results of the parsing.
+ */
+public class PingParser extends Parser {
+    private static final String TAG = "PingParser";
+
+    /** Sentinel value, used when some property doesn't have a meaningful value. */
+    public static final int NO_VALUE = -1;
+
+    // The following are the actual status codes from the Exchange server.
+    // See http://msdn.microsoft.com/en-us/library/gg663456(v=exchg.80).aspx for more details.
+    /** Indicates that the heartbeat interval expired before a change happened. */
+    public static final int STATUS_EXPIRED = 1;
+    /** Indicates that one or more of the pinged folders changed. */
+    public static final int STATUS_CHANGES_FOUND = 2;
+    /** Indicates that the ping request was missing required parameters. */
+    public static final int STATUS_REQUEST_INCOMPLETE = 3;
+    /** Indicates that the ping request was malformed. */
+    public static final int STATUS_REQUEST_MALFORMED = 4;
+    /** Indicates that the ping request specified a bad heartbeat (too small or too big). */
+    public static final int STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS = 5;
+    /** Indicates that the ping requested more folders than the server will permit. */
+    public static final int STATUS_REQUEST_TOO_MANY_FOLDERS = 6;
+    /** Indicates that the folder structure is out of sync. */
+    public static final int STATUS_FOLDER_REFRESH_NEEDED = 7;
+    /** Indicates a server error. */
+    public static final int STATUS_SERVER_ERROR = 8;
+
+    private int mPingStatus = NO_VALUE;
+    private final ArrayList<String> mSyncList = new ArrayList<String>();
+    private int mMaxFolders = NO_VALUE;
+    private int mHeartbeatInterval = NO_VALUE;
+
+    public PingParser(final InputStream in) throws IOException {
+        super(in);
+    }
+
+    /**
+     * @return The status for this ping.
+     */
+    public int getPingStatus() {
+        return mPingStatus;
+    }
+
+    /**
+     * If {@link #getPingStatus} indicates that there are folders to sync, this will return which
+     * folders need syncing.
+     * @return The list of folders to sync, or null if sync was not indicated in the response.
+     */
+    public ArrayList<String> getSyncList() {
+        if (mPingStatus != STATUS_CHANGES_FOUND) {
+            return null;
+        }
+        return mSyncList;
+    }
+
+    /**
+     * If {@link #getPingStatus} indicates that we asked for too many folders, this will return the
+     * limit.
+     * @return The maximum number of folders we may ping, or {@link #NO_VALUE} if no maximum was
+     * indicated in the response.
+     */
+    public int getMaxFolders() {
+        if (mPingStatus != STATUS_REQUEST_TOO_MANY_FOLDERS) {
+            return NO_VALUE;
+        }
+        return mMaxFolders;
+    }
+
+    /**
+     * If {@link #getPingStatus} indicates that we specified an invalid heartbeat, this will return
+     * a valid heartbeat to use.
+     * @return If our request asked for too small a heartbeat, this will return the minimum value
+     *         permissible. If the request was too large, this will return the maximum value
+     *         permissible. Otherwise, this returns {@link #NO_VALUE}.
+     */
+    public int getHeartbeatInterval() {
+        if (mPingStatus != STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS) {
+            return NO_VALUE;
+        }
+        return mHeartbeatInterval;
+    }
+
+    /**
+     * Checks whether a status code implies we ought to send another ping immediately.
+     * @param pingStatus The ping status value we wish to check.
+     * @return Whether we should send another ping immediately.
+     */
+    public static boolean shouldPingAgain(final int pingStatus) {
+        // Explanation for why we ping again for each case:
+        // - If the ping expired we should keep looping with pings.
+        // - The EAS spec says to handle incomplete and malformed request errors by pinging again
+        //   with corrected request data. Since we always send a complete request, we simply
+        //   repeat (and assume that some sort of network error is what caused the corruption).
+        // - Heartbeat errors are handled by pinging with a better heartbeat value.
+        // - Other server errors are considered transient and therefore we just reping for those.
+        return  pingStatus == STATUS_EXPIRED
+                || pingStatus == STATUS_REQUEST_INCOMPLETE
+                || pingStatus == STATUS_REQUEST_MALFORMED
+                // TODO: Implement heartbeat adjusting and re-enable this.
+                // || pingStatus == STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS
+                || pingStatus == STATUS_SERVER_ERROR;
+    }
+
+    /**
+     * Parse the Folders element of the ping response, and store the results.
+     * @throws IOException
+     */
+    private void parsePingFolders() throws IOException {
+        while (nextTag(Tags.PING_FOLDERS) != END) {
+            if (tag == Tags.PING_FOLDER) {
+                // Here we'll keep track of which mailboxes need syncing
+                String serverId = getValue();
+                mSyncList.add(serverId);
+                LogUtils.i(TAG, "Changes found in: %s", serverId);
+            } else {
+                skipTag();
+            }
+        }
+    }
+
+    /**
+     * Parse an integer value from the response for a particular property, and bounds check the
+     * new value. A property cannot be set more than once.
+     * @param name The name of the property we're parsing (for logging purposes).
+     * @param currentValue The current value of the property we're parsing.
+     * @param minValue The minimum value for the property we're parsing.
+     * @param maxValue The maximum value for the property we're parsing.
+     * @return The new value of the property we're parsing.
+
+     */
+    private int getValue(final String name, final int currentValue, final int minValue,
+            final int maxValue) throws IOException {
+        if (currentValue != NO_VALUE) {
+            throw new IOException("Response has multiple values for " + name);
+        }
+        final int value = getValueInt();
+        if (value < minValue || (maxValue > 0 && value > maxValue)) {
+            throw new IOException(name + " out of bounds: " + value);
+        }
+        return value;
+    }
+
+    /**
+     * Parse an integer value from the response for a particular property, and ensure it is
+     * positive. A value cannot be set more than once.
+     * @param name The name of the property we're parsing (for logging purposes).
+     * @param currentValue The current value of the property we're parsing.
+     * @return The new value of the property we're parsing.
+     * @throws IOException
+     */
+    private int getValue(final String name, final int currentValue) throws IOException {
+        return getValue(name, currentValue, 1, -1);
+    }
+
+    /**
+     * Parse the entire response, and set our internal state accordingly.
+     * @return Whether the response was well-formed.
+     * @throws IOException
+     */
+    @Override
+    public boolean parse() throws IOException {
+        if (nextTag(START_DOCUMENT) != Tags.PING_PING) {
+            throw new IOException("Ping response does not include a Ping element");
+        }
+        while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
+            if (tag == Tags.PING_STATUS) {
+                mPingStatus = getValue("Status", mPingStatus, STATUS_EXPIRED,
+                        STATUS_SERVER_ERROR);
+            } else if (tag == Tags.PING_MAX_FOLDERS) {
+                mMaxFolders = getValue("MaxFolders", mMaxFolders);
+            } else if (tag == Tags.PING_FOLDERS) {
+                if (!mSyncList.isEmpty()) {
+                    throw new IOException("Response has multiple values for Folders");
+                }
+                parsePingFolders();
+                final int count = mSyncList.size();
+                LogUtils.i(TAG, "Folders has %d elements", count);
+                if (count == 0) {
+                    throw new IOException("Folders was empty");
+                }
+            } else if (tag == Tags.PING_HEARTBEAT_INTERVAL) {
+                mHeartbeatInterval = getValue("HeartbeatInterval", mHeartbeatInterval);
+            } else {
+                // TODO: Error?
+                skipTag();
+            }
+        }
+
+        // Check the parse results for status values that don't match the other output.
+
+        switch (mPingStatus) {
+            case NO_VALUE:
+                throw new IOException("No status set in ping response");
+            case STATUS_CHANGES_FOUND:
+                if (mSyncList.isEmpty()) {
+                    throw new IOException("No changes found in ping response");
+                }
+                break;
+            case STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS:
+                if (mHeartbeatInterval == NO_VALUE) {
+                    throw new IOException("No value specified for heartbeat out of bounds");
+                }
+                break;
+            case STATUS_REQUEST_TOO_MANY_FOLDERS:
+                if (mMaxFolders == NO_VALUE) {
+                    throw new IOException("No value specified for too many folders");
+                }
+                break;
+        }
+        return true;
+    }
+}

diff --git a/exchange2/src/com/android/exchange/adapter/ProvisionParser.java b/src/com/android/exchange/adapter/ProvisionParser.java
similarity index 88%
rename from exchange2/src/com/android/exchange/adapter/ProvisionParser.java
rename to src/com/android/exchange/adapter/ProvisionParser.java
index 0825f74..7b69b06 100644
--- a/exchange2/src/com/android/exchange/adapter/ProvisionParser.java
+++ b/src/com/android/exchange/adapter/ProvisionParser.java

@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
 
 import com.android.emailcommon.provider.Policy;
-import com.android.exchange.EasSyncService;
 import com.android.exchange.R;
+import com.android.exchange.service.EasAccountValidator;
+import com.android.mail.utils.LogUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -32,13 +32,17 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 /**
  * Parse the result of the Provision command
  */
 public class ProvisionParser extends Parser {
-    private final EasSyncService mService;
+    private static final String TAG = "ProvisionParser";
+
+    private final Context mContext;
     private Policy mPolicy = null;
     private String mSecuritySyncKey = null;
     private boolean mRemoteWipe = false;
@@ -46,10 +50,10 @@
     private boolean smimeRequired = false;
     private final Resources mResources;
 
-    public ProvisionParser(InputStream in, EasSyncService service) throws IOException {
+    public ProvisionParser(final Context context, final InputStream in) throws IOException {
         super(in);
-        mService = service;
-        mResources = service.mContext.getResources();
+        mContext = context;
+        mResources = context.getResources();
     }
 
     public Policy getPolicy() {
@@ -102,8 +106,8 @@
     }
 
     private boolean deviceSupportsEncryption() {
-        DevicePolicyManager dpm = (DevicePolicyManager)
-                mService.mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
         int status = dpm.getStorageEncryptionStatus();
         return status != DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED;
     }
@@ -238,21 +242,10 @@
                         log("Policy requires SD card encryption");
                         // Let's see if this can be supported on our device...
                         if (deviceSupportsEncryption()) {
-                            StorageManager sm = (StorageManager)mService.mContext.getSystemService(
-                                    Context.STORAGE_SERVICE);
                             // NOTE: Private API!
                             // Go through volumes; if ANY are removable, we can't support this
                             // policy.
-                            StorageVolume[] volumeList = sm.getVolumeList();
-                            for (StorageVolume volume: volumeList) {
-                                if (volume.isRemovable()) {
-                                    tagIsSupported = false;
-                                    log("Removable: " + volume.getDescription(mService.mContext));
-                                    break;  // Break only from the storage volume loop
-                                } else {
-                                    log("Not Removable: " + volume.getDescription(mService.mContext));
-                                }
-                            }
+                            tagIsSupported = !hasRemovableStorage();
                             if (tagIsSupported) {
                                 // If this policy is requested, we MUST also require encryption
                                 log("Device supports SD card encryption");
@@ -421,7 +414,7 @@
     /**
      * Return true if password is required; otherwise false.
      */
-    private boolean parseSecurityPolicy(XmlPullParser parser, Policy policy)
+    private static boolean parseSecurityPolicy(XmlPullParser parser)
             throws XmlPullParserException, IOException {
         boolean passwordRequired = true;
         while (true) {
@@ -444,7 +437,7 @@
         return passwordRequired;
     }
 
-    private void parseCharacteristic(XmlPullParser parser, Policy policy)
+    private static void parseCharacteristic(XmlPullParser parser, Policy policy)
             throws XmlPullParserException, IOException {
         boolean enforceInactivityTimer = true;
         while (true) {
@@ -486,7 +479,7 @@
         }
     }
 
-    private void parseRegistry(XmlPullParser parser, Policy policy)
+    private static void parseRegistry(XmlPullParser parser, Policy policy)
             throws XmlPullParserException, IOException {
       while (true) {
           int type = parser.nextTag();
@@ -501,7 +494,7 @@
       }
     }
 
-    private void parseWapProvisioningDoc(XmlPullParser parser, Policy policy)
+    private static void parseWapProvisioningDoc(XmlPullParser parser, Policy policy)
             throws XmlPullParserException, IOException {
         while (true) {
             int type = parser.nextTag();
@@ -513,7 +506,7 @@
                     String atype = parser.getAttributeValue(null, "type");
                     if (atype.equals("SecurityPolicy")) {
                         // If a password isn't required, stop here
-                        if (!parseSecurityPolicy(parser, policy)) {
+                        if (!parseSecurityPolicy(parser)) {
                             return;
                         }
                     } else if (atype.equals("Registry")) {
@@ -541,16 +534,16 @@
             switch (tag) {
                 case Tags.PROVISION_POLICY_TYPE:
                     policyType = getValue();
-                    mService.userLog("Policy type: ", policyType);
+                    LogUtils.i(TAG, "Policy type: %s", policyType);
                     break;
                 case Tags.PROVISION_POLICY_KEY:
                     mSecuritySyncKey = getValue();
                     break;
                 case Tags.PROVISION_STATUS:
-                    mService.userLog("Policy status: ", getValue());
+                    LogUtils.i(TAG, "Policy status: %s", getValue());
                     break;
                 case Tags.PROVISION_DATA:
-                    if (policyType.equalsIgnoreCase(EasSyncService.EAS_2_POLICY_TYPE)) {
+                    if (policyType.equalsIgnoreCase(EasAccountValidator.EAS_2_POLICY_TYPE)) {
                         // Parse the old style XML document
                         parseProvisionDocXml(getValue());
                     } else {
@@ -577,7 +570,7 @@
     private void parseDeviceInformation() throws IOException {
         while (nextTag(Tags.SETTINGS_DEVICE_INFORMATION) != END) {
             if (tag == Tags.SETTINGS_STATUS) {
-                mService.userLog("DeviceInformation status: " + getValue());
+                LogUtils.i(TAG, "DeviceInformation status: %s", getValue());
             } else {
                 skipTag();
             }
@@ -594,7 +587,7 @@
             switch (tag) {
                 case Tags.PROVISION_STATUS:
                     int status = getValueInt();
-                    mService.userLog("Provision status: ", status);
+                    LogUtils.i(TAG, "Provision status: %d", status);
                     res = (status == 1);
                     break;
                 case Tags.SETTINGS_DEVICE_INFORMATION:
@@ -613,4 +606,40 @@
         }
         return res;
     }
+
+    /**
+     * In order to determine whether the device has removable storage, we need to use the
+     * StorageVolume class, which is hidden (for now) by the framework.  Without this, we'd have
+     * to reject all policies that require sd card encryption.
+     *
+     * TODO: Rewrite this when an appropriate API is available from the framework
+     */
+    private boolean hasRemovableStorage() {
+        try {
+            StorageManager sm = (StorageManager)mContext.getSystemService(Context.STORAGE_SERVICE);
+            Class<?> svClass = Class.forName("android.os.storage.StorageVolume");
+            Class<?> svManager = Class.forName("android.os.storage.StorageManager");
+            Method gvl = svManager.getDeclaredMethod("getVolumeList");
+            Object[] volumeList = (Object[]) gvl.invoke(sm);
+            for (Object volume: volumeList) {
+                Method isRemovable = svClass.getDeclaredMethod("isRemovable");
+                Method getDescription = svClass.getDeclaredMethod("getDescription");
+                String desc = (String)getDescription.invoke(volume);
+                if ((Boolean)isRemovable.invoke(volume)) {
+                    log("Removable: " + desc);
+                    return true;
+                } else {
+                    log("Not Removable: " + desc);
+                }
+            }
+            return false;
+        } catch (ClassNotFoundException e) {
+        } catch (NoSuchMethodException e) {
+        } catch (IllegalArgumentException e) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        // To be safe, we'll always indicate that there IS removable storage
+        return true;
+    }
 }

diff --git a/exchange2/src/com/android/exchange/adapter/Search.java b/src/com/android/exchange/adapter/Search.java
similarity index 91%
rename from exchange2/src/com/android/exchange/adapter/Search.java
rename to src/com/android/exchange/adapter/Search.java
index dfe835a..f7e5bb3 100644
--- a/exchange2/src/com/android/exchange/adapter/Search.java
+++ b/src/com/android/exchange/adapter/Search.java

@@ -21,22 +21,20 @@
 import android.content.Context;
 import android.content.OperationApplicationException;
 import android.os.RemoteException;
-import android.util.Log;
 
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Message;
 import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.service.EmailServiceStatus;
 import com.android.emailcommon.service.SearchParams;
 import com.android.emailcommon.utility.TextUtilities;
 import com.android.exchange.Eas;
 import com.android.exchange.EasResponse;
 import com.android.exchange.EasSyncService;
-import com.android.exchange.ExchangeService;
 import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
 import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.LogUtils;
 
 import org.apache.http.HttpStatus;
 
@@ -130,15 +128,10 @@
         } catch (IOException e) {
             svc.userLog("Search exception " + e);
         } finally {
-            try {
-                // TODO: Handle error states
-                // Set the status of this mailbox to indicate query over
-                statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.NO_SYNC);
-                searchMailbox.update(context, statusValues);
-                ExchangeService.callback().syncMailboxStatus(destMailboxId,
-                        EmailServiceStatus.SUCCESS, 100);
-            } catch (RemoteException e) {
-            }
+            // TODO: Handle error states
+            // Set the status of this mailbox to indicate query over
+            statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.NO_SYNC);
+            searchMailbox.update(context, statusValues);
         }
         // Return the total count
         return res;
@@ -173,7 +166,7 @@
                 if (tag == Tags.SEARCH_STATUS) {
                     String status = getValue();
                     if (Eas.USER_LOG) {
-                        Log.d(Logging.LOG_TAG, "Search status: " + status);
+                        LogUtils.d(Logging.LOG_TAG, "Search status: " + status);
                     }
                 } else if (tag == Tags.SEARCH_RESPONSE) {
                     parseResponse();
@@ -198,13 +191,13 @@
 
         private boolean parseStore() throws IOException {
             EmailSyncAdapter adapter = new EmailSyncAdapter(mService);
-            EasEmailSyncParser parser = adapter.new EasEmailSyncParser(this, adapter);
+            EasEmailSyncParser parser = new EasEmailSyncParser(this, adapter);
             ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
             boolean res = false;
 
             while (nextTag(Tags.SEARCH_STORE) != END) {
                 if (tag == Tags.SEARCH_STATUS) {
-                    String status = getValue();
+                    getValue();
                 } else if (tag == Tags.SEARCH_TOTAL) {
                     mTotalResults = getValueInt();
                 } else if (tag == Tags.SEARCH_RESULT) {
@@ -220,7 +213,7 @@
                     mService.userLog("Saved " + ops.size() + " search results");
                 }
             } catch (RemoteException e) {
-                Log.d(Logging.LOG_TAG, "RemoteException while saving search results.");
+                LogUtils.d(Logging.LOG_TAG, "RemoteException while saving search results.");
             } catch (OperationApplicationException e) {
             }
 

diff --git a/exchange2/src/com/android/exchange/adapter/Serializer.java b/src/com/android/exchange/adapter/Serializer.java
similarity index 93%
rename from exchange2/src/com/android/exchange/adapter/Serializer.java
rename to src/com/android/exchange/adapter/Serializer.java
index bc79603..626d387 100644
--- a/exchange2/src/com/android/exchange/adapter/Serializer.java
+++ b/src/com/android/exchange/adapter/Serializer.java

@@ -24,10 +24,10 @@
 package com.android.exchange.adapter;
 
 import android.content.ContentValues;
-import android.util.Log;
 
 import com.android.exchange.Eas;
 import com.android.exchange.utility.FileLogger;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.io.ByteArrayOutputStream;
@@ -45,7 +45,7 @@
     private int mDepth;
     private String[] mNameStack = new String[20];
     private int mTagPage = 0;
-    private boolean mLogging = Log.isLoggable(TAG, Log.VERBOSE);
+    private boolean mLogging = LogUtils.isLoggable(TAG, LogUtils.VERBOSE);
 
     public Serializer() throws IOException {
         this(new ByteArrayOutputStream(), true);
@@ -82,7 +82,7 @@
         if (cr > 0) {
             str = str.substring(0, cr);
         }
-        Log.v(TAG, str);
+        LogUtils.v(TAG, str);
         if (Eas.FILE_LOG) {
             FileLogger.log(TAG, str);
         }
@@ -151,7 +151,7 @@
 
     public Serializer data(int tag, String value) throws IOException {
         if (value == null) {
-            Log.e(TAG, "Writing null data for tag: " + tag);
+            LogUtils.e(TAG, "Writing null data for tag: " + tag);
         }
         start(tag);
         text(value);
@@ -161,7 +161,7 @@
 
     public Serializer text(String text) throws IOException {
         if (text == null) {
-            Log.e(TAG, "Writing null text for pending tag: " + mPendingTag);
+            LogUtils.e(TAG, "Writing null text for pending tag: " + mPendingTag);
         }
         checkPendingTag(false);
         mOutput.write(Wbxml.STR_I);
@@ -182,7 +182,7 @@
         // Now write out the opaque data in batches
         byte[] buffer = new byte[BUFFER_SIZE];
         while (length > 0) {
-            int bytesRead = is.read(buffer, 0, (int)Math.min(BUFFER_SIZE, length));
+            int bytesRead = is.read(buffer, 0, Math.min(BUFFER_SIZE, length));
             if (bytesRead == -1) {
                 break;
             }
@@ -223,7 +223,7 @@
         out.write(0);
     }
 
-    void writeStringValue (ContentValues cv, String key, int tag) throws IOException {
+    public void writeStringValue (ContentValues cv, String key, int tag) throws IOException {
         String value = cv.getAsString(key);
         if (value != null && value.length() > 0) {
             data(tag, value);

diff --git a/exchange2/src/com/android/exchange/adapter/SettingsParser.java b/src/com/android/exchange/adapter/SettingsParser.java
similarity index 87%
rename from exchange2/src/com/android/exchange/adapter/SettingsParser.java
rename to src/com/android/exchange/adapter/SettingsParser.java
index 2cbc753..8c493c6 100644
--- a/exchange2/src/com/android/exchange/adapter/SettingsParser.java
+++ b/src/com/android/exchange/adapter/SettingsParser.java

@@ -15,7 +15,7 @@
 
 package com.android.exchange.adapter;
 
-import com.android.exchange.EasSyncService;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,11 +28,11 @@
  * to the actual settings (e.g. if a particular device type isn't allowed by the server)
  */
 public class SettingsParser extends Parser {
-    private final EasSyncService mService;
 
-    public SettingsParser(InputStream in, EasSyncService service) throws IOException {
+    private static final String TAG = "SettingsParser";
+
+    public SettingsParser(InputStream in) throws IOException {
         super(in);
-        mService = service;
     }
 
     @Override
@@ -44,7 +44,7 @@
         while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
             if (tag == Tags.SETTINGS_STATUS) {
                 int status = getValueInt();
-                mService.userLog("Settings status = ", status);
+                LogUtils.i(TAG, "Settings status = %d", status);
                 if (status == 1) {
                     res = true;
                 } else {
@@ -73,7 +73,7 @@
     public void parseSet() throws IOException {
         while (nextTag(Tags.SETTINGS_SET) != END) {
             if (tag == Tags.SETTINGS_STATUS) {
-                mService.userLog("Set status = ", getValueInt());
+                LogUtils.i(TAG, "Set status = %d", getValueInt());
             } else {
                 skipTag();
             }

diff --git a/exchange2/src/com/android/exchange/adapter/Tags.java b/src/com/android/exchange/adapter/Tags.java
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/Tags.java
rename to src/com/android/exchange/adapter/Tags.java


diff --git a/exchange2/src/com/android/exchange/adapter/Wbxml.java b/src/com/android/exchange/adapter/Wbxml.java
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/Wbxml.java
rename to src/com/android/exchange/adapter/Wbxml.java


diff --git a/exchange2/src/com/android/exchange/adapter/patent_disclaimer.txt b/src/com/android/exchange/adapter/patent_disclaimer.txt
similarity index 100%
rename from exchange2/src/com/android/exchange/adapter/patent_disclaimer.txt
rename to src/com/android/exchange/adapter/patent_disclaimer.txt


diff --git a/src/com/android/exchange/eas/EasConnectionCache.java b/src/com/android/exchange/eas/EasConnectionCache.java
new file mode 100644
index 0000000..175f3ca
--- /dev/null
+++ b/src/com/android/exchange/eas/EasConnectionCache.java

@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.eas;
+
+import android.content.Context;
+
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.utility.EmailClientConnectionManager;
+import com.android.exchange.Eas;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.conn.params.ConnManagerPNames;
+import org.apache.http.conn.params.ConnPerRoute;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+
+import java.util.HashMap;
+
+/**
+ * Manage all {@link EmailClientConnectionManager}s used by Exchange operations.
+ * When making connections for persisted accounts, this class will cache and reuse connections
+ * as much as possible. All access of connection objects should accordingly go through this class.
+ *
+ * We use {@link HostAuth}'s id as the cache key. Multiple calls to {@link #getConnectionManager}
+ * with {@link HostAuth} objects with the same id will get the same connection object returned,
+ * i.e. we assume that the rest of the contents of the {@link HostAuth} objects are also the same,
+ * not just the id. If the {@link HostAuth} changes or is deleted, {@link #uncacheConnectionManager}
+ * must be called.
+ *
+ * This cache is a singleton since the whole point is to not have multiples.
+ */
+public class EasConnectionCache {
+
+    private final HashMap<Long, EmailClientConnectionManager> mConnectionMap;
+
+    private static final ConnPerRoute sConnPerRoute = new ConnPerRoute() {
+        @Override
+        public int getMaxForRoute(final HttpRoute route) {
+            return 8;
+        }
+    };
+
+    /** The singleton instance of the cache. */
+    private static EasConnectionCache sCache = null;
+
+    /** Accessor for the cache singleton. */
+    public static EasConnectionCache instance() {
+        if (sCache == null) {
+            sCache = new EasConnectionCache();
+        }
+        return sCache;
+    }
+
+    private EasConnectionCache() {
+        mConnectionMap = new HashMap<Long, EmailClientConnectionManager>();
+    }
+
+    /**
+     * Create an {@link EmailClientConnectionManager} for this {@link HostAuth}.
+     * @param context The {@link Context}.
+     * @param hostAuth The {@link HostAuth} to which we want to connect.
+     * @return The {@link EmailClientConnectionManager} for hostAuth.
+     */
+    private EmailClientConnectionManager createConnectionManager(final Context context,
+            final HostAuth hostAuth) {
+        LogUtils.i(Eas.LOG_TAG, "Creating connection for HostAuth %d", hostAuth.mId);
+        final HttpParams params = new BasicHttpParams();
+        params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 25);
+        params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, sConnPerRoute);
+        return EmailClientConnectionManager.newInstance(context, params, hostAuth);
+    }
+
+    /**
+     * Get the correct {@link EmailClientConnectionManager} for a {@link HostAuth} from our cache.
+     * If it's not in the cache, create and add it.
+     * @param context The {@link Context}.
+     * @param hostAuth The {@link HostAuth} to which we want to connect.
+     * @return The {@link EmailClientConnectionManager} for hostAuth.
+     */
+    private synchronized EmailClientConnectionManager getCachedConnectionManager(
+            final Context context, final HostAuth hostAuth) {
+        LogUtils.i(Eas.LOG_TAG, "Reusing cached connection for HostAuth %d", hostAuth.mId);
+        EmailClientConnectionManager connectionManager = mConnectionMap.get(hostAuth.mId);
+        if (connectionManager == null) {
+            connectionManager = createConnectionManager(context, hostAuth);
+            mConnectionMap.put(hostAuth.mId, connectionManager);
+        }
+        return connectionManager;
+    }
+
+    /**
+     * Get the correct {@link EmailClientConnectionManager} for a {@link HostAuth}. If the
+     * {@link HostAuth} is persistent, then use the cache for this request.
+     * @param context The {@link Context}.
+     * @param hostAuth The {@link HostAuth} to which we want to connect.
+     * @return The {@link EmailClientConnectionManager} for hostAuth.
+     */
+    public EmailClientConnectionManager getConnectionManager(
+            final Context context, final HostAuth hostAuth) {
+        final EmailClientConnectionManager connectionManager;
+        // We only cache the connection manager for persisted HostAuth objects, i.e. objects
+        // whose ids are permanent and won't get reused by other transient HostAuth objects.
+        if (hostAuth.isSaved()) {
+            connectionManager = getCachedConnectionManager(context, hostAuth);
+        } else {
+            connectionManager = createConnectionManager(context, hostAuth);
+        }
+        return connectionManager;
+    }
+
+    /**
+     * Remove a connection manager from the cache. This is necessary when a {@link HostAuth} is
+     * redirected or otherwise altered. It's not strictly necessary but good to also call this
+     * when a {@link HostAuth} is deleted, i.e. when an account is removed.
+     * @param hostAuth The {@link HostAuth} whose connection manager should be deleted.
+     */
+    public synchronized void uncacheConnectionManager(final HostAuth hostAuth) {
+        LogUtils.i(Eas.LOG_TAG, "Uncaching connection for HostAuth %d", hostAuth.mId);
+        mConnectionMap.remove(hostAuth.mId);
+    }
+}

diff --git a/src/com/android/exchange/eas/EasOperation.java b/src/com/android/exchange/eas/EasOperation.java
new file mode 100644
index 0000000..c3d3f6b
--- /dev/null
+++ b/src/com/android/exchange/eas/EasOperation.java

@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.eas;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SyncResult;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.service.EasServerConnection;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ByteArrayEntity;
+
+import java.io.IOException;
+
+/**
+ * Base class for all Exchange operations that use a POST to talk to the server.
+ *
+ * The core of this class is {@link #performOperation}, which provides the skeleton of making
+ * a request, handling common errors, and setting fields on the {@link SyncResult} if there is one.
+ * This class abstracts the connection handling from its subclasses and callers.
+ *
+ * A subclass must implement the abstract functions below that create the request and parse the
+ * response. There are also a set of functions that a subclass may override if it's substantially
+ * different from the "normal" operation (e.g. most requests use the same request URI, but auto
+ * discover deviates since it's not account-specific), but the default implementation should suffice
+ * for most. The subclass must also define a public function which calls {@link #performOperation},
+ * possibly doing nothing other than that. (I chose to force subclasses to do this, rather than
+ * provide that function in the base class, in order to force subclasses to consider, for example,
+ * whether it needs a {@link SyncResult} parameter, and what the proper name for the "doWork"
+ * function ought to be for the subclass.)
+ */
+public abstract class EasOperation {
+    public static final String LOG_TAG = Eas.LOG_TAG;
+
+    /** The maximum number of server redirects we allow before returning failure. */
+    private static final int MAX_REDIRECTS = 3;
+
+    /** Message MIME type for EAS version 14 and later. */
+    private static final String EAS_14_MIME_TYPE = "application/vnd.ms-sync.wbxml";
+
+    protected final Context mContext;
+    private final EasServerConnection mConnection;
+
+    protected EasOperation(final Context context, final Account account, final HostAuth hostAuth) {
+        mContext = context;
+        mConnection = new EasServerConnection(context, account, hostAuth);
+    }
+
+    protected EasOperation(final Context context, final Account account) {
+        this(context, account, HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv));
+    }
+
+    /**
+     * The below constants are the result codes (returned from {@link #performOperation} for errors
+     * that occur in the base class, i.e. those that happen either during making the request or due
+     * to the common error handling. These values are all negative, leaving non-negative values for
+     * {@link #handleResponse}. If {@link #performOperation} returns a negative value, then it's
+     * most likely due to an error in the base class. Subclasses should generally not return
+     * negative values from {@link #handleResponse}, except for possibly
+     * {@link #RESULT_OTHER_FAILURE}.
+     */
+
+    /** Error code for the operation being cancelled via {@link #abort}. */
+    public static final int RESULT_ABORT = -1;
+    /** Error code for the operation being cancelled via {@link #restart}. */
+    public static final int RESULT_RESTART = -2;
+    /** Error code for when the Exchange servers redirect you too many times in a row. */
+    public static final int RESULT_TOO_MANY_REDIRECTS = -3;
+    /** Error code for when the request failed due to a network problem. */
+    public static final int RESULT_REQUEST_FAILURE = -4;
+    /** Error code for all other errors. */
+    public static final int RESULT_OTHER_FAILURE = -5;
+
+    /**
+     * Request that this operation terminate. Intended for use by the sync service to interrupt
+     * running operations, primarily Ping.
+     */
+    public final void abort() {
+        mConnection.stop(EasServerConnection.STOPPED_REASON_ABORT);
+    }
+
+    /**
+     * Request that this operation restart. Intended for use by the sync service to interrupt
+     * running operations, primarily Ping.
+     */
+    public final void restart() {
+        mConnection.stop(EasServerConnection.STOPPED_REASON_RESTART);
+    }
+
+    /**
+     * The skeleton of performing an operation. This function handles all the common code and
+     * error handling, calling into virtual functions that are implemented or overridden by the
+     * subclass to do the operation-specific logic.
+     * @param syncResult If this operation is a sync, the {@link SyncResult} object that should
+     *                   be written to for this sync; otherwise null.
+     * @return A result code for the outcome of this operation, one of the RESULT_* values above.
+     */
+    protected final int performOperation(final SyncResult syncResult) {
+        // We handle server redirects by looping, but we need to protect against too much looping.
+        int redirectCount = 0;
+
+        do {
+            // Perform the POST and handle exceptions.
+            final EasResponse response;
+            try {
+                final HttpPost post = mConnection.makePost(getRequestUri(), getRequestEntity(),
+                        getRequestContentType(), addPolicyKeyHeaderToRequest());
+                response = mConnection.executePost(post, getTimeout());
+            } catch (final IOException e) {
+                // If we were stopped, return the appropriate result code.
+                switch (mConnection.getStoppedReason()) {
+                    case EasServerConnection.STOPPED_REASON_ABORT:
+                        return RESULT_ABORT;
+                    case EasServerConnection.STOPPED_REASON_RESTART:
+                        return RESULT_RESTART;
+                    default:
+                        break;
+                }
+                // If we're here, then we had a IOException that's not from a stop request.
+                LogUtils.e(LOG_TAG, e, "Exception while sending request");
+                if (syncResult != null) {
+                    ++syncResult.stats.numIoExceptions;
+                }
+                return RESULT_REQUEST_FAILURE;
+            } catch (final IllegalStateException e) {
+                // Subclasses use ISE to signal a hard error when building the request.
+                // TODO: If executePost can throw an ISE, we may want to tidy this up a bit.
+                LogUtils.e(LOG_TAG, e, "Exception while sending request");
+                if (syncResult != null) {
+                    syncResult.databaseError = true;
+                }
+                return RESULT_OTHER_FAILURE;
+            }
+
+            // The POST completed, so process the response.
+            try {
+                // First off, the success case.
+                if (response.isSuccess()) {
+                    try {
+                        return handleResponse(response, syncResult);
+                    } catch (final IOException e) {
+                        LogUtils.e(LOG_TAG, e, "Exception while handling response");
+                        if (syncResult != null) {
+                            ++syncResult.stats.numParseExceptions;
+                        }
+                        return RESULT_OTHER_FAILURE;
+                    }
+                }
+
+                // Now handle the error types we know how to deal with.
+                if (response.isForbidden() && handleForbidden()) {
+                    // Some operations distinguish forbidden from provisioning errors, in which
+                    // case there's nothing futher to do here.
+                    LogUtils.e(LOG_TAG, "Forbidden response");
+                } else  if (response.isProvisionError()) {
+                    LogUtils.e(LOG_TAG, "Provisioning error");
+                    handleProvisionError();
+                } else if (response.isAuthError()) {
+                    LogUtils.e(LOG_TAG, "Authentication error");
+                    handleAuthError();
+                } else {
+                    LogUtils.e(LOG_TAG, "Generic error");
+                }
+
+                // If it's not a redirect, we're done.
+                if (!response.isRedirectError()) {
+                    if (syncResult != null) {
+                        if (response.isAuthError()) {
+                            ++syncResult.stats.numAuthExceptions;
+                        } else {
+                            // TODO: Is there a more appropriate stat?
+                            ++syncResult.stats.numIoExceptions;
+                        }
+                    }
+                    return RESULT_OTHER_FAILURE;
+                }
+
+                // For redirects, update our connection and try again.
+                ++redirectCount;
+                mConnection.redirectHostAuth(response.getRedirectAddress());
+            } finally {
+                response.close();
+            }
+        } while (redirectCount < MAX_REDIRECTS);
+
+        // Non-redirects return out of the while loop, so the only way to reach here is if we
+        // looped too many times.
+        LogUtils.e(LOG_TAG, "Too many redirects");
+        if (syncResult != null) {
+           syncResult.tooManyRetries = true;
+        }
+        return RESULT_TOO_MANY_REDIRECTS;
+    }
+
+    /**
+     * Handling for provisioning (i.e. policy enforcement) errors. Should be the same for all
+     * operations.
+     * TODO: Implement.
+     */
+    private final void handleProvisionError() {
+
+    }
+
+    /**
+     * Handling for authentication errors. Should be the same for all operations.
+     * TODO: Implement.
+     */
+    private final void handleAuthError() {
+
+    }
+
+    /**
+     * The following functions MUST be overridden by subclasses; these are things that are unique
+     * to each operation.
+     */
+
+    /**
+     * Get the name of the operation, used as the "Cmd=XXX" query param in the request URI. Note
+     * that if you override {@link #getRequestUri}, then this function may be unused, but it's
+     * abstract in order to make it impossible to omit for the subclasses that do need it.
+     * @return The name of the command for this operation as defined by the EAS protocol.
+     */
+    protected abstract String getCommand();
+
+    /**
+     * Build the {@link HttpEntity} which us used to construct the POST. Typically this function
+     * will build the Exchange request using a {@link Serializer} and then call {@link #makeEntity}.
+     * @return The {@link HttpEntity} to pass to {@link EasServerConnection#makePost}.
+     * @throws IOException
+     */
+    protected abstract HttpEntity getRequestEntity() throws IOException;
+
+    /**
+     * Parse the response from the Exchange perform whatever actions are dictated by that.
+     * @param response The {@link EasResponse} to our request.
+     * @param syncResult The {@link SyncResult} object for this operation, or null if we're not
+     *                   handling a sync.
+     * @return A result code that is returned to the caller of {@link #performOperation}.
+     * @throws IOException
+     */
+    protected abstract int handleResponse(final EasResponse response, final SyncResult syncResult)
+            throws IOException;
+
+    /**
+     * The following functions may be overriden by a subclass, but most operations will not need
+     * to do so.
+     */
+
+    /**
+     * Get the URI for the Exchange server and this operation. Most (signed in) operations need
+     * not override this; the notable operation that needs to override it is auto-discover.
+     * @return
+     */
+    protected String getRequestUri() {
+        return mConnection.makeUriString(getCommand());
+    }
+
+    /**
+     * @return Whether to set the X-MS-PolicyKey header. Only Ping does not want this header.
+     */
+    protected boolean addPolicyKeyHeaderToRequest() {
+        return true;
+    }
+
+    /**
+     * @return The content type of this request.
+     */
+    protected String getRequestContentType() {
+        return EAS_14_MIME_TYPE;
+    }
+
+    /**
+     *
+     * @return The timeout to use for the POST.
+     */
+    protected long getTimeout() {
+        return 30 * DateUtils.SECOND_IN_MILLIS;
+    }
+
+    /**
+     * If 403 responses should be handled in a special way, this function should be overridden to
+     * do that.
+     * @return Whether we handle 403 responses; if false, then treat 403 as a provisioning error.
+     */
+    protected boolean handleForbidden() {
+        return false;
+    }
+
+    /**
+     * Convenience method to make an {@link HttpEntity} from {@link Serializer}.
+     */
+    protected final HttpEntity makeEntity(final Serializer s) {
+        return new ByteArrayEntity(s.toByteArray());
+    }
+
+    protected final double getProtocolVersion() {
+        return mConnection.getProtocolVersion();
+    }
+
+    /**
+     * Convenience method for adding a Message to an account's outbox
+     * @param account The {@link Account} from which to send the message.
+     * @param msg the message to send
+     */
+    protected void sendMessage(final Account account, final EmailContent.Message msg) {
+        long mailboxId = Mailbox.findMailboxOfType(mContext, account.mId, Mailbox.TYPE_OUTBOX);
+        // TODO: Improve system mailbox handling.
+        if (mailboxId == Mailbox.NO_MAILBOX) {
+            LogUtils.d(LOG_TAG, "No outbox for account %d, creating it", account.mId);
+            final Mailbox outbox =
+                    Mailbox.newSystemMailbox(mContext, account.mId, Mailbox.TYPE_OUTBOX);
+            outbox.save(mContext);
+            mailboxId = outbox.mId;
+        }
+        msg.mMailboxKey = mailboxId;
+        msg.mAccountKey = account.mId;
+        msg.save(mContext);
+        requestSyncForMailbox(new android.accounts.Account(account.mEmailAddress,
+                Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), EmailContent.AUTHORITY, mailboxId);
+    }
+
+    /**
+     * Issue a {@link android.content.ContentResolver#requestSync} for a specific mailbox.
+     * @param amAccount The {@link android.accounts.Account} for the account we're pinging.
+     * @param authority The authority for the mailbox that needs to sync.
+     * @param mailboxId The id of the mailbox that needs to sync.
+     */
+    protected static void requestSyncForMailbox(final android.accounts.Account amAccount,
+            final String authority, final long mailboxId) {
+        final Bundle extras = new Bundle(1);
+        extras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, mailboxId);
+        ContentResolver.requestSync(amAccount, authority, extras);
+    }
+}

diff --git a/src/com/android/exchange/eas/EasPing.java b/src/com/android/exchange/eas/EasPing.java
new file mode 100644
index 0000000..081ee94
--- /dev/null
+++ b/src/com/android/exchange/eas/EasPing.java

@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.eas;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.text.format.DateUtils;
+
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.PingParser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpEntity;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Performs an Exchange Ping, which is the command for receiving push notifications.
+ */
+public class EasPing extends EasOperation {
+    private static final String TAG = "EasPingSyncHandler";
+
+    private static final String WHERE_ACCOUNT_KEY_AND_SERVER_ID =
+            MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.SERVER_ID + "=?";
+
+    private final long mAccountId;
+    private final android.accounts.Account mAmAccount;
+
+    // TODO: Implement Heartbeat autoadjustments based on the server responses.
+    /**
+     * The heartbeat interval specified to the Exchange server. This is the maximum amount of
+     * time (in seconds) that the server should wait before responding to the ping request.
+     */
+    private static final long PING_HEARTBEAT =
+            8 * (DateUtils.MINUTE_IN_MILLIS / DateUtils.SECOND_IN_MILLIS);
+
+    /** {@link #PING_HEARTBEAT}, as a String. */
+    private static final String PING_HEARTBEAT_STRING = Long.toString(PING_HEARTBEAT);
+
+    /**
+     * The timeout used for the HTTP POST (in milliseconds). Notionally this should be the same
+     * as {@link #PING_HEARTBEAT} but in practice is a few seconds longer to allow for latency
+     * in the server's response.
+     */
+    private static final long POST_TIMEOUT = (5 + PING_HEARTBEAT) * DateUtils.SECOND_IN_MILLIS;
+
+    public EasPing(final Context context, final Account account) {
+        super(context, account);
+        mAccountId = account.mId;
+        mAmAccount = new android.accounts.Account(account.mEmailAddress,
+                Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+    }
+
+    public final int doPing() {
+        final int result = performOperation(null);
+        if (result == RESULT_RESTART) {
+            return PingParser.STATUS_EXPIRED;
+        }
+        return result;
+    }
+
+    public final long getAccountId() {
+        return mAccountId;
+    }
+
+    public final android.accounts.Account getAmAccount() {
+        return mAmAccount;
+    }
+
+    @Override
+    protected String getCommand() {
+        return "Ping";
+    }
+
+    @Override
+    protected HttpEntity getRequestEntity() throws IOException {
+        // Get the mailboxes that need push notifications.
+        final Cursor c = Mailbox.getMailboxesForPush(mContext.getContentResolver(),
+                mAccountId);
+        if (c == null) {
+            throw new IllegalStateException("Could not read mailboxes");
+        }
+
+        // TODO: Ideally we never even get here unless we already know we want a push.
+        Serializer s = null;
+        try {
+            while (c.moveToNext()) {
+                final Mailbox mailbox = new Mailbox();
+                mailbox.restore(c);
+                s = handleOneMailbox(s, mailbox);
+            }
+        } finally {
+            c.close();
+        }
+
+        if (s == null) {
+            abort();
+            throw new IOException("No mailboxes want push");
+        }
+        // This sequence of end()s corresponds to the start()s that occur in handleOneMailbox when
+        // the Serializer is first created. If either side changes, the other must be kept in sync.
+        s.end().end().done();
+        return makeEntity(s);
+    }
+
+    @Override
+    protected int handleResponse(final EasResponse response, final SyncResult syncResult)
+            throws IOException {
+        if (response.isEmpty()) {
+            throw new IOException("Empty ping response");
+        }
+
+        // Handle a valid response.
+        final PingParser pp = new PingParser(response.getInputStream());
+        pp.parse();
+        final int pingStatus = pp.getPingStatus();
+
+        // Take the appropriate action for this response.
+        // Many of the responses require no explicit action here, they just influence
+        // our re-ping behavior, which is handled by the caller.
+        switch (pingStatus) {
+            case PingParser.STATUS_EXPIRED:
+                LogUtils.i(TAG, "Ping expired for account %d", mAccountId);
+                break;
+            case PingParser.STATUS_CHANGES_FOUND:
+                LogUtils.i(TAG, "Ping found changed folders for account %d", mAccountId);
+                requestSyncForSyncList(pp.getSyncList());
+                break;
+            case PingParser.STATUS_REQUEST_INCOMPLETE:
+            case PingParser.STATUS_REQUEST_MALFORMED:
+                // These two cases indicate that the ping request was somehow bad.
+                // TODO: It's insanity to re-ping with the same data and expect a different
+                // result. Improve this if possible.
+                LogUtils.e(TAG, "Bad ping request for account %d", mAccountId);
+                break;
+            case PingParser.STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS:
+                LogUtils.i(TAG, "Heartbeat out of bounds for account %d", mAccountId);
+                // TODO: Implement auto heartbeat adjustments.
+                break;
+            case PingParser.STATUS_REQUEST_TOO_MANY_FOLDERS:
+                LogUtils.i(TAG, "Too many folders for account %d", mAccountId);
+                break;
+            case PingParser.STATUS_FOLDER_REFRESH_NEEDED:
+                LogUtils.i(TAG, "FolderSync needed for account %d", mAccountId);
+                requestFolderSync();
+                break;
+            case PingParser.STATUS_SERVER_ERROR:
+                LogUtils.i(TAG, "Server error for account %d", mAccountId);
+                break;
+            default:
+                break;
+        }
+
+        return pingStatus;
+    }
+
+
+    @Override
+    protected boolean addPolicyKeyHeaderToRequest() {
+        return false;
+    }
+
+    @Override
+    protected long getTimeout() {
+        return POST_TIMEOUT;
+    }
+
+    /**
+     * If mailbox is eligible for push, add it to the ping request, creating the {@link Serializer}
+     * for the request if necessary.
+     * @param mailbox The mailbox to check.
+     * @param s The {@link Serializer} for this request, or null if it hasn't been created yet.
+     * @return The {@link Serializer} for this request, or null if it hasn't been created yet.
+     * @throws IOException
+     */
+    private Serializer handleOneMailbox(Serializer s, final Mailbox mailbox) throws IOException {
+        // We can't push until the initial sync is done
+        if (mailbox.mSyncKey != null && !mailbox.mSyncKey.equals("0")) {
+            if (ContentResolver.getSyncAutomatically(mAmAccount,
+                    Mailbox.getAuthority(mailbox.mType))) {
+                if (s == null) {
+                    // No serializer yet, so create and initialize it.
+                    // Note that these start()s correspond to the end()s in doInBackground.
+                    // If either side changes, the other must be kept in sync.
+                    s = new Serializer();
+                    s.start(Tags.PING_PING);
+                    s.data(Tags.PING_HEARTBEAT_INTERVAL, PING_HEARTBEAT_STRING);
+                    s.start(Tags.PING_FOLDERS);
+                }
+                s.start(Tags.PING_FOLDER);
+                s.data(Tags.PING_ID, mailbox.mServerId);
+                s.data(Tags.PING_CLASS, Eas.getFolderClass(mailbox.mType));
+                s.end();
+            }
+        }
+        return s;
+    }
+
+    /**
+     * Make the appropriate calls to {@link ContentResolver#requestSync} indicated by the
+     * current ping response.
+     * @param syncList The list of folders that need to be synced.
+     */
+    private void requestSyncForSyncList(final ArrayList<String> syncList) {
+        final String[] bindArguments = new String[2];
+        bindArguments[0] = Long.toString(mAccountId);
+        for (final String serverId : syncList) {
+            bindArguments[1] = serverId;
+            // TODO: Rather than one query per ping mailbox, do it all in one?
+            final Cursor c = mContext.getContentResolver().query(Mailbox.CONTENT_URI,
+                    Mailbox.CONTENT_PROJECTION, WHERE_ACCOUNT_KEY_AND_SERVER_ID,
+                    bindArguments, null);
+            if (c == null) {
+                // TODO: proper error handling.
+                break;
+            }
+            try {
+                /**
+                 * Check the boxes reporting changes to see if there really were any...
+                 * We do this because bugs in various Exchange servers can put us into a
+                 * looping behavior by continually reporting changes in a mailbox, even
+                 * when there aren't any.
+                 *
+                 * This behavior is seemingly random, and therefore we must code
+                 * defensively by backing off of push behavior when it is detected.
+                 *
+                 * One known cause, on certain Exchange 2003 servers, is acknowledged by
+                 * Microsoft, and the server hotfix for this case can be found at
+                 * http://support.microsoft.com/kb/923282
+                 */
+                // TODO: Implement the above.
+                    /*
+                    String status = c.getString(Mailbox.CONTENT_SYNC_STATUS_COLUMN);
+                    int type = ExchangeService.getStatusType(status);
+                    // This check should always be true...
+                    if (type == ExchangeService.SYNC_PING) {
+                        int changeCount = ExchangeService.getStatusChangeCount(status);
+                        if (changeCount > 0) {
+                            errorMap.remove(serverId);
+                        } else if (changeCount == 0) {
+                            // This means that a ping reported changes in error; we keep a
+                            // count of consecutive errors of this kind
+                            String name = c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN);
+                            Integer failures = errorMap.get(serverId);
+                            if (failures == null) {
+                                userLog("Last ping reported changes in error for: ", name);
+                                errorMap.put(serverId, 1);
+                            } else if (failures > MAX_PING_FAILURES) {
+                                // We'll back off of push for this box
+                                pushFallback(c.getLong(Mailbox.CONTENT_ID_COLUMN));
+                                continue;
+                            } else {
+                                userLog("Last ping reported changes in error for: ", name);
+                                errorMap.put(serverId, failures + 1);
+                            }
+                        }
+                    }
+                    */
+                if (c.moveToFirst()) {
+                    requestSyncForMailbox(mAmAccount,
+                            Mailbox.getAuthority(c.getInt(Mailbox.CONTENT_TYPE_COLUMN)),
+                            c.getLong(Mailbox.CONTENT_ID_COLUMN));
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    /**
+     * Issue a {@link ContentResolver#requestSync} to trigger a FolderSync for an account.
+     */
+    private void requestFolderSync() {
+        requestSyncForMailbox(mAmAccount, EmailContent.AUTHORITY,
+                Mailbox.SYNC_EXTRA_MAILBOX_ID_ACCOUNT_ONLY);
+    }
+
+    public static void requestPing(final android.accounts.Account amAccount) {
+        requestSyncForMailbox(amAccount, EmailContent.AUTHORITY,
+                Mailbox.SYNC_EXTRA_MAILBOX_ID_PUSH_ONLY);
+    }
+
+}

diff --git a/exchange2/src/com/android/exchange/patent_disclaimer.txt b/src/com/android/exchange/patent_disclaimer.txt
similarity index 100%
rename from exchange2/src/com/android/exchange/patent_disclaimer.txt
rename to src/com/android/exchange/patent_disclaimer.txt


diff --git a/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
similarity index 94%
rename from exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
rename to src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index 5843c46..75740bd 100644
--- a/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java

@@ -38,7 +38,6 @@
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -58,7 +57,8 @@
  * used solely to provide GAL (Global Address Lookup) service to email address adapters
  */
 public class ExchangeDirectoryProvider extends ContentProvider {
-    public static final String EXCHANGE_GAL_AUTHORITY = "com.android.exchange.directory.provider";
+    public static final String EXCHANGE_GAL_AUTHORITY =
+            com.android.exchange.Configuration.EXCHANGE_GAL_AUTHORITY;
 
     private static final int DEFAULT_CONTACT_ID = 1;
     private static final int DEFAULT_LOOKUP_LIMIT = 20;
@@ -104,8 +104,8 @@
         private Object[] row;
         static long dataId = 1;
 
-        GalContactRow(GalProjection projection, long contactId, String lookupKey,
-                String accountName, String displayName) {
+        GalContactRow(GalProjection projection, long contactId, String accountName,
+                String displayName) {
             this.mProjection = projection;
             row = new Object[projection.size];
 
@@ -140,11 +140,10 @@
         }
 
         static void addEmailAddress(MatrixCursor cursor, GalProjection galProjection,
-                long contactId, String lookupKey, String accountName, String displayName,
-                String address) {
+                long contactId, String accountName, String displayName, String address) {
             if (!TextUtils.isEmpty(address)) {
                 GalContactRow r = new GalContactRow(
-                        galProjection, contactId, lookupKey, accountName, displayName);
+                        galProjection, contactId, accountName, displayName);
                 r.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
                 r.put(Email.TYPE, Email.TYPE_WORK);
                 r.put(Email.ADDRESS, address);
@@ -153,10 +152,10 @@
         }
 
         static void addPhoneRow(MatrixCursor cursor, GalProjection projection, long contactId,
-                String lookupKey, String accountName, String displayName, int type, String number) {
+                String accountName, String displayName, int type, String number) {
             if (!TextUtils.isEmpty(number)) {
                 GalContactRow r = new GalContactRow(
-                        projection, contactId, lookupKey, accountName, displayName);
+                        projection, contactId, accountName, displayName);
                 r.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
                 r.put(Phone.TYPE, type);
                 r.put(Phone.NUMBER, number);
@@ -165,10 +164,10 @@
         }
 
         public static void addNameRow(MatrixCursor cursor, GalProjection galProjection,
-                long contactId, String lookupKey, String accountName, String displayName,
+                long contactId, String accountName, String displayName,
                 String firstName, String lastName) {
             GalContactRow r = new GalContactRow(
-                    galProjection, contactId, lookupKey, accountName, displayName);
+                    galProjection, contactId, accountName, displayName);
             r.put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
             r.put(StructuredName.GIVEN_NAME, firstName);
             r.put(StructuredName.FAMILY_NAME, lastName);
@@ -322,16 +321,16 @@
                         : DEFAULT_CONTACT_ID;
                 ps = new PackedString(lookupKey);
                 String displayName = ps.get(GalData.DISPLAY_NAME);
-                GalContactRow.addEmailAddress(cursor, galProjection, contactId, lookupKey,
+                GalContactRow.addEmailAddress(cursor, galProjection, contactId,
                         accountName, displayName, ps.get(GalData.EMAIL_ADDRESS));
-                GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+                GalContactRow.addPhoneRow(cursor, galProjection, contactId,
                         displayName, displayName, Phone.TYPE_HOME, ps.get(GalData.HOME_PHONE));
-                GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+                GalContactRow.addPhoneRow(cursor, galProjection, contactId,
                         displayName, displayName, Phone.TYPE_WORK, ps.get(GalData.WORK_PHONE));
-                GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+                GalContactRow.addPhoneRow(cursor, galProjection, contactId,
                         displayName, displayName, Phone.TYPE_MOBILE, ps.get(GalData.MOBILE_PHONE));
-                GalContactRow.addNameRow(cursor, galProjection, contactId, displayName, accountName,
-                        displayName, ps.get(GalData.FIRST_NAME), ps.get(GalData.LAST_NAME));
+                GalContactRow.addNameRow(cursor, galProjection, contactId, displayName,
+                        ps.get(GalData.FIRST_NAME), ps.get(GalData.LAST_NAME), displayName);
                 return cursor;
             }
         }

diff --git a/exchange2/src/com/android/exchange/provider/GalResult.java b/src/com/android/exchange/provider/GalResult.java
similarity index 100%
rename from exchange2/src/com/android/exchange/provider/GalResult.java
rename to src/com/android/exchange/provider/GalResult.java


diff --git a/src/com/android/exchange/service/AbstractSyncAdapterService.java b/src/com/android/exchange/service/AbstractSyncAdapterService.java
new file mode 100644
index 0000000..eb56083
--- /dev/null
+++ b/src/com/android/exchange/service/AbstractSyncAdapterService.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.service;
+
+import android.app.Service;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.Intent;
+import android.os.IBinder;
+
+import com.android.emailcommon.provider.EmailContent;
+
+/**
+ * Base class for services that handle sync requests from the system SyncManager.
+ * This class covers the boilerplate for using an {@link AbstractThreadedSyncAdapter}. Subclasses
+ * should just implement their sync adapter, and override {@link #newSyncAdapter}.
+ */
+public abstract class AbstractSyncAdapterService extends Service {
+    private AbstractThreadedSyncAdapter mSyncAdapter = null;
+
+    public AbstractSyncAdapterService() {
+        super();
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // Make sure EmailContent is initialized in Exchange app
+        EmailContent.init(this);
+        mSyncAdapter = newSyncAdapter();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mSyncAdapter.getSyncAdapterBinder();
+    }
+
+    /**
+     * Subclasses should override this to supply a new instance of its sync adapter.
+     * @return A new instance of the sync adapter.
+     */
+    protected abstract AbstractThreadedSyncAdapter newSyncAdapter();
+}

diff --git a/src/com/android/exchange/service/CalendarSyncAdapterService.java b/src/com/android/exchange/service/CalendarSyncAdapterService.java
new file mode 100644
index 0000000..a6919c5
--- /dev/null
+++ b/src/com/android/exchange/service/CalendarSyncAdapterService.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.service;
+
+import android.accounts.Account;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.CalendarContract.Events;
+
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.Eas;
+import com.android.mail.utils.LogUtils;
+
+public class CalendarSyncAdapterService extends AbstractSyncAdapterService {
+    private static final String TAG = "EASCalSyncAdaptSvc";
+    private static final String ACCOUNT_AND_TYPE_CALENDAR =
+        MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CALENDAR;
+    private static final String DIRTY_IN_ACCOUNT =
+        Events.DIRTY + "=1 AND " + Events.ACCOUNT_NAME + "=?";
+
+    public CalendarSyncAdapterService() {
+        super();
+    }
+
+    @Override
+    protected AbstractThreadedSyncAdapter newSyncAdapter() {
+        return new SyncAdapterImpl(this);
+    }
+
+    private static class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
+        public SyncAdapterImpl(Context context) {
+            super(context, true /* autoInitialize */);
+        }
+
+        @Override
+        public void onPerformSync(Account account, Bundle extras,
+                String authority, ContentProviderClient provider, SyncResult syncResult) {
+            CalendarSyncAdapterService.performSync(getContext(), account, extras);
+        }
+    }
+
+    /**
+     * Partial integration with system SyncManager; we tell our EAS ExchangeService to start a
+     * calendar sync when we get the signal from SyncManager.
+     * The missing piece at this point is integration with the push/ping mechanism in EAS; this will
+     * be put in place at a later time.
+     */
+    private static void performSync(Context context, Account account, Bundle extras) {
+        ContentResolver cr = context.getContentResolver();
+        boolean logging = Eas.USER_LOG;
+        if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
+            Cursor c = cr.query(Events.CONTENT_URI,
+                    new String[] {Events._ID}, DIRTY_IN_ACCOUNT, new String[] {account.name}, null);
+            try {
+                if (!c.moveToFirst()) {
+                    if (logging) {
+                        LogUtils.d(TAG, "No changes for " + account.name);
+                    }
+                    return;
+                }
+            } finally {
+                c.close();
+            }
+        }
+
+        // Find the (EmailProvider) account associated with this email address
+        final Cursor accountCursor =
+            cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
+                    EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
+                    new String[] {account.name}, null);
+        if (accountCursor == null) {
+            LogUtils.e(TAG, "Null account cursor in CalendarSyncAdapterService");
+            return;
+        }
+
+        try {
+            if (accountCursor.moveToFirst()) {
+                final long accountId = accountCursor.getLong(0);
+                // Now, find the calendar mailbox associated with the account
+                final Cursor mailboxCursor = cr.query(Mailbox.CONTENT_URI, Mailbox.ID_PROJECTION,
+                        ACCOUNT_AND_TYPE_CALENDAR, new String[] {Long.toString(accountId)}, null);
+                try {
+                    if (mailboxCursor.moveToFirst()) {
+                        if (logging) {
+                            LogUtils.d(TAG, "Upload sync requested for " + account.name);
+                        }
+                        // TODO: Currently just bouncing this to Email sync; eventually streamline.
+                        final long mailboxId = mailboxCursor.getLong(Mailbox.ID_PROJECTION_COLUMN);
+                        // TODO: Should we be using the existing extras and just adding our bits?
+                        final Bundle mailboxExtras = new Bundle(4);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
+                        mailboxExtras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, mailboxId);
+                        ContentResolver.requestSync(account, EmailContent.AUTHORITY, mailboxExtras);
+                    }
+                } finally {
+                    mailboxCursor.close();
+                }
+            }
+        } finally {
+            accountCursor.close();
+        }
+    }
+}

diff --git a/exchange2/src/com/android/exchange/ContactsSyncAdapterService.java b/src/com/android/exchange/service/ContactsSyncAdapterService.java
similarity index 65%
rename from exchange2/src/com/android/exchange/ContactsSyncAdapterService.java
rename to src/com/android/exchange/service/ContactsSyncAdapterService.java
index 97706e7..54ef2e0 100644
--- a/exchange2/src/com/android/exchange/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/service/ContactsSyncAdapterService.java

@@ -14,35 +14,29 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
-
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
+package com.android.exchange.service;
 
 import android.accounts.Account;
-import android.accounts.OperationCanceledException;
-import android.app.Service;
 import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SyncResult;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.RawContacts;
-import android.util.Log;
 
-public class ContactsSyncAdapterService extends Service {
-    private static final String TAG = "EAS ContactsSyncAdapterService";
-    private static SyncAdapterImpl sSyncAdapter = null;
-    private static final Object sSyncAdapterLock = new Object();
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.Eas;
+import com.android.mail.utils.LogUtils;
 
-    private static final String[] ID_PROJECTION = new String[] {"_id"};
+public class ContactsSyncAdapterService extends AbstractSyncAdapterService {
+    private static final String TAG = "EASContactSyncAdaptSvc";
     private static final String ACCOUNT_AND_TYPE_CONTACTS =
         MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CONTACTS;
 
@@ -50,42 +44,25 @@
         super();
     }
 
-    private static class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
-        private Context mContext;
+    @Override
+    protected AbstractThreadedSyncAdapter newSyncAdapter() {
+        return new SyncAdapterImpl(this);
+    }
 
+    private static class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
         public SyncAdapterImpl(Context context) {
             super(context, true /* autoInitialize */);
-            mContext = context;
         }
 
         @Override
         public void onPerformSync(Account account, Bundle extras,
                 String authority, ContentProviderClient provider, SyncResult syncResult) {
-            try {
-                ContactsSyncAdapterService.performSync(mContext, account, extras,
-                        authority, provider, syncResult);
-            } catch (OperationCanceledException e) {
-            }
+            ContactsSyncAdapterService.performSync(getContext(), account, extras);
         }
     }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        synchronized (sSyncAdapterLock) {
-            if (sSyncAdapter == null) {
-                sSyncAdapter = new SyncAdapterImpl(getApplicationContext());
-            }
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sSyncAdapter.getSyncAdapterBinder();
-    }
-
     private static boolean hasDirtyRows(ContentResolver resolver, Uri uri, String dirtyColumn) {
-        Cursor c = resolver.query(uri, ID_PROJECTION, dirtyColumn + "=1", null, null);
+        Cursor c = resolver.query(uri, EmailContent.ID_PROJECTION, dirtyColumn + "=1", null, null);
         try {
             return c.getCount() > 0;
         } finally {
@@ -99,9 +76,7 @@
      * The missing piece at this point is integration with the push/ping mechanism in EAS; this will
      * be put in place at a later time.
      */
-    private static void performSync(Context context, Account account, Bundle extras,
-            String authority, ContentProviderClient provider, SyncResult syncResult)
-            throws OperationCanceledException {
+    private static void performSync(Context context, Account account, Bundle extras) {
         ContentResolver cr = context.getContentResolver();
 
         // If we've been asked to do an upload, make sure we've got work to do
@@ -121,27 +96,41 @@
                 changed = hasDirtyRows(cr, uri, Groups.DIRTY);
             }
             if (!changed) {
-                Log.i(TAG, "Upload sync; no changes");
+                LogUtils.i(TAG, "Upload sync; no changes");
                 return;
             }
         }
 
         // Find the (EmailProvider) account associated with this email address
-        Cursor accountCursor =
-            cr.query(com.android.emailcommon.provider.Account.CONTENT_URI, ID_PROJECTION,
-                AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.name}, null);
+        final Cursor accountCursor =
+            cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
+                    com.android.emailcommon.provider.Account.ID_PROJECTION,
+                    AccountColumns.EMAIL_ADDRESS + "=?",
+                    new String[] {account.name}, null);
+        if (accountCursor == null) {
+            LogUtils.e(TAG, "null account cursor in ContactsSyncAdapterService");
+            return;
+        }
+
         try {
             if (accountCursor.moveToFirst()) {
-                long accountId = accountCursor.getLong(0);
+                final long accountId = accountCursor.getLong(
+                        com.android.emailcommon.provider.Account.ID_PROJECTION_COLUMN);
                 // Now, find the contacts mailbox associated with the account
-                Cursor mailboxCursor = cr.query(Mailbox.CONTENT_URI, ID_PROJECTION,
+                final Cursor mailboxCursor = cr.query(Mailbox.CONTENT_URI, Mailbox.ID_PROJECTION,
                         ACCOUNT_AND_TYPE_CONTACTS, new String[] {Long.toString(accountId)}, null);
                 try {
                      if (mailboxCursor.moveToFirst()) {
-                        Log.i(TAG, "Contact sync requested for " + account.name);
-                        // Ask for a sync from our sync manager
-                        ExchangeService.serviceRequest(mailboxCursor.getLong(0),
-                                ExchangeService.SYNC_UPSYNC);
+                         LogUtils.i(TAG, "Contact sync requested for " + account.name);
+                         // TODO: Currently just bouncing this to Email sync; eventually streamline.
+                        final long mailboxId = mailboxCursor.getLong(Mailbox.ID_PROJECTION_COLUMN);
+                         // TODO: Should we be using the existing extras and just adding our bits?
+                        final Bundle mailboxExtras = new Bundle(4);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
+                        mailboxExtras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
+                        mailboxExtras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, mailboxId);
+                        ContentResolver.requestSync(account, EmailContent.AUTHORITY, mailboxExtras);
                     }
                 } finally {
                     mailboxCursor.close();
@@ -151,4 +140,4 @@
             accountCursor.close();
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/com/android/exchange/service/EasAccountSyncHandler.java b/src/com/android/exchange/service/EasAccountSyncHandler.java
new file mode 100644
index 0000000..3bf0b16
--- /dev/null
+++ b/src/com/android/exchange/service/EasAccountSyncHandler.java

@@ -0,0 +1,19 @@
+package com.android.exchange.service;
+
+import android.content.Context;
+
+import com.android.emailcommon.provider.Account;
+
+
+/**
+ * Performs an Exchange Account sync, which includes folder sync.
+ */
+public class EasAccountSyncHandler extends EasAccountValidator {
+    public EasAccountSyncHandler(final Context context, final Account account) {
+        super(context, account);
+    }
+
+    public void performSync() {
+        doValidationOrSync(null);
+    }
+}

diff --git a/src/com/android/exchange/service/EasAccountValidator.java b/src/com/android/exchange/service/EasAccountValidator.java
new file mode 100644
index 0000000..6eced23
--- /dev/null
+++ b/src/com/android/exchange/service/EasAccountValidator.java

@@ -0,0 +1,629 @@
+package com.android.exchange.service;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+
+import com.android.emailcommon.mail.MessagingException;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Policy;
+import com.android.emailcommon.service.EmailServiceProxy;
+import com.android.emailcommon.service.PolicyServiceProxy;
+import com.android.exchange.CommandStatusException;
+import com.android.exchange.CommandStatusException.CommandStatus;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.FolderSyncParser;
+import com.android.exchange.adapter.ProvisionParser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.SettingsParser;
+import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
+import com.google.common.collect.Sets;
+
+import org.apache.http.Header;
+import org.apache.http.HttpStatus;
+
+import java.io.IOException;
+import java.security.cert.CertificateException;
+import java.util.HashSet;
+
+/**
+ * Base class to perform the various requests needed to validate or sync an account.
+ * "Account sync" consists primarily of syncing all folders for this account, but also includes
+ * handling the protocol version, security policies, and other authentication issues.
+ */
+public class EasAccountValidator extends EasServerConnection {
+    /** Logging tag. */
+    private static final String TAG = "EasAccountValidator";
+
+    /**
+     * The maximum number of redirects we permit before giving up. Ideally the server should not
+     * send us on a chase like this, so this is here to prevent infinite recursion in a bad case.
+     */
+    private static final int MAX_REDIRECTS = 3;
+
+    public static final String EAS_12_POLICY_TYPE = "MS-EAS-Provisioning-WBXML";
+    public static final String EAS_2_POLICY_TYPE = "MS-WAP-Provisioning-XML";
+
+    /** The EAS protocol Provision status for "we implement all of the policies" */
+    private static final String PROVISION_STATUS_OK = "1";
+    /** The EAS protocol Provision status meaning "we partially implement the policies" */
+    private static final String PROVISION_STATUS_PARTIAL = "2";
+
+    /** Set of Exchange protocol versions we understand. */
+    private static final HashSet<String> SUPPORTED_PROTOCOL_VERSIONS = Sets.newHashSet(
+            Eas.SUPPORTED_PROTOCOL_EX2003,
+            Eas.SUPPORTED_PROTOCOL_EX2007, Eas.SUPPORTED_PROTOCOL_EX2007_SP1,
+            Eas.SUPPORTED_PROTOCOL_EX2010, Eas.SUPPORTED_PROTOCOL_EX2010_SP1);
+
+    /** The number of times we've been redirected so far. */
+    private int mRedirectCount;
+
+    /**
+     * An exception type used exclusively within this class -- some sub-functions throw this to
+     * signal that a response from the Exchange server indicated that we should be using a different
+     * host. This exception is caught
+     */
+    private static class RedirectException extends Exception {
+        public final String mRedirectAddress;
+        public RedirectException(final EasResponse resp) {
+            mRedirectAddress = resp.getRedirectAddress();
+        }
+    }
+
+    private EasAccountValidator(final Context context, final Account account,
+            final HostAuth hostAuth) {
+        super(context, account, hostAuth);
+        mRedirectCount = 0;
+    }
+
+    protected EasAccountValidator(final Context context, final Account account) {
+        this(context, account, HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv));
+    }
+
+    public EasAccountValidator(final Context context, final HostAuth hostAuth) {
+        this(context, new Account(), hostAuth);
+        mAccount.mEmailAddress = hostAuth.mLogin;
+    }
+
+    /**
+     * Update our account's protocol version based on the server's supported versions.
+     * @param versionHeader The {@link Header} for the server's supported versions.
+     * @return Whether we found a suitable protocol version.
+     */
+    private boolean setProtocolVersion(final Header versionHeader) {
+        // The string is a comma separated list of EAS versions in ascending order
+        // e.g. 1.0,2.0,2.5,12.0,12.1,14.0,14.1
+        final String supportedVersions = versionHeader.getValue();
+        LogUtils.i(TAG, "Server supports versions: %s", supportedVersions);
+        final String[] supportedVersionsArray = supportedVersions.split(",");
+        // Find the most recent version we support
+        String newProtocolVersion = null;
+        for (final String version: supportedVersionsArray) {
+            if (SUPPORTED_PROTOCOL_VERSIONS.contains(version)) {
+                newProtocolVersion = version;
+            }
+        }
+        if (newProtocolVersion == null) {
+            LogUtils.w(TAG, "No supported EAS versions: %s", supportedVersions);
+            // TODO: if mAccount.isSaved(), we should delete the account.
+            return false;
+        }
+
+        // Update our account with the new protocol version.
+        final boolean protocolChanged = !newProtocolVersion.equals(mAccount.mProtocolVersion);
+        if (protocolChanged) {
+            mAccount.mProtocolVersion = newProtocolVersion;
+            setProtocolVersion(newProtocolVersion);
+        }
+
+        // Fixup search flags, if they're not set.
+        final boolean flagsChanged;
+        if (getProtocolVersion() >= 12.0) {
+            int oldFlags = mAccount.mFlags;
+            mAccount.mFlags |= Account.FLAGS_SUPPORTS_GLOBAL_SEARCH + Account.FLAGS_SUPPORTS_SEARCH;
+            flagsChanged = (oldFlags != mAccount.mFlags);
+        } else {
+            flagsChanged = false;
+        }
+
+        // Write account back to DB if needed.
+        if ((protocolChanged || flagsChanged) && mAccount.isSaved()) {
+            final ContentValues cv = new ContentValues();
+            if (protocolChanged) {
+                cv.put(AccountColumns.PROTOCOL_VERSION, mAccount.mProtocolVersion);
+            }
+            if (flagsChanged) {
+                cv.put(AccountColumns.FLAGS, mAccount.mFlags);
+            }
+            mAccount.update(mContext, cv);
+        }
+        return true;
+    }
+
+    /**
+     * Make an OPTIONS request to determine the protocol version to use, and update our account to
+     * use the most recent protocol that both we and the server understand.
+     * @return A status code for getting the protocol version. If NO_ERROR, then mAccount will be
+     *     updated to the best version we mutually understand.
+     */
+    private int getServerProtocolVersion() throws IOException, RedirectException {
+        final EasResponse resp = sendHttpClientOptions();
+        try {
+            final int code = resp.getStatus();
+            LogUtils.d(TAG, "Validation (OPTIONS) response: %d", code);
+            if (code == HttpStatus.SC_OK) {
+                // No exception means successful validation
+                final Header commands = resp.getHeader("MS-ASProtocolCommands");
+                final Header versions = resp.getHeader("ms-asprotocolversions");
+                final boolean hasProtocolVersion;
+                if (commands == null || versions == null) {
+                    LogUtils.e(TAG, "OPTIONS response without commands or versions");
+                    hasProtocolVersion = false;
+                } else {
+                    hasProtocolVersion = setProtocolVersion(versions);
+                }
+                if (!hasProtocolVersion) {
+                    return MessagingException.PROTOCOL_VERSION_UNSUPPORTED;
+                }
+                return MessagingException.NO_ERROR;
+            }
+            if (resp.isAuthError()) {
+                return resp.isMissingCertificate()
+                        ? MessagingException.CLIENT_CERTIFICATE_REQUIRED
+                        : MessagingException.AUTHENTICATION_FAILED;
+            }
+            if (code == HttpStatus.SC_INTERNAL_SERVER_ERROR) {
+                return MessagingException.AUTHENTICATION_FAILED_OR_SERVER_ERROR;
+            }
+            if (resp.isRedirectError()) {
+                throw new RedirectException(resp);
+            }
+            // TODO Need to catch other kinds of errors (e.g. policy) For now, report code.
+            LogUtils.w(TAG, "Validation failed, reporting I/O error: %d", code);
+            return MessagingException.IOERROR;
+        } finally {
+            resp.close();
+        }
+    }
+
+    /**
+     * Send a FolderSync request and handle the response. Depending on isStatusOnly, this either
+     * simply verifies that the response is valid, or it will also actually sync the folders.
+     * @param isStatusOnly If true, this is only a validation, otherwise it's a full sync.
+     * @return A status code indicating the result of this check.
+     * @throws IOException
+     * @throws CommandStatusException
+     * @throws RedirectException
+     */
+    private int doFolderSync(final boolean isStatusOnly)
+            throws IOException, CommandStatusException, RedirectException {
+        LogUtils.i(TAG, "FolderSync (%s) for %s, %s, ssl = %s", isStatusOnly ? "validate" : "sync",
+                mHostAuth.mAddress, mHostAuth.mLogin, mHostAuth.shouldUseSsl() ? "1" : "0");
+
+        // Send "0" as the sync key for new accounts; otherwise, use the current key
+        final String syncKey = mAccount.mSyncKey != null ? mAccount.mSyncKey : "0";
+        final Serializer s = new Serializer();
+        s.start(Tags.FOLDER_FOLDER_SYNC).start(Tags.FOLDER_SYNC_KEY).text(syncKey)
+            .end().end().done();
+        final EasResponse resp = sendHttpClientPost("FolderSync", s.toByteArray());
+        final int resultCode;
+        try {
+            final int code = resp.getStatus();
+            LogUtils.d(TAG, "FolderSync response: %d", code);
+            if (code == HttpStatus.SC_OK) {
+                // We need to parse the result to see if we've got a provisioning issue
+                // (EAS 14.0 only)
+                if (!resp.isEmpty()) {
+                    new FolderSyncParser(mContext, mContext.getContentResolver(),
+                            resp.getInputStream(), mAccount, isStatusOnly).parse();
+                }
+                resultCode = MessagingException.NO_ERROR;
+            } else if (code == HttpStatus.SC_FORBIDDEN) {
+                // For validation only, we take 403 as ACCESS_DENIED (the account isn't
+                // authorized, possibly due to device type)
+                resultCode = MessagingException.ACCESS_DENIED;
+            } else if (resp.isProvisionError()) {
+                // The device needs to have security policies enforced
+                throw new CommandStatusException(CommandStatus.NEEDS_PROVISIONING);
+            } else if (code == HttpStatus.SC_NOT_FOUND) {
+                // We get a 404 from OWA addresses (which are NOT EAS addresses)
+                resultCode = MessagingException.PROTOCOL_VERSION_UNSUPPORTED;
+            } else if (code == HttpStatus.SC_UNAUTHORIZED) {
+                resultCode = resp.isMissingCertificate()
+                        ? MessagingException.CLIENT_CERTIFICATE_REQUIRED
+                        : MessagingException.AUTHENTICATION_FAILED;
+            } else if (resp.isRedirectError()) {
+                throw new RedirectException(resp);
+            } else {
+                resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
+            }
+        } finally {
+            resp.close();
+        }
+        return resultCode;
+    }
+
+    /**
+     * Send a Settings request to the server and process the response.
+     * @return Whether the request succeeded.
+     * @throws IOException
+     */
+    private boolean sendSettings() throws IOException {
+        final Serializer s = new Serializer();
+        s.start(Tags.SETTINGS_SETTINGS);
+        s.start(Tags.SETTINGS_DEVICE_INFORMATION).start(Tags.SETTINGS_SET);
+        s.data(Tags.SETTINGS_MODEL, Build.MODEL);
+        s.data(Tags.SETTINGS_OS, "Android " + Build.VERSION.RELEASE);
+        s.data(Tags.SETTINGS_USER_AGENT, USER_AGENT);
+        s.end().end().end().done(); // SETTINGS_SET, SETTINGS_DEVICE_INFORMATION, SETTINGS_SETTINGS
+        final EasResponse resp = sendHttpClientPost("Settings", s.toByteArray());
+        try {
+            if (resp.getStatus() == HttpStatus.SC_OK) {
+                return new SettingsParser(resp.getInputStream()).parse();
+            }
+        } finally {
+            resp.close();
+        }
+        // On failures, simply return false
+        return false;
+    }
+
+    private String getPolicyType() {
+        return (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) ?
+                EAS_12_POLICY_TYPE : EAS_2_POLICY_TYPE;
+    }
+
+    /**
+     * Acknowledge a remote wipe command from the server.
+     * @param tempKey The security key of our current (temporary) policy.
+     * @throws IOException
+     */
+    private void acknowledgeRemoteWipe(final String tempKey)
+            throws IOException {
+        acknowledgeProvisionImpl(tempKey, PROVISION_STATUS_OK, true);
+    }
+
+    /**
+     * Acknowledge that we've set the required policy.
+     * @param tempKey The security key of our current (temporary) policy.
+     * @param result One of {@link #PROVISION_STATUS_OK} or {@link #PROVISION_STATUS_PARTIAL}
+     *               indicating how well we enforce the policy.
+     * @return A new security sync key, or null on failure.
+     * @throws IOException
+     */
+    private String acknowledgeProvision(final String tempKey, final String result)
+            throws IOException {
+        return acknowledgeProvisionImpl(tempKey, result, false);
+    }
+
+    /**
+     * Common function doing the work for acknowledging remote wipes or provisioning.
+     * @param tempKey The security key of our current (temporary) policy.
+     * @param status One of {@link #PROVISION_STATUS_OK} or {@link #PROVISION_STATUS_PARTIAL}
+     *               indicating how well we enforce the policy.
+     * @param remoteWipe Whether this is a remote wipe.
+     * @return A new security sync key, or null on failure.
+     * @throws IOException
+     */
+    private String acknowledgeProvisionImpl(final String tempKey, final String status,
+            final boolean remoteWipe) throws IOException {
+        final Serializer s = new Serializer();
+        s.start(Tags.PROVISION_PROVISION).start(Tags.PROVISION_POLICIES);
+        s.start(Tags.PROVISION_POLICY);
+
+        // Use the proper policy type, depending on EAS version
+        s.data(Tags.PROVISION_POLICY_TYPE, getPolicyType());
+
+        s.data(Tags.PROVISION_POLICY_KEY, tempKey);
+        s.data(Tags.PROVISION_STATUS, status);
+        s.end().end(); // PROVISION_POLICY, PROVISION_POLICIES
+        if (remoteWipe) {
+            s.start(Tags.PROVISION_REMOTE_WIPE);
+            s.data(Tags.PROVISION_STATUS, PROVISION_STATUS_OK);
+            s.end();
+        }
+        s.end().done(); // PROVISION_PROVISION
+        EasResponse resp = sendHttpClientPost("Provision", s.toByteArray());
+        try {
+            if (resp.getStatus() == HttpStatus.SC_OK) {
+                final ProvisionParser pp = new ProvisionParser(mContext, resp.getInputStream());
+                if (pp.parse()) {
+                    // Return the final policy key from the ProvisionParser
+                    final String result =
+                            (pp.getSecuritySyncKey() == null) ? "failed" : "confirmed";
+                    LogUtils.i(TAG, "Provision %s for %s set", result,
+                            PROVISION_STATUS_PARTIAL.equals(status) ? "PART" : "FULL");
+                    return pp.getSecuritySyncKey();
+                }
+            }
+        } finally {
+            resp.close();
+        }
+        // On failures, log issue and return null
+        LogUtils.i(TAG, "Provisioning failed for %s set",
+                PROVISION_STATUS_PARTIAL.equals(status) ? "PART" : "FULL");
+        return null;
+    }
+
+    /**
+     * Send an Exchange Provision request, and process the response to see if we can handle the
+     * provisioning requirements returned by the server.
+     * @return A {@link ProvisionParser} for the response, or null if we can't handle it.
+     * @throws IOException
+     */
+    private ProvisionParser canProvision() throws IOException {
+        final Serializer s = new Serializer();
+        s.start(Tags.PROVISION_PROVISION);
+        if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_SP1_DOUBLE) {
+            // Send settings information in 14.1 and greater
+            s.start(Tags.SETTINGS_DEVICE_INFORMATION).start(Tags.SETTINGS_SET);
+            s.data(Tags.SETTINGS_MODEL, Build.MODEL);
+            //s.data(Tags.SETTINGS_IMEI, "");
+            //s.data(Tags.SETTINGS_FRIENDLY_NAME, "Friendly Name");
+            s.data(Tags.SETTINGS_OS, "Android " + Build.VERSION.RELEASE);
+            //s.data(Tags.SETTINGS_OS_LANGUAGE, "");
+            //s.data(Tags.SETTINGS_PHONE_NUMBER, "");
+            //s.data(Tags.SETTINGS_MOBILE_OPERATOR, "");
+            s.data(Tags.SETTINGS_USER_AGENT, USER_AGENT);
+            s.end().end();  // SETTINGS_SET, SETTINGS_DEVICE_INFORMATION
+        }
+        s.start(Tags.PROVISION_POLICIES);
+        s.start(Tags.PROVISION_POLICY);
+        s.data(Tags.PROVISION_POLICY_TYPE, getPolicyType());
+        s.end().end().end().done(); // PROVISION_POLICY, PROVISION_POLICIES, PROVISION_PROVISION
+        final EasResponse resp = sendHttpClientPost("Provision", s.toByteArray());
+        try {
+            int code = resp.getStatus();
+            if (code == HttpStatus.SC_OK) {
+                final ProvisionParser pp = new ProvisionParser(mContext, resp.getInputStream());
+                if (pp.parse()) {
+                    // The PolicySet in the ProvisionParser will have the requirements for all KNOWN
+                    // policies.  If others are required, hasSupportablePolicySet will be false
+                    if (pp.hasSupportablePolicySet() &&
+                            getProtocolVersion() == Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+                        // In EAS 14.0, we need the final security key in order to use the settings
+                        // command
+                        final String policyKey = acknowledgeProvision(pp.getSecuritySyncKey(),
+                                PROVISION_STATUS_OK);
+                        if (policyKey != null) {
+                            pp.setSecuritySyncKey(policyKey);
+                        }
+                    } else if (!pp.hasSupportablePolicySet())  {
+                        // Try to acknowledge using the "partial" status (i.e. we can partially
+                        // accommodate the required policies).  The server will agree to this if the
+                        // "allow non-provisionable devices" setting is enabled on the server
+                        LogUtils.i(TAG, "PolicySet is NOT fully supportable");
+                        if (acknowledgeProvision(pp.getSecuritySyncKey(),
+                                PROVISION_STATUS_PARTIAL) != null) {
+                            // The server's ok with our inability to support policies, so we'll
+                            // clear them
+                            pp.clearUnsupportablePolicies();
+                        }
+                    }
+                    return pp;
+                }
+            }
+        } finally {
+            resp.close();
+        }
+
+        // On failures, simply return null
+        return null;
+    }
+
+    /**
+     * Process the provisioning requirements that's returned by the server in response to a
+     * Provision request.
+     * @param pp  A {@link ProvisionParser} for the server response to the Provision request.
+     * @return Whether we successfully handled the provisioning requirements.
+     * @throws IOException
+     */
+    private boolean tryProvision(final ProvisionParser pp) throws IOException {
+        if (pp == null) return false;
+        // Get the policies from ProvisionParser
+        final Policy policy = pp.getPolicy();
+        final Policy oldPolicy;
+        // Grab the old policy (if any)
+        if (mAccount.mPolicyKey > 0) {
+            oldPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+        } else {
+            oldPolicy = null;
+        }
+        // Update the account with a null policyKey (the key we've gotten is
+        // temporary and cannot be used for syncing)
+        PolicyServiceProxy.setAccountPolicy(mContext, mAccount.mId, policy, null);
+        // Make sure mAccount is current (with latest policy key)
+        mAccount.refresh(mContext);
+        if (pp.getRemoteWipe()) {
+            // We've gotten a remote wipe command
+            LogUtils.i(TAG, "!!! Remote wipe request received");
+            // Start by setting the account to security hold
+            PolicyServiceProxy.setAccountHoldFlag(mContext, mAccount, true);
+
+            // First, we've got to acknowledge it, but wrap the wipe in try/catch so that
+            // we wipe the device regardless of any errors in acknowledgment
+            try {
+                LogUtils.i(TAG, "!!! Acknowledging remote wipe to server");
+                acknowledgeRemoteWipe(pp.getSecuritySyncKey());
+            } catch (Exception e) {
+                // Because remote wipe is such a high priority task, we don't want to
+                // circumvent it if there's an exception in acknowledgment
+            }
+            // Then, tell SecurityPolicy to wipe the device
+            LogUtils.i(TAG, "!!! Executing remote wipe");
+            PolicyServiceProxy.remoteWipe(mContext);
+            return false;
+        } else if (pp.hasSupportablePolicySet() && PolicyServiceProxy.isActive(mContext, policy)) {
+            // See if the required policies are in force; if they are, acknowledge the policies
+            // to the server and get the final policy key
+            // NOTE: For EAS 14.0, we already have the acknowledgment in the ProvisionParser
+            String securitySyncKey;
+            if (getProtocolVersion() == Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+                securitySyncKey = pp.getSecuritySyncKey();
+            } else {
+                securitySyncKey = acknowledgeProvision(pp.getSecuritySyncKey(),
+                        PROVISION_STATUS_OK);
+            }
+            if (securitySyncKey != null) {
+                // If attachment policies have changed, fix up any affected attachment records
+                if (oldPolicy != null) {
+                    if ((oldPolicy.mDontAllowAttachments != policy.mDontAllowAttachments) ||
+                            (oldPolicy.mMaxAttachmentSize != policy.mMaxAttachmentSize)) {
+                        Policy.setAttachmentFlagsForNewPolicy(mContext, mAccount, policy);
+                    }
+                }
+                // Write the final policy key to the Account and say we've been successful
+                PolicyServiceProxy.setAccountPolicy(mContext, mAccount.mId, policy,
+                        securitySyncKey);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Do the heavy lifting for validation and sync:
+     * - HTTP OPTIONS request to get protocol version from the server, if we don't already have it.
+     * - Exchange FolderSync request to get the folder info.
+     * (And exception handling for those operations.)
+     * Validation differs from sync in four ways:
+     * - Validation registers the client cert.
+     * - Validation doesn't save the FolderSync results.
+     * - Validation doesn't attempt to set device policies.
+     * - Validation must populate a bundle with the results of the validation.
+     * @param bundle If this is a validation call, this will be non-null, and this function will
+     *               write the results to it (specifically it writes
+     *               {@link EmailServiceProxy#VALIDATE_BUNDLE_RESULT_CODE},
+     *               {@link EmailServiceProxy#VALIDATE_BUNDLE_PROTOCOL_VERSION}, and
+     *               {@link EmailServiceProxy#VALIDATE_BUNDLE_POLICY_SET} (when there's a policy to
+     *               be had).
+     *               If this is a sync call, bundle will be null.
+     *               This function also uses the null/not null status to differentiate behavior in
+     *               the few places where validation and sync don't do the same thing.
+     */
+    protected void doValidationOrSync(final Bundle bundle) {
+        LogUtils.i(TAG, "Performing %s: %s, %s, ssl = %s", bundle != null ? "validation" : "sync",
+                mHostAuth.mAddress, mHostAuth.mLogin, mHostAuth.shouldUseSsl() ? "1" : "0");
+
+        if (bundle != null) {
+            if (mHostAuth.mClientCertAlias != null) {
+                try {
+                    getClientConnectionManager().registerClientCert(mContext, mHostAuth);
+                } catch (final CertificateException e) {
+                    // The client certificate the user specified is invalid/inaccessible.
+                    bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
+                            MessagingException.CLIENT_CERTIFICATE_ERROR);
+                    return;
+                }
+            }
+        }
+
+        int resultCode;
+
+        // Need a nested try here because the provisioning exception handler can throw IOException.
+        try {
+            try {
+                // TODO: also want to check protocol version at least once in a while after setup.
+                if (mAccount.mProtocolVersion == null) {
+                    final int optionsResult = getServerProtocolVersion();
+                    if (optionsResult != MessagingException.NO_ERROR) {
+                        if (bundle != null) {
+                            bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
+                                    optionsResult);
+                        }
+                        return;
+                    }
+                    if (bundle != null) {
+                        bundle.putString(EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION,
+                                mAccount.mProtocolVersion);
+                    }
+                }
+                resultCode = doFolderSync(bundle != null);
+            } catch (final CommandStatusException e) {
+                final int status = e.mStatus;
+                if (CommandStatus.isNeedsProvisioning(status)) {
+                    // Get the policies and see if we are able to support them
+                    final ProvisionParser pp = canProvision();
+                    if (pp != null && pp.hasSupportablePolicySet()) {
+                        // Set the proper result code and save the PolicySet in our Bundle
+                        if (bundle != null) {
+                            resultCode = MessagingException.SECURITY_POLICIES_REQUIRED;
+                            bundle.putParcelable(EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET,
+                                    pp.getPolicy());
+                            if (getProtocolVersion() == Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+                                mAccount.mSecuritySyncKey = pp.getSecuritySyncKey();
+                                if (!sendSettings()) {
+                                    LogUtils.i(TAG, "Denied access: %s",
+                                            CommandStatus.toString(status));
+                                    resultCode = MessagingException.ACCESS_DENIED;
+                                }
+                            }
+                        } else if (tryProvision(pp)) {
+                            resultCode = MessagingException.NO_ERROR;
+                        } else {
+                            resultCode = MessagingException.GENERAL_SECURITY;
+                        }
+                    } else {
+                        // If not, set the proper code (the account will not be created)
+                        resultCode = MessagingException.SECURITY_POLICIES_UNSUPPORTED;
+                        if (bundle != null) {
+                            bundle.putParcelable(EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET,
+                                    pp.getPolicy());
+                        }
+                    }
+                } else if (CommandStatus.isDeniedAccess(status)) {
+                    LogUtils.i(TAG, "Denied access: %s", CommandStatus.toString(status));
+                    resultCode = MessagingException.ACCESS_DENIED;
+                } else if (CommandStatus.isTransientError(status)) {
+                    LogUtils.i(TAG, "Transient error: %s", CommandStatus.toString(status));
+                    resultCode = MessagingException.IOERROR;
+                } else {
+                    LogUtils.i(TAG, "Unexpected response: %s", CommandStatus.toString(status));
+                    resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
+                }
+            } catch (final RedirectException e) {
+                // We handle a limited number of redirects by recursion.
+                if (mRedirectCount < MAX_REDIRECTS && e.mRedirectAddress != null) {
+                    ++mRedirectCount;
+                    redirectHostAuth(e.mRedirectAddress);
+                    if (bundle != null) {
+                        bundle.putString(EmailServiceProxy.VALIDATE_BUNDLE_REDIRECT_ADDRESS,
+                                e.mRedirectAddress);
+                    }
+                    doValidationOrSync(bundle);
+                    return;
+                } else {
+                    resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
+                }
+            }
+        } catch (final IOException e) {
+            final Throwable cause = e.getCause();
+            if (cause != null && cause instanceof CertificateException) {
+                // This could be because the server's certificate failed to validate.
+                resultCode = MessagingException.GENERAL_SECURITY;
+            } else {
+                resultCode = MessagingException.IOERROR;
+            }
+        }
+
+        if (bundle != null) {
+            bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE, resultCode);
+        }
+    }
+
+
+    /**
+     * Perform the actual validation.
+     * @return The validation response.
+     */
+    public Bundle validate() {
+        final Bundle bundle = new Bundle();
+        doValidationOrSync(bundle);
+        return bundle;
+    }
+}

diff --git a/src/com/android/exchange/service/EasAttachmentLoader.java b/src/com/android/exchange/service/EasAttachmentLoader.java
new file mode 100644
index 0000000..e496b2f
--- /dev/null
+++ b/src/com/android/exchange/service/EasAttachmentLoader.java

@@ -0,0 +1,295 @@
+package com.android.exchange.service;
+
+import android.content.Context;
+import android.os.RemoteException;
+
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailcommon.service.EmailServiceStatus;
+import com.android.emailcommon.service.IEmailServiceCallback;
+import com.android.emailcommon.utility.AttachmentUtilities;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.ItemOperationsParser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.exchange.utility.UriCodec;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpStatus;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Loads attachments from the Exchange server.
+ * TODO: Add ability to call back to UI when this failed, and generally better handle error cases.
+ */
+public class EasAttachmentLoader extends EasServerConnection {
+    private static final String TAG = "EasAttachmentLoader";
+
+    private final IEmailServiceCallback mCallback;
+
+    private EasAttachmentLoader(final Context context, final Account account,
+            final IEmailServiceCallback callback) {
+        super(context, account);
+        mCallback = callback;
+    }
+
+    // TODO: EmailServiceStatus.ATTACHMENT_NOT_FOUND is heavily used, may need to split that into
+    // different statuses.
+    private static void doStatusCallback(final IEmailServiceCallback callback,
+            final long messageKey, final long attachmentId, final int status, final int progress) {
+        if (callback != null) {
+            try {
+                callback.loadAttachmentStatus(messageKey, attachmentId, status, progress);
+            } catch (final RemoteException e) {
+                LogUtils.e(TAG, "RemoteException in loadAttachment: %s", e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Provides the parser with the data it needs to perform the callback.
+     */
+    public static class ProgressCallback {
+        private final IEmailServiceCallback mCallback;
+        private final Attachment mAttachment;
+
+        public ProgressCallback(final IEmailServiceCallback callback,
+                final Attachment attachment) {
+            mCallback = callback;
+            mAttachment = attachment;
+        }
+
+        public void doCallback(final int progress) {
+            doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachment.mId,
+                    EmailServiceStatus.IN_PROGRESS, progress);
+        }
+    }
+
+    /**
+     * Load an attachment from the Exchange server, and write it to the content provider.
+     * @param context Our {@link Context}.
+     * @param attachmentId The local id of the attachment (i.e. its id in the database).
+     * @param callback The callback for any status updates.
+     */
+    public static void loadAttachment(final Context context, final long attachmentId,
+            final IEmailServiceCallback callback) {
+        final Attachment attachment = Attachment.restoreAttachmentWithId(context, attachmentId);
+        if (attachment == null) {
+            LogUtils.d(TAG, "Could not load attachment %d", attachmentId);
+            doStatusCallback(callback, -1, attachmentId, EmailServiceStatus.ATTACHMENT_NOT_FOUND,
+                    0);
+            return;
+        }
+        final Account account = Account.restoreAccountWithId(context, attachment.mAccountKey);
+        if (account == null) {
+            LogUtils.d(TAG, "Attachment %d has bad account key %d", attachment.mId,
+                    attachment.mAccountKey);
+            doStatusCallback(callback, attachment.mMessageKey, attachmentId,
+                    EmailServiceStatus.ATTACHMENT_NOT_FOUND, 0);
+            return;
+        }
+        final Message message = Message.restoreMessageWithId(context, attachment.mMessageKey);
+        if (message == null) {
+            doStatusCallback(callback, attachment.mMessageKey, attachmentId,
+                EmailServiceStatus.MESSAGE_NOT_FOUND, 0);
+            return;
+        }
+
+        // Error cases handled, do the load.
+        final EasAttachmentLoader loader =
+                new EasAttachmentLoader(context, account, callback);
+        final int status = loader.load(attachment);
+        doStatusCallback(callback, attachment.mMessageKey, attachmentId, status, 0);
+    }
+
+    /**
+     * Encoder for Exchange 2003 attachment names.  They come from the server partially encoded,
+     * but there are still possible characters that need to be encoded (Why, MSFT, why?)
+     */
+    private static class AttachmentNameEncoder extends UriCodec {
+        @Override
+        protected boolean isRetained(final char c) {
+            // These four characters are commonly received in EAS 2.5 attachment names and are
+            // valid (verified by testing); we won't encode them
+            return c == '_' || c == ':' || c == '/' || c == '.';
+        }
+    }
+
+    /**
+     * Finish encoding attachment names for Exchange 2003.
+     * @param str A partially encoded string.
+     * @return The fully encoded version of str.
+     */
+    private static String encodeForExchange2003(final String str) {
+        final AttachmentNameEncoder enc = new AttachmentNameEncoder();
+        final StringBuilder sb = new StringBuilder(str.length() + 16);
+        enc.appendPartiallyEncoded(sb, str);
+        return sb.toString();
+    }
+
+    /**
+     * Make the appropriate Exchange server request for getting the attachment.
+     * @param attachment The {@link Attachment} we wish to load.
+     * @return The {@link EasResponse} for the request, or null if we encountered an error.
+     */
+    private EasResponse performServerRequest(final Attachment attachment) {
+        try {
+            // The method of attachment loading is different in EAS 14.0 than in earlier versions
+            final String cmd;
+            final byte[] bytes;
+            if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+                final Serializer s = new Serializer();
+                s.start(Tags.ITEMS_ITEMS).start(Tags.ITEMS_FETCH);
+                s.data(Tags.ITEMS_STORE, "Mailbox");
+                s.data(Tags.BASE_FILE_REFERENCE, attachment.mLocation);
+                s.end().end().done(); // ITEMS_FETCH, ITEMS_ITEMS
+                cmd = "ItemOperations";
+                bytes = s.toByteArray();
+            } else {
+                final String location;
+                // For Exchange 2003 (EAS 2.5), we have to look for illegal chars in the file name
+                // that EAS sent to us!
+                if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                    location = encodeForExchange2003(attachment.mLocation);
+                } else {
+                    location = attachment.mLocation;
+                }
+                cmd = "GetAttachment&AttachmentName=" + location;
+                bytes = null;
+            }
+            return sendHttpClientPost(cmd, bytes);
+        } catch (final IOException e) {
+            LogUtils.w(TAG, "IOException while loading attachment from server: %s", e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Close, ignoring errors (as during cleanup)
+     * @param c a Closeable
+     */
+    private static void close(final Closeable c) {
+        try {
+            c.close();
+        } catch (IOException e) {
+            LogUtils.w(TAG, "IOException while cleaning up attachment: %s", e.getMessage());
+        }
+    }
+
+    /**
+     * Save away the contentUri for this Attachment and notify listeners
+     */
+    private boolean finishLoadAttachment(final Attachment attachment, final File file) {
+        final InputStream in;
+        try {
+            in = new FileInputStream(file);
+          } catch (final FileNotFoundException e) {
+            // Unlikely, as we just created it successfully, but log it.
+            LogUtils.e(TAG, "Could not open attachment file: %s", e.getMessage());
+            return false;
+        }
+        AttachmentUtilities.saveAttachment(mContext, in, attachment);
+        close(in);
+        return true;
+    }
+
+    /**
+     * Read the {@link EasResponse} and extract the attachment data, saving it to the provider.
+     * @param resp The (successful) {@link EasResponse} containing the attachment data.
+     * @param attachment The {@link Attachment} with the attachment metadata.
+     * @return A status code, from {@link EmailServiceStatus}, for this load.
+     */
+    private int handleResponse(final EasResponse resp, final Attachment attachment) {
+        final File tmpFile;
+        try {
+            tmpFile = File.createTempFile("eas_", "tmp", mContext.getCacheDir());
+        } catch (final IOException e) {
+            LogUtils.w(TAG, "Could not open temp file: %s", e.getMessage());
+            // TODO: This is what the old implementation did, but it's kind of the wrong error.
+            return EmailServiceStatus.CONNECTION_ERROR;
+        }
+
+        try {
+            final OutputStream os;
+            try {
+                os = new FileOutputStream(tmpFile);
+            } catch (final FileNotFoundException e) {
+                LogUtils.w(TAG, "Temp file not found: %s", e.getMessage());
+                return EmailServiceStatus.ATTACHMENT_NOT_FOUND;
+            }
+            try {
+                final InputStream is = resp.getInputStream();
+                try {
+                    final ProgressCallback callback = new ProgressCallback(mCallback, attachment);
+                    final boolean success;
+                    if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+                        final ItemOperationsParser parser = new ItemOperationsParser(is, os,
+                                attachment.mSize, callback);
+                        parser.parse();
+                        success = (parser.getStatusCode() == 1);
+                    } else {
+                        final int length = resp.getLength();
+                        if (length != 0) {
+                            // len > 0 means that Content-Length was set in the headers
+                            // len < 0 means "chunked" transfer-encoding
+                            ItemOperationsParser.readChunked(is, os,
+                                    (length < 0) ? attachment.mSize : length, callback);
+                        }
+                        success = true;
+                    }
+                    final int status;
+                    if (success && finishLoadAttachment(attachment, tmpFile)) {
+                        status = EmailServiceStatus.SUCCESS;
+                    } else {
+                        status = EmailServiceStatus.CONNECTION_ERROR;
+                    }
+                    return status;
+                } catch (final IOException e) {
+                    LogUtils.w(TAG, "Error reading attachment: %s", e.getMessage());
+                    return EmailServiceStatus.CONNECTION_ERROR;
+                } finally {
+                    close(is);
+                }
+            } finally {
+                close(os);
+            }
+        } finally {
+            tmpFile.delete();
+        }
+    }
+
+    /**
+     * Load the attachment from the server.
+     * @param attachment The attachment to load.
+     * @return A status code, from {@link EmailServiceStatus}, for this load.
+     */
+    private int load(final Attachment attachment) {
+        // Send a progress update that we're starting.
+        doStatusCallback(mCallback, attachment.mMessageKey, attachment.mId,
+                EmailServiceStatus.IN_PROGRESS, 0);
+        final EasResponse resp = performServerRequest(attachment);
+        if (resp == null) {
+            return EmailServiceStatus.CONNECTION_ERROR;
+        }
+
+        try {
+            if (resp.getStatus() != HttpStatus.SC_OK || resp.isEmpty()) {
+                return EmailServiceStatus.ATTACHMENT_NOT_FOUND;
+            }
+            return handleResponse(resp, attachment);
+        } finally {
+            resp.close();
+        }
+    }
+
+}

diff --git a/src/com/android/exchange/service/EasAutoDiscover.java b/src/com/android/exchange/service/EasAutoDiscover.java
new file mode 100644
index 0000000..1f5d6b9
--- /dev/null
+++ b/src/com/android/exchange/service/EasAutoDiscover.java

@@ -0,0 +1,400 @@
+package com.android.exchange.service;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Xml;
+
+import com.android.emailcommon.mail.MessagingException;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.service.EmailServiceProxy;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Performs Autodiscover for Exchange servers. This feature tries to find all the configuration
+ * options needed based on just a username and password.
+ */
+public class EasAutoDiscover extends EasServerConnection {
+    private static final String TAG = "EasAutoDiscover";
+
+    private static final String AUTO_DISCOVER_SCHEMA_PREFIX =
+        "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/";
+    private static final String AUTO_DISCOVER_PAGE = "/autodiscover/autodiscover.xml";
+
+    // Set of string constants for parsing the autodiscover response.
+    // TODO: Merge this into Tags.java? It's not quite the same but conceptually belongs there.
+    private static final String ELEMENT_NAME_SERVER = "Server";
+    private static final String ELEMENT_NAME_TYPE = "Type";
+    private static final String ELEMENT_NAME_MOBILE_SYNC = "MobileSync";
+    private static final String ELEMENT_NAME_URL = "Url";
+    private static final String ELEMENT_NAME_SETTINGS = "Settings";
+    private static final String ELEMENT_NAME_ACTION = "Action";
+    private static final String ELEMENT_NAME_ERROR = "Error";
+    private static final String ELEMENT_NAME_REDIRECT = "Redirect";
+    private static final String ELEMENT_NAME_USER = "User";
+    private static final String ELEMENT_NAME_EMAIL_ADDRESS = "EMailAddress";
+    private static final String ELEMENT_NAME_DISPLAY_NAME = "DisplayName";
+    private static final String ELEMENT_NAME_RESPONSE = "Response";
+    private static final String ELEMENT_NAME_AUTODISCOVER = "Autodiscover";
+
+    public EasAutoDiscover(final Context context, final String username, final String password) {
+        super(context, new Account(), new HostAuth());
+        mHostAuth.mLogin = username;
+        mHostAuth.mPassword = password;
+        mHostAuth.mFlags = HostAuth.FLAG_AUTHENTICATE | HostAuth.FLAG_SSL;
+        mHostAuth.mPort = 443;
+    }
+
+    /**
+     * Do all the work of autodiscovery.
+     * @return A {@link Bundle} with the host information if autodiscovery succeeded. If we failed
+     *     due to an authentication failure, we return a {@link Bundle} with no host info but with
+     *     an appropriate error code. Otherwise, we return null.
+     */
+    public Bundle doAutodiscover() {
+        final String domain = getDomain();
+        if (domain == null) {
+            return null;
+        }
+
+        final StringEntity entity = buildRequestEntity();
+        if (entity == null) {
+            return null;
+        }
+
+        final HttpPost post = makePost("https://" + domain + AUTO_DISCOVER_PAGE, entity, "text/xml",
+                false);
+        final EasResponse resp = getResponse(post, domain);
+        if (resp == null) {
+            return null;
+        }
+
+        try {
+            // resp is either an authentication error, or a good response.
+            final int code = resp.getStatus();
+            if (code == HttpStatus.SC_UNAUTHORIZED) {
+                final Bundle bundle = new Bundle(1);
+                bundle.putInt(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_ERROR_CODE,
+                        MessagingException.AUTODISCOVER_AUTHENTICATION_FAILED);
+                return bundle;
+            } else {
+                final HostAuth hostAuth = parseAutodiscover(resp);
+                if (hostAuth != null) {
+                    // Fill in the rest of the HostAuth
+                    // We use the user name and password that were successful during
+                    // the autodiscover process
+                    hostAuth.mLogin = mHostAuth.mLogin;
+                    hostAuth.mPassword = mHostAuth.mPassword;
+                    // Note: there is no way we can auto-discover the proper client
+                    // SSL certificate to use, if one is needed.
+                    hostAuth.mPort = 443;
+                    hostAuth.mProtocol = Eas.PROTOCOL;
+                    hostAuth.mFlags = HostAuth.FLAG_SSL | HostAuth.FLAG_AUTHENTICATE;
+                    final Bundle bundle = new Bundle(2);
+                    bundle.putParcelable(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_HOST_AUTH,
+                            hostAuth);
+                    bundle.putInt(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_ERROR_CODE,
+                            MessagingException.NO_ERROR);
+                    return bundle;
+                }
+            }
+        } finally {
+            resp.close();
+        }
+        return null;
+    }
+
+    /**
+     * Get the domain of our account.
+     * @return The domain of the email address.
+     */
+    private String getDomain() {
+        final int amp = mHostAuth.mLogin.indexOf('@');
+        if (amp < 0) {
+            return null;
+        }
+        return mHostAuth.mLogin.substring(amp + 1);
+    }
+
+    /**
+     * Create the payload of the request.
+     * @return A {@link StringEntity} for the request XML.
+     */
+    private StringEntity buildRequestEntity() {
+        try {
+            final XmlSerializer s = Xml.newSerializer();
+            final ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
+            s.setOutput(os, "UTF-8");
+            s.startDocument("UTF-8", false);
+            s.startTag(null, "Autodiscover");
+            s.attribute(null, "xmlns", AUTO_DISCOVER_SCHEMA_PREFIX + "requestschema/2006");
+            s.startTag(null, "Request");
+            s.startTag(null, "EMailAddress").text(mHostAuth.mLogin).endTag(null, "EMailAddress");
+            s.startTag(null, "AcceptableResponseSchema");
+            s.text(AUTO_DISCOVER_SCHEMA_PREFIX + "responseschema/2006");
+            s.endTag(null, "AcceptableResponseSchema");
+            s.endTag(null, "Request");
+            s.endTag(null, "Autodiscover");
+            s.endDocument();
+            return new StringEntity(os.toString());
+        } catch (final IOException e) {
+            // For all exception types, we can simply punt on autodiscover.
+        } catch (final IllegalArgumentException e) {
+        } catch (final IllegalStateException e) {
+        }
+
+        return null;
+    }
+
+    /**
+     * Perform all requests necessary and get the server response. If the post fails or is
+     * redirected, we alter the post and retry.
+     * @param post The initial {@link HttpPost} for this request.
+     * @param domain The domain for our account.
+     * @return If this request succeeded or has an unrecoverable authentication error, an
+     *     {@link EasResponse} with the details. For other errors, we return null.
+     */
+    private EasResponse getResponse(final HttpPost post, final String domain) {
+        EasResponse resp = doPost(post, true);
+        if (resp == null) {
+            LogUtils.d(TAG, "Error in autodiscover, trying aternate address");
+            post.setURI(URI.create("https://autodiscover." + domain + AUTO_DISCOVER_PAGE));
+            resp = doPost(post, true);
+        }
+        return resp;
+    }
+
+    /**
+     * Perform one attempt to get autodiscover information. Redirection and some authentication
+     * errors are handled by recursively calls with modified host information.
+     * @param post The {@link HttpPost} for this request.
+     * @param canRetry Whether we can retry after an authentication failure.
+     * @return If this request succeeded or has an unrecoverable authentication error, an
+     *     {@link EasResponse} with the details. For other errors, we return null.
+     */
+    private EasResponse doPost(final HttpPost post, final boolean canRetry) {
+        final EasResponse resp;
+        try {
+            resp = executePost(post);
+        } catch (final IOException e) {
+            return null;
+        }
+
+        final int code = resp.getStatus();
+
+        if (resp.isRedirectError()) {
+            final String loc = resp.getRedirectAddress();
+            if (loc != null && loc.startsWith("http")) {
+                LogUtils.d(TAG, "Posting autodiscover to redirect: " + loc);
+                redirectHostAuth(loc);
+                post.setURI(URI.create(loc));
+                return doPost(post, canRetry);
+            }
+            return null;
+        }
+
+        if (code == HttpStatus.SC_UNAUTHORIZED) {
+            if (canRetry && mHostAuth.mLogin.contains("@")) {
+                // Try again using the bare user name
+                final int atSignIndex = mHostAuth.mLogin.indexOf('@');
+                mHostAuth.mLogin = mHostAuth.mLogin.substring(0, atSignIndex);
+                LogUtils.d(TAG, "401 received; trying username: %s", mHostAuth.mLogin);
+                resetAuthorization(post);
+                return doPost(post, false);
+            }
+        } else if (code != HttpStatus.SC_OK) {
+            // We'll try the next address if this doesn't work
+            LogUtils.d(TAG, "Bad response code when posting autodiscover: %d", code);
+            return null;
+        }
+
+        return resp;
+    }
+
+    /**
+     * Parse the Server element of the server response.
+     * @param parser The {@link XmlPullParser}.
+     * @param hostAuth The {@link HostAuth} to populate with the results of parsing.
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private static void parseServer(final XmlPullParser parser, final HostAuth hostAuth)
+            throws XmlPullParserException, IOException {
+        boolean mobileSync = false;
+        while (true) {
+            final int type = parser.next();
+            if (type == XmlPullParser.END_TAG && parser.getName().equals(ELEMENT_NAME_SERVER)) {
+                break;
+            } else if (type == XmlPullParser.START_TAG) {
+                final String name = parser.getName();
+                if (name.equals(ELEMENT_NAME_TYPE)) {
+                    if (parser.nextText().equals(ELEMENT_NAME_MOBILE_SYNC)) {
+                        mobileSync = true;
+                    }
+                } else if (mobileSync && name.equals(ELEMENT_NAME_URL)) {
+                    final String url = parser.nextText();
+                    if (url != null) {
+                        LogUtils.d(TAG, "Autodiscover URL: %s", url);
+                        hostAuth.mAddress = Uri.parse(url).getHost();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse the Settings element of the server response.
+     * @param parser The {@link XmlPullParser}.
+     * @param hostAuth The {@link HostAuth} to populate with the results of parsing.
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private static void parseSettings(final XmlPullParser parser, final HostAuth hostAuth)
+            throws XmlPullParserException, IOException {
+        while (true) {
+            final int type = parser.next();
+            if (type == XmlPullParser.END_TAG && parser.getName().equals(ELEMENT_NAME_SETTINGS)) {
+                break;
+            } else if (type == XmlPullParser.START_TAG) {
+                final String name = parser.getName();
+                if (name.equals(ELEMENT_NAME_SERVER)) {
+                    parseServer(parser, hostAuth);
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse the Action element of the server response.
+     * @param parser The {@link XmlPullParser}.
+     * @param hostAuth The {@link HostAuth} to populate with the results of parsing.
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private static void parseAction(final XmlPullParser parser, final HostAuth hostAuth)
+            throws XmlPullParserException, IOException {
+        while (true) {
+            final int type = parser.next();
+            if (type == XmlPullParser.END_TAG && parser.getName().equals(ELEMENT_NAME_ACTION)) {
+                break;
+            } else if (type == XmlPullParser.START_TAG) {
+                final String name = parser.getName();
+                if (name.equals(ELEMENT_NAME_ERROR)) {
+                    // Should parse the error
+                } else if (name.equals(ELEMENT_NAME_REDIRECT)) {
+                    LogUtils.d(TAG, "Redirect: " + parser.nextText());
+                } else if (name.equals(ELEMENT_NAME_SETTINGS)) {
+                    parseSettings(parser, hostAuth);
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse the User element of the server response.
+     * @param parser The {@link XmlPullParser}.
+     * @param hostAuth The {@link HostAuth} to populate with the results of parsing.
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private static void parseUser(final XmlPullParser parser, final HostAuth hostAuth)
+            throws XmlPullParserException, IOException {
+        while (true) {
+            int type = parser.next();
+            if (type == XmlPullParser.END_TAG && parser.getName().equals(ELEMENT_NAME_USER)) {
+                break;
+            } else if (type == XmlPullParser.START_TAG) {
+                String name = parser.getName();
+                if (name.equals(ELEMENT_NAME_EMAIL_ADDRESS)) {
+                    final String addr = parser.nextText();
+                    LogUtils.d(TAG, "Autodiscover, email: %s", addr);
+                } else if (name.equals(ELEMENT_NAME_DISPLAY_NAME)) {
+                    final String dn = parser.nextText();
+                    LogUtils.d(TAG, "Autodiscover, user: %s", dn);
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse the Response element of the server response.
+     * @param parser The {@link XmlPullParser}.
+     * @param hostAuth The {@link HostAuth} to populate with the results of parsing.
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private static void parseResponse(final XmlPullParser parser, final HostAuth hostAuth)
+            throws XmlPullParserException, IOException {
+        while (true) {
+            final int type = parser.next();
+            if (type == XmlPullParser.END_TAG && parser.getName().equals(ELEMENT_NAME_RESPONSE)) {
+                break;
+            } else if (type == XmlPullParser.START_TAG) {
+                final String name = parser.getName();
+                if (name.equals(ELEMENT_NAME_USER)) {
+                    parseUser(parser, hostAuth);
+                } else if (name.equals(ELEMENT_NAME_ACTION)) {
+                    parseAction(parser, hostAuth);
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse the server response for the final {@link HostAuth}.
+     * @param resp The {@link EasResponse} from the server.
+     * @return The final {@link HostAuth} for this server.
+     */
+    private static HostAuth parseAutodiscover(final EasResponse resp) {
+        // The response to Autodiscover is regular XML (not WBXML)
+        try {
+            final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
+            parser.setInput(resp.getInputStream(), "UTF-8");
+            if (parser.getEventType() != XmlPullParser.START_DOCUMENT) {
+                return null;
+            }
+            if (parser.next() != XmlPullParser.START_TAG) {
+                return null;
+            }
+            if (!parser.getName().equals(ELEMENT_NAME_AUTODISCOVER)) {
+                return null;
+            }
+
+            final HostAuth hostAuth = new HostAuth();
+            while (true) {
+                final int type = parser.nextTag();
+                if (type == XmlPullParser.END_TAG && parser.getName()
+                        .equals(ELEMENT_NAME_AUTODISCOVER)) {
+                    break;
+                } else if (type == XmlPullParser.START_TAG && parser.getName()
+                        .equals(ELEMENT_NAME_RESPONSE)) {
+                    parseResponse(parser, hostAuth);
+                    // Valid responses will set the address.
+                    if (hostAuth.mAddress != null) {
+                        return hostAuth;
+                    }
+                }
+            }
+        } catch (final XmlPullParserException e) {
+            // Parse error.
+        } catch (final IOException e) {
+            // Error reading parser.
+        }
+        return null;
+    }
+}

diff --git a/src/com/android/exchange/service/EasCalendarSyncHandler.java b/src/com/android/exchange/service/EasCalendarSyncHandler.java
new file mode 100644
index 0000000..f322350
--- /dev/null
+++ b/src/com/android/exchange/service/EasCalendarSyncHandler.java

@@ -0,0 +1,1004 @@
+package com.android.exchange.service;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Entity;
+import android.content.EntityIterator;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+import android.provider.CalendarContract.EventsEntity;
+import android.provider.CalendarContract.ExtendedProperties;
+import android.provider.CalendarContract.Reminders;
+import android.provider.CalendarContract.SyncState;
+import android.provider.SyncStateContract;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+
+import com.android.calendarcommon2.DateException;
+import com.android.calendarcommon2.Duration;
+import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.utility.Utility;
+import com.android.exchange.Eas;
+import com.android.exchange.R;
+import com.android.exchange.adapter.AbstractSyncParser;
+import com.android.exchange.adapter.CalendarSyncAdapter;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.utils.LogUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.UUID;
+
+/**
+ * Performs an Exchange Sync for a Calendar collection.
+ */
+public class EasCalendarSyncHandler extends EasSyncHandler {
+    private static final String TAG = "EasCalendarSyncHandler";
+
+    // TODO: Some constants are copied from CalendarSyncAdapter and are still used by the parser.
+    // These values need to stay in sync; when the parser is cleaned up, be sure to unify them.
+
+    /** Projection for getting a calendar id. */
+    private static final String[] CALENDAR_ID_PROJECTION = { Calendars._ID };
+    private static final int CALENDAR_ID_COLUMN = 0;
+
+    /** Content selection for getting a calendar id for an account. */
+    private static final String CALENDAR_SELECTION = Calendars.ACCOUNT_NAME + "=? AND " +
+            Calendars.ACCOUNT_TYPE + "=?";
+
+    /** The column used to track the timezone of the event. */
+    private static final String EVENT_SAVED_TIMEZONE_COLUMN = Events.SYNC_DATA1;
+
+    /** Used to keep track of exception vs. parent event dirtiness. */
+    private static final String EVENT_SYNC_MARK = Events.SYNC_DATA8;
+
+    /** The column used to track the Event version sequence number. */
+    private static final String EVENT_SYNC_VERSION = Events.SYNC_DATA4;
+
+    /** Projection for getting info about changed events. */
+    private static final String[] ORIGINAL_EVENT_PROJECTION = { Events.ORIGINAL_ID, Events._ID };
+    private static final int ORIGINAL_EVENT_ORIGINAL_ID_COLUMN = 0;
+    private static final int ORIGINAL_EVENT_ID_COLUMN = 1;
+
+    /** Content selection for dirty calendar events. */
+    private static final String DIRTY_EXCEPTION_IN_CALENDAR = Events.DIRTY + "=1 AND " +
+            Events.ORIGINAL_ID + " NOTNULL AND " + Events.CALENDAR_ID + "=?";
+
+    /** Where clause for updating dirty events. */
+    private static final String EVENT_ID_AND_CALENDAR_ID = Events._ID + "=? AND " +
+            Events.ORIGINAL_SYNC_ID + " ISNULL AND " + Events.CALENDAR_ID + "=?";
+
+    /** Content selection for dirty or marked top level events. */
+    private static final String DIRTY_OR_MARKED_TOP_LEVEL_IN_CALENDAR = "(" + Events.DIRTY +
+            "=1 OR " + EVENT_SYNC_MARK + "= 1) AND " + Events.ORIGINAL_ID + " ISNULL AND " +
+            Events.CALENDAR_ID + "=?";
+
+    /** Content selection for getting events when handling exceptions. */
+    private static final String ORIGINAL_EVENT_AND_CALENDAR = Events.ORIGINAL_SYNC_ID + "=? AND " +
+            Events.CALENDAR_ID + "=?";
+
+    private static final String CATEGORY_TOKENIZER_DELIMITER = "\\";
+    private static final String ATTENDEE_TOKENIZER_DELIMITER = CATEGORY_TOKENIZER_DELIMITER;
+
+    /** Used to indicate that upsyncs aren't allowed (we catch this in sendLocalChanges) */
+    private static final String EXTENDED_PROPERTY_UPSYNC_PROHIBITED = "upsyncProhibited";
+
+    private static final String EXTENDED_PROPERTY_USER_ATTENDEE_STATUS = "userAttendeeStatus";
+    private static final String EXTENDED_PROPERTY_ATTENDEES = "attendees";
+    private static final String EXTENDED_PROPERTY_CATEGORIES = "categories";
+
+    private final android.accounts.Account mAccountManagerAccount;
+    private final long mCalendarId;
+
+    // The following lists are populated as part of upsync, and handled during cleanup.
+    /** Ids of events that were deleted in this upsync. */
+    private final ArrayList<Long> mDeletedIdList = new ArrayList<Long>();
+    /** Ids of events that were changed in this upsync. */
+    private final ArrayList<Long> mUploadedIdList = new ArrayList<Long>();
+    /** Emails that need to be sent due to this upsync. */
+    private final ArrayList<Message> mOutgoingMailList = new ArrayList<Message>();
+
+    public EasCalendarSyncHandler(final Context context, final ContentResolver contentResolver,
+            final android.accounts.Account accountManagerAccount, final Account account,
+            final Mailbox mailbox, final Bundle syncExtras, final SyncResult syncResult) {
+        super(context, contentResolver, account, mailbox, syncExtras, syncResult);
+        mAccountManagerAccount = accountManagerAccount;
+        final Cursor c = mContentResolver.query(Calendars.CONTENT_URI, CALENDAR_ID_PROJECTION,
+                CALENDAR_SELECTION,
+                new String[] {mAccount.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE}, null);
+        if (c == null) {
+            mCalendarId = -1;
+        } else {
+            try {
+                if (c.moveToFirst()) {
+                    mCalendarId = c.getLong(CALENDAR_ID_COLUMN);
+                } else {
+                    mCalendarId = CalendarUtilities.createCalendar(mContext, mContentResolver,
+                            mAccount, mMailbox);
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    @Override
+    protected int getTrafficFlag() {
+        return TrafficFlags.DATA_CALENDAR;
+    }
+
+    /**
+     * Adds params to a {@link Uri} to indicate that the caller is a sync adapter, and to add the
+     * account info.
+     * @param uri The {@link Uri} to which to add params.
+     * @return The augmented {@link Uri}.
+     */
+    private static Uri asSyncAdapter(final Uri uri, final String emailAddress) {
+        return uri.buildUpon().appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+                .appendQueryParameter(Calendars.ACCOUNT_NAME, emailAddress)
+                .appendQueryParameter(Calendars.ACCOUNT_TYPE, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE)
+                .build();
+    }
+
+    /**
+     * Convenience wrapper to {@link #asSyncAdapter(android.net.Uri, String)}.
+     */
+    private Uri asSyncAdapter(final Uri uri) {
+        return asSyncAdapter(uri, mAccount.mEmailAddress);
+    }
+
+    @Override
+    protected String getSyncKey() {
+        // mMailbox.mSyncKey is bogus since state is stored by the calendar provider, so we
+        // need to fetch the data from there.
+        // However, we need for that value to be reasonable, so we set it here once we fetch it.
+        final ContentProviderClient client =
+                mContentResolver.acquireContentProviderClient(CalendarContract.CONTENT_URI);
+        try {
+            final byte[] data = SyncStateContract.Helpers.get(client,
+                    asSyncAdapter(SyncState.CONTENT_URI), mAccountManagerAccount);
+            if (data == null || data.length == 0) {
+                mMailbox.mSyncKey = "0";
+            } else {
+                mMailbox.mSyncKey = new String(data);
+            }
+            return mMailbox.mSyncKey;
+        } catch (final RemoteException e) {
+            return null;
+        }
+    }
+
+    @Override
+    protected String getFolderClassName() {
+        return "Calendar";
+    }
+
+
+    @Override
+    protected AbstractSyncParser getParser(final InputStream is) throws IOException {
+        return new CalendarSyncAdapter.EasCalendarSyncParser(mContext, mContentResolver, is,
+                mMailbox, mAccount, mAccountManagerAccount, mCalendarId);
+    }
+
+    @Override
+    protected void setInitialSyncOptions(final Serializer s) throws IOException {
+        // Nothing to do for Calendar.
+    }
+
+    @Override
+    protected void setNonInitialSyncOptions(final Serializer s) throws IOException {
+        setPimSyncOptions(s, Eas.FILTER_2_WEEKS);
+    }
+
+    /**
+     * Find all dirty events for our calendar and mark their parents. Also delete any dirty events
+     * that have no parents.
+     * @param calendarIdString {@link #mCalendarId}, as a String.
+     * @param calendarIdArgument calendarIdString, in a String array.
+     */
+    private void markParentsOfDirtyEvents(final String calendarIdString,
+            final String[] calendarIdArgument) {
+        // We've got to handle exceptions as part of the parent when changes occur, so we need
+        // to find new/changed exceptions and mark the parent dirty
+        final ArrayList<Long> orphanedExceptions = new ArrayList<Long>();
+        final Cursor c = mContentResolver.query(Events.CONTENT_URI,
+                ORIGINAL_EVENT_PROJECTION, DIRTY_EXCEPTION_IN_CALENDAR, calendarIdArgument, null);
+        if (c != null) {
+            try {
+                final ContentValues cv = new ContentValues(1);
+                // We use _sync_mark here to distinguish dirty parents from parents with dirty
+                // exceptions
+                cv.put(EVENT_SYNC_MARK, "1");
+                while (c.moveToNext()) {
+                    // Mark the parents of dirty exceptions
+                    final long parentId = c.getLong(ORIGINAL_EVENT_ORIGINAL_ID_COLUMN);
+                    final int cnt = mContentResolver.update(asSyncAdapter(Events.CONTENT_URI), cv,
+                            EVENT_ID_AND_CALENDAR_ID,
+                            new String[] { Long.toString(parentId), calendarIdString });
+                    // Keep track of any orphaned exceptions
+                    if (cnt == 0) {
+                        orphanedExceptions.add(c.getLong(ORIGINAL_EVENT_ID_COLUMN));
+                    }
+                }
+            } finally {
+                c.close();
+            }
+        }
+
+        // Delete any orphaned exceptions
+        for (final long orphan : orphanedExceptions) {
+            LogUtils.i(TAG, "Deleted orphaned exception: %d", orphan);
+            mContentResolver.delete(asSyncAdapter(
+                    ContentUris.withAppendedId(Events.CONTENT_URI, orphan)), null, null);
+        }
+    }
+
+    /**
+     * Get the version number of the current event, incrementing it if it's already there.
+     * @param entityValues The {@link ContentValues} for this event.
+     * @return The new version number for this event (i.e. 0 if it's a new event, or the old version
+     *     number + 1).
+     */
+    private static String getEntityVersion(final ContentValues entityValues) {
+        final String version = entityValues.getAsString(EVENT_SYNC_VERSION);
+        // This should never be null, but catch this error anyway
+        // Version should be "0" when we create the event, so use that
+        if (version != null) {
+            // Increment and save
+            try {
+                return Integer.toString((Integer.parseInt(version) + 1));
+            } catch (final NumberFormatException e) {
+                // Handle the case in which someone writes a non-integer here;
+                // shouldn't happen, but we don't want to kill the sync for his
+            }
+        }
+        return "0";
+    }
+
+    /**
+     * Convenience method for sending an email to the organizer declining the meeting.
+     * @param entity The {@link Entity} for this event.
+     * @param clientId The client id for this event.
+     */
+    private void sendDeclinedEmail(final Entity entity, final String clientId) {
+        final Message msg =
+                CalendarUtilities.createMessageForEntity(mContext, entity,
+                        Message.FLAG_OUTGOING_MEETING_DECLINE, clientId, mAccount);
+        if (msg != null) {
+            LogUtils.i(TAG, "Queueing declined response to %s", msg.mTo);
+            mOutgoingMailList.add(msg);
+        }
+    }
+
+    /**
+     * Get an integer value from a {@link ContentValues}, or 0 if the value isn't there.
+     * @param cv The {@link ContentValues} to find the value in.
+     * @param column The name of the column in cv to get.
+     * @return The appropriate value as an integer, or 0 if it's not there.
+     */
+    private static int getInt(final ContentValues cv, final String column) {
+        final Integer i = cv.getAsInteger(column);
+        if (i == null) return 0;
+        return i;
+    }
+
+    /**
+     * Convert {@link Events} visibility values to EAS visibility values.
+     * @param visibility The {@link Events} visibility value.
+     * @return The corresponding EAS visibility value.
+     */
+    private static String decodeVisibility(final int visibility) {
+        final int easVisibility;
+        switch(visibility) {
+            case Events.ACCESS_DEFAULT:
+                easVisibility = 0;
+                break;
+            case Events.ACCESS_PUBLIC:
+                easVisibility = 1;
+                break;
+            case Events.ACCESS_PRIVATE:
+                easVisibility = 2;
+                break;
+            case Events.ACCESS_CONFIDENTIAL:
+                easVisibility = 3;
+                break;
+            default:
+                easVisibility = 0;
+                break;
+        }
+        return Integer.toString(easVisibility);
+    }
+
+    /**
+     * Write an event to the {@link Serializer} for this upsync.
+     * @param entity The {@link Entity} for this event.
+     * @param clientId The client id for this event.
+     * @param s The {@link Serializer} for this Sync request.
+     * @throws IOException
+     * TODO: This can probably be refactored/cleaned up more.
+     */
+    private void sendEvent(final Entity entity, final String clientId, final Serializer s)
+            throws IOException {
+        // Serialize for EAS here
+        // Set uid with the client id we created
+        // 1) Serialize the top-level event
+        // 2) Serialize attendees and reminders from subvalues
+        // 3) Look for exceptions and serialize with the top-level event
+        final ContentValues entityValues = entity.getEntityValues();
+        final boolean isException = (clientId == null);
+        boolean hasAttendees = false;
+        final boolean isChange = entityValues.containsKey(Events._SYNC_ID);
+        final boolean allDay =
+            CalendarUtilities.getIntegerValueAsBoolean(entityValues, Events.ALL_DAY);
+        final TimeZone localTimeZone = TimeZone.getDefault();
+
+        // NOTE: Exchange 2003 (EAS 2.5) seems to require the "exception deleted" and "exception
+        // start time" data before other data in exceptions.  Failure to do so results in a
+        // status 6 error during sync
+        if (isException) {
+           // Send exception deleted flag if necessary
+            final Integer deleted = entityValues.getAsInteger(Events.DELETED);
+            final boolean isDeleted = deleted != null && deleted == 1;
+            final Integer eventStatus = entityValues.getAsInteger(Events.STATUS);
+            final boolean isCanceled =
+                    eventStatus != null && eventStatus.equals(Events.STATUS_CANCELED);
+            if (isDeleted || isCanceled) {
+                s.data(Tags.CALENDAR_EXCEPTION_IS_DELETED, "1");
+                // If we're deleted, the UI will continue to show this exception until we mark
+                // it canceled, so we'll do that here...
+                if (isDeleted && !isCanceled) {
+                    final long eventId = entityValues.getAsLong(Events._ID);
+                    final ContentValues cv = new ContentValues(1);
+                    cv.put(Events.STATUS, Events.STATUS_CANCELED);
+                    mContentResolver.update(
+                            asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, eventId)),
+                            cv, null, null);
+                }
+            } else {
+                s.data(Tags.CALENDAR_EXCEPTION_IS_DELETED, "0");
+            }
+
+            // TODO Add reminders to exceptions (allow them to be specified!)
+            Long originalTime = entityValues.getAsLong(Events.ORIGINAL_INSTANCE_TIME);
+            if (originalTime != null) {
+                final boolean originalAllDay =
+                    CalendarUtilities.getIntegerValueAsBoolean(entityValues,
+                            Events.ORIGINAL_ALL_DAY);
+                if (originalAllDay) {
+                    // For all day events, we need our local all-day time
+                    originalTime =
+                        CalendarUtilities.getLocalAllDayCalendarTime(originalTime, localTimeZone);
+                }
+                s.data(Tags.CALENDAR_EXCEPTION_START_TIME,
+                        CalendarUtilities.millisToEasDateTime(originalTime));
+            } else {
+                // Illegal; what should we do?
+            }
+        }
+
+        if (!isException) {
+            // A time zone is required in all EAS events; we'll use the default if none is set
+            // Exchange 2003 seems to require this first... :-)
+            String timeZoneName = entityValues.getAsString(
+                    allDay ? EVENT_SAVED_TIMEZONE_COLUMN : Events.EVENT_TIMEZONE);
+            if (timeZoneName == null) {
+                timeZoneName = localTimeZone.getID();
+            }
+            s.data(Tags.CALENDAR_TIME_ZONE,
+                    CalendarUtilities.timeZoneToTziString(TimeZone.getTimeZone(timeZoneName)));
+        }
+
+        s.data(Tags.CALENDAR_ALL_DAY_EVENT, allDay ? "1" : "0");
+
+        // DTSTART is always supplied
+        long startTime = entityValues.getAsLong(Events.DTSTART);
+        // Determine endTime; it's either provided as DTEND or we calculate using DURATION
+        // If no DURATION is provided, we default to one hour
+        long endTime;
+        if (entityValues.containsKey(Events.DTEND)) {
+            endTime = entityValues.getAsLong(Events.DTEND);
+        } else {
+            long durationMillis = DateUtils.HOUR_IN_MILLIS;
+            if (entityValues.containsKey(Events.DURATION)) {
+                final Duration duration = new Duration();
+                try {
+                    duration.parse(entityValues.getAsString(Events.DURATION));
+                    durationMillis = duration.getMillis();
+                } catch (DateException e) {
+                    // Can't do much about this; use the default (1 hour)
+                }
+            }
+            endTime = startTime + durationMillis;
+        }
+        if (allDay) {
+            startTime = CalendarUtilities.getLocalAllDayCalendarTime(startTime, localTimeZone);
+            endTime = CalendarUtilities.getLocalAllDayCalendarTime(endTime, localTimeZone);
+        }
+        s.data(Tags.CALENDAR_START_TIME, CalendarUtilities.millisToEasDateTime(startTime));
+        s.data(Tags.CALENDAR_END_TIME, CalendarUtilities.millisToEasDateTime(endTime));
+
+        s.data(Tags.CALENDAR_DTSTAMP,
+                CalendarUtilities.millisToEasDateTime(System.currentTimeMillis()));
+
+        String loc = entityValues.getAsString(Events.EVENT_LOCATION);
+        if (!TextUtils.isEmpty(loc)) {
+            if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                // EAS 2.5 doesn't like bare line feeds
+                loc = Utility.replaceBareLfWithCrlf(loc);
+            }
+            s.data(Tags.CALENDAR_LOCATION, loc);
+        }
+        s.writeStringValue(entityValues, Events.TITLE, Tags.CALENDAR_SUBJECT);
+
+        if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+            s.start(Tags.BASE_BODY);
+            s.data(Tags.BASE_TYPE, "1");
+            s.writeStringValue(entityValues, Events.DESCRIPTION, Tags.BASE_DATA);
+            s.end();
+        } else {
+            // EAS 2.5 doesn't like bare line feeds
+            s.writeStringValue(entityValues, Events.DESCRIPTION, Tags.CALENDAR_BODY);
+        }
+
+        if (!isException) {
+            // For Exchange 2003, only upsync if the event is new
+            if ((getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) {
+                s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);
+            }
+
+            final String rrule = entityValues.getAsString(Events.RRULE);
+            if (rrule != null) {
+                CalendarUtilities.recurrenceFromRrule(rrule, startTime, s);
+            }
+
+            // Handle associated data EXCEPT for attendees, which have to be grouped
+            final ArrayList<Entity.NamedContentValues> subValues = entity.getSubValues();
+            // The earliest of the reminders for this Event; we can only send one reminder...
+            int earliestReminder = -1;
+            for (final Entity.NamedContentValues ncv: subValues) {
+                final Uri ncvUri = ncv.uri;
+                final ContentValues ncvValues = ncv.values;
+                if (ncvUri.equals(ExtendedProperties.CONTENT_URI)) {
+                    final String propertyName = ncvValues.getAsString(ExtendedProperties.NAME);
+                    final String propertyValue = ncvValues.getAsString(ExtendedProperties.VALUE);
+                    if (TextUtils.isEmpty(propertyValue)) {
+                        continue;
+                    }
+                    if (propertyName.equals(EXTENDED_PROPERTY_CATEGORIES)) {
+                        // Send all the categories back to the server
+                        // We've saved them as a String of delimited tokens
+                        final StringTokenizer st =
+                            new StringTokenizer(propertyValue, CATEGORY_TOKENIZER_DELIMITER);
+                        if (st.countTokens() > 0) {
+                            s.start(Tags.CALENDAR_CATEGORIES);
+                            while (st.hasMoreTokens()) {
+                                s.data(Tags.CALENDAR_CATEGORY, st.nextToken());
+                            }
+                            s.end();
+                        }
+                    }
+                } else if (ncvUri.equals(Reminders.CONTENT_URI)) {
+                    Integer mins = ncvValues.getAsInteger(Reminders.MINUTES);
+                    if (mins != null) {
+                        // -1 means "default", which for Exchange, is 30
+                        if (mins < 0) {
+                            mins = 30;
+                        }
+                        // Save this away if it's the earliest reminder (greatest minutes)
+                        if (mins > earliestReminder) {
+                            earliestReminder = mins;
+                        }
+                    }
+                }
+            }
+
+            // If we have a reminder, send it to the server
+            if (earliestReminder >= 0) {
+                s.data(Tags.CALENDAR_REMINDER_MINS_BEFORE, Integer.toString(earliestReminder));
+            }
+
+            // We've got to send a UID, unless this is an exception.  If the event is new, we've
+            // generated one; if not, we should have gotten one from extended properties.
+            if (clientId != null) {
+                s.data(Tags.CALENDAR_UID, clientId);
+            }
+
+            // Handle attendee data here; keep track of organizer and stream it afterward
+            String organizerName = null;
+            String organizerEmail = null;
+            for (final Entity.NamedContentValues ncv: subValues) {
+                final Uri ncvUri = ncv.uri;
+                final ContentValues ncvValues = ncv.values;
+                if (ncvUri.equals(Attendees.CONTENT_URI)) {
+                    final Integer relationship =
+                            ncvValues.getAsInteger(Attendees.ATTENDEE_RELATIONSHIP);
+                    // If there's no relationship, we can't create this for EAS
+                    // Similarly, we need an attendee email for each invitee
+                    if (relationship != null && ncvValues.containsKey(Attendees.ATTENDEE_EMAIL)) {
+                        // Organizer isn't among attendees in EAS
+                        if (relationship == Attendees.RELATIONSHIP_ORGANIZER) {
+                            organizerName = ncvValues.getAsString(Attendees.ATTENDEE_NAME);
+                            organizerEmail = ncvValues.getAsString(Attendees.ATTENDEE_EMAIL);
+                            continue;
+                        }
+                        if (!hasAttendees) {
+                            s.start(Tags.CALENDAR_ATTENDEES);
+                            hasAttendees = true;
+                        }
+                        s.start(Tags.CALENDAR_ATTENDEE);
+                        final String attendeeEmail =
+                                ncvValues.getAsString(Attendees.ATTENDEE_EMAIL);
+                        String attendeeName = ncvValues.getAsString(Attendees.ATTENDEE_NAME);
+                        if (attendeeName == null) {
+                            attendeeName = attendeeEmail;
+                        }
+                        s.data(Tags.CALENDAR_ATTENDEE_NAME, attendeeName);
+                        s.data(Tags.CALENDAR_ATTENDEE_EMAIL, attendeeEmail);
+                        if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                            s.data(Tags.CALENDAR_ATTENDEE_TYPE, "1"); // Required
+                        }
+                        s.end(); // Attendee
+                     }
+                }
+            }
+            if (hasAttendees) {
+                s.end();  // Attendees
+            }
+
+            // Get busy status from availability
+            final int availability = entityValues.getAsInteger(Events.AVAILABILITY);
+            final int busyStatus = CalendarUtilities.busyStatusFromAvailability(availability);
+            s.data(Tags.CALENDAR_BUSY_STATUS, Integer.toString(busyStatus));
+
+            // Meeting status, 0 = appointment, 1 = meeting, 3 = attendee
+            // In JB, organizer won't be an attendee
+            if (organizerEmail == null && entityValues.containsKey(Events.ORGANIZER)) {
+                organizerEmail = entityValues.getAsString(Events.ORGANIZER);
+            }
+            if (mAccount.mEmailAddress.equalsIgnoreCase(organizerEmail)) {
+                s.data(Tags.CALENDAR_MEETING_STATUS, hasAttendees ? "1" : "0");
+            } else {
+                s.data(Tags.CALENDAR_MEETING_STATUS, "3");
+            }
+
+            // For Exchange 2003, only upsync if the event is new
+            if (((getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) &&
+                    organizerName != null) {
+                s.data(Tags.CALENDAR_ORGANIZER_NAME, organizerName);
+            }
+
+            // NOTE: Sensitivity must NOT be sent to the server for exceptions in Exchange 2003
+            // The result will be a status 6 failure during sync
+            final Integer visibility = entityValues.getAsInteger(Events.ACCESS_LEVEL);
+            if (visibility != null) {
+                s.data(Tags.CALENDAR_SENSITIVITY, decodeVisibility(visibility));
+            } else {
+                // Default to private if not set
+                s.data(Tags.CALENDAR_SENSITIVITY, "1");
+            }
+        }
+    }
+
+    /**
+     * Handle exceptions to an event's recurrance pattern.
+     * @param s The {@link Serializer} for this upsync.
+     * @param entity The {@link Entity} for this event.
+     * @param entityValues The {@link ContentValues} for entity.
+     * @param serverId The server side id for this event.
+     * @param clientId The client side id for this event.
+     * @param calendarIdString The calendar id, as a {@link String}.
+     * @param selfOrganizer Whether the user is the organizer of this event.
+     * @throws IOException
+     */
+    private void handleExceptionsToRecurrenceRules(final Serializer s, final Entity entity,
+            final ContentValues entityValues, final String serverId, final String clientId,
+            final String calendarIdString, final boolean selfOrganizer) throws IOException {
+        final EntityIterator exIterator = EventsEntity.newEntityIterator(mContentResolver.query(
+                asSyncAdapter(Events.CONTENT_URI), null, ORIGINAL_EVENT_AND_CALENDAR,
+                new String[] { serverId, calendarIdString }, null), mContentResolver);
+        boolean exFirst = true;
+        while (exIterator.hasNext()) {
+            final Entity exEntity = exIterator.next();
+            if (exFirst) {
+                s.start(Tags.CALENDAR_EXCEPTIONS);
+                exFirst = false;
+            }
+            s.start(Tags.CALENDAR_EXCEPTION);
+            sendEvent(exEntity, null, s);
+            final ContentValues exValues = exEntity.getEntityValues();
+            if (getInt(exValues, Events.DIRTY) == 1) {
+                // This is a new/updated exception, so we've got to notify our
+                // attendees about it
+                final long exEventId = exValues.getAsLong(Events._ID);
+
+                // Copy subvalues into the exception; otherwise, we won't see the
+                // attendees when preparing the message
+                for (final Entity.NamedContentValues ncv: entity.getSubValues()) {
+                    exEntity.addSubValue(ncv.uri, ncv.values);
+                }
+
+                final int flag;
+                if ((getInt(exValues, Events.DELETED) == 1) ||
+                        (getInt(exValues, Events.STATUS) == Events.STATUS_CANCELED)) {
+                    flag = Message.FLAG_OUTGOING_MEETING_CANCEL;
+                    if (!selfOrganizer) {
+                        // Send a cancellation notice to the organizer
+                        // Since CalendarProvider2 sets the organizer of exceptions
+                        // to the user, we have to reset it first to the original
+                        // organizer
+                        exValues.put(Events.ORGANIZER, entityValues.getAsString(Events.ORGANIZER));
+                        sendDeclinedEmail(exEntity, clientId);
+                    }
+                } else {
+                    flag = Message.FLAG_OUTGOING_MEETING_INVITE;
+                }
+                // Add the eventId of the exception to the uploaded id list, so that
+                // the dirty/mark bits are cleared
+                mUploadedIdList.add(exEventId);
+
+                // Copy version so the ics attachment shows the proper sequence #
+                exValues.put(EVENT_SYNC_VERSION,
+                        entityValues.getAsString(EVENT_SYNC_VERSION));
+                // Copy location so that it's included in the outgoing email
+                if (entityValues.containsKey(Events.EVENT_LOCATION)) {
+                    exValues.put(Events.EVENT_LOCATION,
+                            entityValues.getAsString(Events.EVENT_LOCATION));
+                }
+
+                if (selfOrganizer) {
+                    final Message msg = CalendarUtilities.createMessageForEntity(mContext, exEntity,
+                            flag, clientId, mAccount);
+                    if (msg != null) {
+                        LogUtils.i(TAG, "Queueing exception update to %s", msg.mTo);
+                        mOutgoingMailList.add(msg);
+                    }
+                }
+            }
+            s.end(); // EXCEPTION
+        }
+        if (!exFirst) {
+            s.end(); // EXCEPTIONS
+        }
+    }
+
+    /**
+     * Update the event properties with the attendee list, and send mail as appropriate.
+     * @param entity The {@link Entity} for this event.
+     * @param entityValues The {@link ContentValues} for entity.
+     * @param selfOrganizer Whether the user is the organizer of this event.
+     * @param eventId The id for this event.
+     * @param clientId The client side id for this event.
+     */
+    private void updateAttendeesAndSendMail(final Entity entity, final ContentValues entityValues,
+            final boolean selfOrganizer, final long eventId, final String clientId) {
+        // Go through the extended properties of this Event and pull out our tokenized
+        // attendees list and the user attendee status; we will need them later
+        String attendeeString = null;
+        long attendeeStringId = -1;
+        String userAttendeeStatus = null;
+        long userAttendeeStatusId = -1;
+        for (final Entity.NamedContentValues ncv: entity.getSubValues()) {
+            if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
+                final ContentValues ncvValues = ncv.values;
+                final String propertyName = ncvValues.getAsString(ExtendedProperties.NAME);
+                if (propertyName.equals(EXTENDED_PROPERTY_ATTENDEES)) {
+                    attendeeString = ncvValues.getAsString(ExtendedProperties.VALUE);
+                    attendeeStringId = ncvValues.getAsLong(ExtendedProperties._ID);
+                } else if (propertyName.equals(EXTENDED_PROPERTY_USER_ATTENDEE_STATUS)) {
+                    userAttendeeStatus = ncvValues.getAsString(ExtendedProperties.VALUE);
+                    userAttendeeStatusId = ncvValues.getAsLong(ExtendedProperties._ID);
+                }
+            }
+        }
+
+        // Send the meeting invite if there are attendees and we're the organizer AND
+        // if the Event itself is dirty (we might be syncing only because an exception
+        // is dirty, in which case we DON'T send email about the Event)
+        if (selfOrganizer && (getInt(entityValues, Events.DIRTY) == 1)) {
+            final Message msg =
+                CalendarUtilities.createMessageForEventId(mContext, eventId,
+                        Message.FLAG_OUTGOING_MEETING_INVITE, clientId, mAccount);
+            if (msg != null) {
+                LogUtils.i(TAG, "Queueing invitation to %s", msg.mTo);
+                mOutgoingMailList.add(msg);
+            }
+            // Make a list out of our tokenized attendees, if we have any
+            final ArrayList<String> originalAttendeeList = new ArrayList<String>();
+            if (attendeeString != null) {
+                final StringTokenizer st =
+                    new StringTokenizer(attendeeString, ATTENDEE_TOKENIZER_DELIMITER);
+                while (st.hasMoreTokens()) {
+                    originalAttendeeList.add(st.nextToken());
+                }
+            }
+            final StringBuilder newTokenizedAttendees = new StringBuilder();
+            // See if any attendees have been dropped and while we're at it, build
+            // an updated String with tokenized attendee addresses
+            for (final Entity.NamedContentValues ncv: entity.getSubValues()) {
+                if (ncv.uri.equals(Attendees.CONTENT_URI)) {
+                    final String attendeeEmail = ncv.values.getAsString(Attendees.ATTENDEE_EMAIL);
+                    // Remove all found attendees
+                    originalAttendeeList.remove(attendeeEmail);
+                    newTokenizedAttendees.append(attendeeEmail);
+                    newTokenizedAttendees.append(ATTENDEE_TOKENIZER_DELIMITER);
+                }
+            }
+            // Update extended properties with the new attendee list, if we have one
+            // Otherwise, create one (this would be the case for Events created on
+            // device or "legacy" events (before this code was added)
+            final ContentValues cv = new ContentValues();
+            cv.put(ExtendedProperties.VALUE, newTokenizedAttendees.toString());
+            if (attendeeString != null) {
+                mContentResolver.update(asSyncAdapter(ContentUris.withAppendedId(
+                        ExtendedProperties.CONTENT_URI, attendeeStringId)), cv, null, null);
+            } else {
+                // If there wasn't an "attendees" property, insert one
+                cv.put(ExtendedProperties.NAME, EXTENDED_PROPERTY_ATTENDEES);
+                cv.put(ExtendedProperties.EVENT_ID, eventId);
+                mContentResolver.insert(asSyncAdapter(ExtendedProperties.CONTENT_URI), cv);
+            }
+            // Whoever is left has been removed from the attendee list; send them
+            // a cancellation
+            for (final String removedAttendee: originalAttendeeList) {
+                // Send a cancellation message to each of them
+                final Message cancelMsg = CalendarUtilities.createMessageForEventId(mContext,
+                        eventId, Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount,
+                        removedAttendee);
+                if (cancelMsg != null) {
+                    // Just send it to the removed attendee
+                    LogUtils.i(TAG, "Queueing cancellation to removed attendee %s", cancelMsg.mTo);
+                    mOutgoingMailList.add(cancelMsg);
+                }
+            }
+        } else if (!selfOrganizer) {
+            // If we're not the organizer, see if we've changed our attendee status
+            // Our last synced attendee status is in ExtendedProperties, and we've
+            // retrieved it above as userAttendeeStatus
+            final int currentStatus = entityValues.getAsInteger(Events.SELF_ATTENDEE_STATUS);
+            int syncStatus = Attendees.ATTENDEE_STATUS_NONE;
+            if (userAttendeeStatus != null) {
+                try {
+                    syncStatus = Integer.parseInt(userAttendeeStatus);
+                } catch (NumberFormatException e) {
+                    // Just in case somebody else mucked with this and it's not Integer
+                }
+            }
+            if ((currentStatus != syncStatus) &&
+                    (currentStatus != Attendees.ATTENDEE_STATUS_NONE)) {
+                // If so, send a meeting reply
+                final int messageFlag;
+                switch (currentStatus) {
+                    case Attendees.ATTENDEE_STATUS_ACCEPTED:
+                        messageFlag = Message.FLAG_OUTGOING_MEETING_ACCEPT;
+                        break;
+                    case Attendees.ATTENDEE_STATUS_DECLINED:
+                        messageFlag = Message.FLAG_OUTGOING_MEETING_DECLINE;
+                        break;
+                    case Attendees.ATTENDEE_STATUS_TENTATIVE:
+                        messageFlag = Message.FLAG_OUTGOING_MEETING_TENTATIVE;
+                        break;
+                    default:
+                        messageFlag = 0;
+                        break;
+                }
+                // Make sure we have a valid status (messageFlag should never be zero)
+                if (messageFlag != 0 && userAttendeeStatusId >= 0) {
+                    // Save away the new status
+                    final ContentValues cv = new ContentValues(1);
+                    cv.put(ExtendedProperties.VALUE, Integer.toString(currentStatus));
+                    mContentResolver.update(asSyncAdapter(ContentUris.withAppendedId(
+                            ExtendedProperties.CONTENT_URI, userAttendeeStatusId)),
+                            cv, null, null);
+                    // Send mail to the organizer advising of the new status
+                    final Message msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
+                            messageFlag, clientId, mAccount);
+                    if (msg != null) {
+                        LogUtils.i(TAG, "Queueing invitation reply to %s", msg.mTo);
+                        mOutgoingMailList.add(msg);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Process a single event, adding to the {@link Serializer} as necessary.
+     * @param s The {@link Serializer} for this Sync request.
+     * @param entity The {@link Entity} for this event.
+     * @param calendarIdString The calendar's id, as a {@link String}.
+     * @param first Whether this would be the first event added to s.
+     * @return Whether this function added anything to s.
+     * @throws IOException
+     */
+    private boolean handleEntity(final Serializer s, final Entity entity,
+            final String calendarIdString, final boolean first) throws IOException {
+        // For each of these entities, create the change commands
+        final ContentValues entityValues = entity.getEntityValues();
+        // We first need to check whether we can upsync this event; our test for this
+        // is currently the value of EXTENDED_PROPERTY_ATTENDEES_REDACTED
+        // If this is set to "1", we can't upsync the event
+        for (final Entity.NamedContentValues ncv: entity.getSubValues()) {
+            if (ncv.uri.equals(ExtendedProperties.CONTENT_URI)) {
+                final ContentValues ncvValues = ncv.values;
+                if (ncvValues.getAsString(ExtendedProperties.NAME).equals(
+                        EXTENDED_PROPERTY_UPSYNC_PROHIBITED)) {
+                    if ("1".equals(ncvValues.getAsString(ExtendedProperties.VALUE))) {
+                        // Make sure we mark this to clear the dirty flag
+                        mUploadedIdList.add(entityValues.getAsLong(Events._ID));
+                        return false;
+                    }
+                }
+            }
+        }
+
+        // EAS 2.5 needs: BusyStatus DtStamp EndTime Sensitivity StartTime TimeZone UID
+        // We can generate all but what we're testing for below
+        final String organizerEmail = entityValues.getAsString(Events.ORGANIZER);
+        if (organizerEmail == null || !entityValues.containsKey(Events.DTSTART) ||
+                (!entityValues.containsKey(Events.DURATION)
+                        && !entityValues.containsKey(Events.DTEND))) {
+            return false;
+        }
+
+        if (first) {
+            s.start(Tags.SYNC_COMMANDS);
+            LogUtils.i(TAG, "Sending Calendar changes to the server");
+        }
+
+        final boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mAccount.mEmailAddress);
+        // Find our uid in the entity; otherwise create one
+        String clientId = entityValues.getAsString(Events.SYNC_DATA2);
+        if (clientId == null) {
+            clientId = UUID.randomUUID().toString();
+        }
+        final String serverId = entityValues.getAsString(Events._SYNC_ID);
+        final long eventId = entityValues.getAsLong(Events._ID);
+        if (serverId == null) {
+            // This is a new event; create a clientId
+            LogUtils.i(TAG, "Creating new event with clientId: %s", clientId);
+            s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
+            // And save it in the Event as the local id
+            final ContentValues cv = new ContentValues(2);
+            cv.put(Events.SYNC_DATA2, clientId);
+            cv.put(EVENT_SYNC_VERSION, "0");
+            mContentResolver.update(
+                    asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, eventId)),
+                    cv, null, null);
+        } else if (entityValues.getAsInteger(Events.DELETED) == 1) {
+            LogUtils.i(TAG, "Deleting event with serverId: %s", serverId);
+            s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
+            mDeletedIdList.add(eventId);
+            if (selfOrganizer) {
+                final Message msg = CalendarUtilities.createMessageForEventId(mContext,
+                        eventId, Message.FLAG_OUTGOING_MEETING_CANCEL, null, mAccount);
+                if (msg != null) {
+                    LogUtils.i(TAG, "Queueing cancellation to %s", msg.mTo);
+                    mOutgoingMailList.add(msg);
+                }
+            } else {
+                sendDeclinedEmail(entity, clientId);
+            }
+            // For deletions, we don't need to add application data, so just bail here.
+            return true;
+        } else {
+            LogUtils.i(TAG, "Upsync change to event with serverId: %s", serverId);
+            s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
+            // Save to the ContentResolver.
+            final String version = getEntityVersion(entityValues);
+            final ContentValues cv = new ContentValues(1);
+            cv.put(EVENT_SYNC_VERSION, version);
+            mContentResolver.update(
+                    asSyncAdapter( ContentUris.withAppendedId(Events.CONTENT_URI, eventId)),
+                    cv, null, null);
+            // Also save in entityValues so that we send it this time around
+            entityValues.put(EVENT_SYNC_VERSION, version);
+        }
+        s.start(Tags.SYNC_APPLICATION_DATA);
+        sendEvent(entity, clientId, s);
+
+        // Now, the hard part; find exceptions for this event
+        if (serverId != null) {
+            handleExceptionsToRecurrenceRules(s, entity, entityValues, serverId, clientId,
+                    calendarIdString, selfOrganizer);
+        }
+
+        s.end().end();  // ApplicationData & Add/Change
+        mUploadedIdList.add(eventId);
+        updateAttendeesAndSendMail(entity, entityValues, selfOrganizer, eventId, clientId);
+        return true;
+    }
+
+    @Override
+    protected void setUpsyncCommands(final Serializer s) throws IOException {
+        final String calendarIdString = Long.toString(mCalendarId);
+        final String[] calendarIdArgument = { calendarIdString };
+
+        markParentsOfDirtyEvents(calendarIdString, calendarIdArgument);
+
+        // Now go through dirty/marked top-level events and send them back to the server
+        final EntityIterator eventIterator = EventsEntity.newEntityIterator(
+                mContentResolver.query(asSyncAdapter(Events.CONTENT_URI), null,
+                DIRTY_OR_MARKED_TOP_LEVEL_IN_CALENDAR, calendarIdArgument, null), mContentResolver);
+
+        try {
+            boolean first = true;
+            while (eventIterator.hasNext()) {
+                final boolean addedCommand =
+                        handleEntity(s, eventIterator.next(), calendarIdString, first);
+                if (addedCommand) {
+                    first = false;
+                }
+            }
+            if (!first) {
+                s.end();  // Commands
+            }
+        } finally {
+            eventIterator.close();
+        }
+    }
+
+    @Override
+    protected void cleanup(final int syncResult) {
+        if (syncResult != SYNC_RESULT_FAILED) {
+            // Clear dirty and mark flags for updates sent to server
+            if (!mUploadedIdList.isEmpty()) {
+                final ContentValues cv = new ContentValues(2);
+                cv.put(Events.DIRTY, 0);
+                cv.put(EVENT_SYNC_MARK, "0");
+                for (final long eventId : mUploadedIdList) {
+                    mContentResolver.update(asSyncAdapter(ContentUris.withAppendedId(
+                            Events.CONTENT_URI, eventId)), cv, null, null);
+                }
+            }
+            // Delete events marked for deletion
+            if (!mDeletedIdList.isEmpty()) {
+                for (final long eventId : mDeletedIdList) {
+                    mContentResolver.delete(asSyncAdapter(ContentUris.withAppendedId(
+                            Events.CONTENT_URI, eventId)), null, null);
+                }
+            }
+            // Send all messages that were created during this sync.
+            for (final Message msg : mOutgoingMailList) {
+                sendMessage(mAccount, msg);
+            }
+        }
+        // Clear our lists for the next Sync request, if necessary.
+        if (syncResult != SYNC_RESULT_MORE_AVAILABLE) {
+            mDeletedIdList.clear();
+            mUploadedIdList.clear();
+            mOutgoingMailList.clear();
+        }
+    }
+
+    /**
+     * Delete an account from the Calendar provider.
+     * @param context Our {@link Context}
+     * @param emailAddress The email address of the account we wish to delete
+     */
+    public static void wipeAccountFromContentProvider(final Context context,
+            final String emailAddress) {
+        context.getContentResolver().delete(asSyncAdapter(Calendars.CONTENT_URI, emailAddress),
+                Calendars.ACCOUNT_NAME + "=" + DatabaseUtils.sqlEscapeString(emailAddress)
+                        + " AND " + Calendars.ACCOUNT_TYPE + "="+ DatabaseUtils.sqlEscapeString(
+                        context.getString(R.string.account_manager_type_exchange)), null);
+    }
+}

diff --git a/src/com/android/exchange/service/EasContactsSyncHandler.java b/src/com/android/exchange/service/EasContactsSyncHandler.java
new file mode 100644
index 0000000..3bcdf14
--- /dev/null
+++ b/src/com/android/exchange/service/EasContactsSyncHandler.java

@@ -0,0 +1,903 @@
+package com.android.exchange.service;
+
+import android.content.ContentProviderClient;
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Entity;
+import android.content.EntityIterator;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.Nickname;
+import android.provider.ContactsContract.CommonDataKinds.Note;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.CommonDataKinds.Website;
+import android.provider.ContactsContract.Groups;
+import android.provider.SyncStateContract;
+import android.text.TextUtils;
+import android.util.Base64;
+
+import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.Eas;
+import com.android.exchange.adapter.AbstractSyncParser;
+import com.android.exchange.adapter.ContactsSyncAdapter;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+/**
+ * Performs an Exchange sync for contacts.
+ * Contact state is in the contacts provider, not in our DB (and therefore not in e.g. mMailbox).
+ * The Mailbox in the Email DB is only useful for serverId and syncInterval.
+ */
+public class EasContactsSyncHandler extends EasSyncHandler {
+    private static final String TAG = "EasContactsSyncHandler";
+
+    private static final String MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS =
+            ContactsContract.Data.MIMETYPE + "='" + GroupMembership.CONTENT_ITEM_TYPE + "' AND " +
+                    GroupMembership.GROUP_ROW_ID + "=?";
+
+    private static final String[] GROUP_TITLE_PROJECTION =
+            new String[] {Groups.TITLE};
+    private static final String[] GROUPS_ID_PROJECTION = new String[] {Groups._ID};
+
+    /** The maximum number of IMs we can send for one contact. */
+    private static final int MAX_IM_ROWS = 3;
+    /** The tags to use for IMs in an upsync. */
+    private static final int[] IM_TAGS = new int[] {Tags.CONTACTS2_IM_ADDRESS,
+            Tags.CONTACTS2_IM_ADDRESS_2, Tags.CONTACTS2_IM_ADDRESS_3};
+
+    /** The maximum number of email addresses we can send for one contact. */
+    private static final int MAX_EMAIL_ROWS = 3;
+    /** The tags to use for the emails in an upsync. */
+    private static final int[] EMAIL_TAGS = new int[] {Tags.CONTACTS_EMAIL1_ADDRESS,
+            Tags.CONTACTS_EMAIL2_ADDRESS, Tags.CONTACTS_EMAIL3_ADDRESS};
+
+    /** The maximum number of phone numbers of each type we can send for one contact. */
+    private static final int MAX_PHONE_ROWS = 2;
+    /** The tags to use for work phone numbers. */
+    private static final int[] WORK_PHONE_TAGS = new int[] {Tags.CONTACTS_BUSINESS_TELEPHONE_NUMBER,
+            Tags.CONTACTS_BUSINESS2_TELEPHONE_NUMBER};
+    /** The tags to use for home phone numbers. */
+    private static final int[] HOME_PHONE_TAGS = new int[] {Tags.CONTACTS_HOME_TELEPHONE_NUMBER,
+            Tags.CONTACTS_HOME2_TELEPHONE_NUMBER};
+
+    /** The tags to use for different parts of a home address. */
+    private static final int[] HOME_ADDRESS_TAGS = new int[] {Tags.CONTACTS_HOME_ADDRESS_CITY,
+            Tags.CONTACTS_HOME_ADDRESS_COUNTRY,
+            Tags.CONTACTS_HOME_ADDRESS_POSTAL_CODE,
+            Tags.CONTACTS_HOME_ADDRESS_STATE,
+            Tags.CONTACTS_HOME_ADDRESS_STREET};
+
+    /** The tags to use for different parts of a work address. */
+    private static final int[] WORK_ADDRESS_TAGS = new int[] {Tags.CONTACTS_BUSINESS_ADDRESS_CITY,
+            Tags.CONTACTS_BUSINESS_ADDRESS_COUNTRY,
+            Tags.CONTACTS_BUSINESS_ADDRESS_POSTAL_CODE,
+            Tags.CONTACTS_BUSINESS_ADDRESS_STATE,
+            Tags.CONTACTS_BUSINESS_ADDRESS_STREET};
+
+    /** The tags to use for different parts of an "other" address. */
+    private static final int[] OTHER_ADDRESS_TAGS = new int[] {Tags.CONTACTS_HOME_ADDRESS_CITY,
+            Tags.CONTACTS_OTHER_ADDRESS_COUNTRY,
+            Tags.CONTACTS_OTHER_ADDRESS_POSTAL_CODE,
+            Tags.CONTACTS_OTHER_ADDRESS_STATE,
+            Tags.CONTACTS_OTHER_ADDRESS_STREET};
+
+    private final android.accounts.Account mAccountManagerAccount;
+
+    private final ArrayList<Long> mDeletedContacts = new ArrayList<Long>();
+    private final ArrayList<Long> mUpdatedContacts = new ArrayList<Long>();
+
+    // We store the parser so that we can ask it later isGroupsUsed.
+    // TODO: Can we do this more cleanly?
+    private ContactsSyncAdapter.EasContactsSyncParser mParser = null;
+
+    private static final class EasChildren {
+        private EasChildren() {}
+
+        /** MIME type used when storing this in data table. */
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/eas_children";
+        public static final int MAX_CHILDREN = 8;
+        public static final String[] ROWS =
+            new String[] {"data2", "data3", "data4", "data5", "data6", "data7", "data8", "data9"};
+    }
+
+    // Classes for each type of contact.
+    // These are copied from ContactSyncAdapter, with unused fields and methods removed, but the
+    // parser hasn't been moved over yet. When that happens, the variables and functions may also
+    // need to be copied over.
+
+    /**
+     * Data and constants for a Personal contact.
+     */
+    private static final class EasPersonal {
+            /** MIME type used when storing this in data table. */
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/eas_personal";
+        public static final String ANNIVERSARY = "data2";
+        public static final String FILE_AS = "data4";
+    }
+
+    /**
+     * Data and constants for a Business contact.
+     */
+    private static final class EasBusiness {
+        /** MIME type used when storing this in data table. */
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/eas_business";
+        public static final String CUSTOMER_ID = "data6";
+        public static final String GOVERNMENT_ID = "data7";
+        public static final String ACCOUNT_NAME = "data8";
+    }
+
+    public EasContactsSyncHandler(final Context context, final ContentResolver contentResolver,
+            final android.accounts.Account accountManagerAccount, final Account account,
+            final Mailbox mailbox, final Bundle syncExtras, final SyncResult syncResult) {
+        super(context, contentResolver, account, mailbox, syncExtras, syncResult);
+        mAccountManagerAccount = accountManagerAccount;
+    }
+
+    @Override
+    protected int getTrafficFlag() {
+        return TrafficFlags.DATA_CONTACTS;
+    }
+
+    @Override
+    protected String getSyncKey() {
+        // mMailbox.mSyncKey is bogus since state is stored by the contacts provider, so we
+        // need to fetch the data from there.
+        // However, we need for that value to be reasonable, so we set it here once we fetch it.
+        final ContentProviderClient client = mContentResolver.acquireContentProviderClient(
+                ContactsContract.AUTHORITY_URI);
+        try {
+            final byte[] data = SyncStateContract.Helpers.get(client,
+                    ContactsContract.SyncState.CONTENT_URI, mAccountManagerAccount);
+            if (data == null || data.length == 0) {
+                // We don't have a sync key yet, initialize it.
+                // TODO: Should we leave it and just let the first successful sync set it?
+                /*
+                mMailbox.mSyncKey = "0";
+                SyncStateContract.Helpers.set(client, ContactsContract.SyncState.CONTENT_URI,
+                            mAccountManagerAccount, "0".getBytes());
+                // Make sure ungrouped contacts for Exchange are visible by default.
+                final ContentValues cv = new ContentValues(3);
+                cv.put(Groups.ACCOUNT_NAME, mAccount.mEmailAddress);
+                cv.put(Groups.ACCOUNT_TYPE, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+                cv.put(ContactsContract.Settings.UNGROUPED_VISIBLE, true);
+                client.insert(addCallerIsSyncAdapterParameter(Settings.CONTENT_URI), cv);
+                */
+                mMailbox.mSyncKey = "0";
+            } else {
+                mMailbox.mSyncKey = new String(data);
+            }
+            return mMailbox.mSyncKey;
+        } catch (final RemoteException e) {
+            return null;
+        }
+    }
+
+    @Override
+    protected String getFolderClassName() {
+        return "Contacts";
+    }
+
+    @Override
+    protected AbstractSyncParser getParser(final InputStream is) throws IOException {
+        // Store the parser because we'll want to ask it about whether groups are used later.
+        // TODO: It'd be nice to find a cleaner way to get this result back from the parser.
+        mParser = new ContactsSyncAdapter.EasContactsSyncParser(mContext, mContentResolver, is,
+                mMailbox, mAccount, mAccountManagerAccount);
+        return mParser;
+    }
+
+    @Override
+    protected void setInitialSyncOptions(final Serializer s) throws IOException {
+        // These are the tags we support for upload; whenever we add/remove support
+        // (in addData), we need to update this list
+        s.start(Tags.SYNC_SUPPORTED);
+        s.tag(Tags.CONTACTS_FIRST_NAME);
+        s.tag(Tags.CONTACTS_LAST_NAME);
+        s.tag(Tags.CONTACTS_MIDDLE_NAME);
+        s.tag(Tags.CONTACTS_SUFFIX);
+        s.tag(Tags.CONTACTS_COMPANY_NAME);
+        s.tag(Tags.CONTACTS_JOB_TITLE);
+        s.tag(Tags.CONTACTS_EMAIL1_ADDRESS);
+        s.tag(Tags.CONTACTS_EMAIL2_ADDRESS);
+        s.tag(Tags.CONTACTS_EMAIL3_ADDRESS);
+        s.tag(Tags.CONTACTS_BUSINESS2_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_BUSINESS_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS2_MMS);
+        s.tag(Tags.CONTACTS_BUSINESS_FAX_NUMBER);
+        s.tag(Tags.CONTACTS2_COMPANY_MAIN_PHONE);
+        s.tag(Tags.CONTACTS_HOME_FAX_NUMBER);
+        s.tag(Tags.CONTACTS_HOME_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_HOME2_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_MOBILE_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_CAR_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_RADIO_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS_PAGER_NUMBER);
+        s.tag(Tags.CONTACTS_ASSISTANT_TELEPHONE_NUMBER);
+        s.tag(Tags.CONTACTS2_IM_ADDRESS);
+        s.tag(Tags.CONTACTS2_IM_ADDRESS_2);
+        s.tag(Tags.CONTACTS2_IM_ADDRESS_3);
+        s.tag(Tags.CONTACTS_BUSINESS_ADDRESS_CITY);
+        s.tag(Tags.CONTACTS_BUSINESS_ADDRESS_COUNTRY);
+        s.tag(Tags.CONTACTS_BUSINESS_ADDRESS_POSTAL_CODE);
+        s.tag(Tags.CONTACTS_BUSINESS_ADDRESS_STATE);
+        s.tag(Tags.CONTACTS_BUSINESS_ADDRESS_STREET);
+        s.tag(Tags.CONTACTS_HOME_ADDRESS_CITY);
+        s.tag(Tags.CONTACTS_HOME_ADDRESS_COUNTRY);
+        s.tag(Tags.CONTACTS_HOME_ADDRESS_POSTAL_CODE);
+        s.tag(Tags.CONTACTS_HOME_ADDRESS_STATE);
+        s.tag(Tags.CONTACTS_HOME_ADDRESS_STREET);
+        s.tag(Tags.CONTACTS_OTHER_ADDRESS_CITY);
+        s.tag(Tags.CONTACTS_OTHER_ADDRESS_COUNTRY);
+        s.tag(Tags.CONTACTS_OTHER_ADDRESS_POSTAL_CODE);
+        s.tag(Tags.CONTACTS_OTHER_ADDRESS_STATE);
+        s.tag(Tags.CONTACTS_OTHER_ADDRESS_STREET);
+        s.tag(Tags.CONTACTS_YOMI_COMPANY_NAME);
+        s.tag(Tags.CONTACTS_YOMI_FIRST_NAME);
+        s.tag(Tags.CONTACTS_YOMI_LAST_NAME);
+        s.tag(Tags.CONTACTS2_NICKNAME);
+        s.tag(Tags.CONTACTS_ASSISTANT_NAME);
+        s.tag(Tags.CONTACTS2_MANAGER_NAME);
+        s.tag(Tags.CONTACTS_SPOUSE);
+        s.tag(Tags.CONTACTS_DEPARTMENT);
+        s.tag(Tags.CONTACTS_TITLE);
+        s.tag(Tags.CONTACTS_OFFICE_LOCATION);
+        s.tag(Tags.CONTACTS2_CUSTOMER_ID);
+        s.tag(Tags.CONTACTS2_GOVERNMENT_ID);
+        s.tag(Tags.CONTACTS2_ACCOUNT_NAME);
+        s.tag(Tags.CONTACTS_ANNIVERSARY);
+        s.tag(Tags.CONTACTS_BIRTHDAY);
+        s.tag(Tags.CONTACTS_WEBPAGE);
+        s.tag(Tags.CONTACTS_PICTURE);
+        s.end(); // SYNC_SUPPORTED
+    }
+
+    @Override
+    protected void setNonInitialSyncOptions(final Serializer s) throws IOException {
+        setPimSyncOptions(s, null);
+    }
+
+    /**
+     * Add account info and the "caller is syncadapter" param to a URI.
+     * @param uri The {@link Uri} to add to.
+     * @param emailAddress The email address to add to uri.
+     * @return
+     */
+    private static Uri uriWithAccountAndIsSyncAdapter(final Uri uri, final String emailAddress) {
+        return uri.buildUpon()
+            .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, emailAddress)
+            .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE,
+                    Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE)
+            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+            .build();
+    }
+
+    /**
+     * Add the "caller is syncadapter" param to a URI.
+     * @param uri The {@link Uri} to add to.
+     * @return
+     */
+    private static Uri addCallerIsSyncAdapterParameter(final Uri uri) {
+        return uri.buildUpon()
+                .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+                .build();
+    }
+
+    /**
+     * Mark contacts in dirty groups as dirty.
+     */
+    private void dirtyContactsWithinDirtyGroups() {
+        final String emailAddress = mAccount.mEmailAddress;
+        final Cursor c = mContentResolver.query(
+                uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
+                GROUPS_ID_PROJECTION, Groups.DIRTY + "=1", null, null);
+        if (c == null) {
+            return;
+        }
+        try {
+            if (c.getCount() > 0) {
+                final String[] updateArgs = new String[1];
+                final ContentValues updateValues = new ContentValues();
+                while (c.moveToNext()) {
+                    // For each, "touch" all data rows with this group id; this will mark contacts
+                    // in this group as dirty (per ContactsContract).  We will then know to upload
+                    // them to the server with the modified group information
+                    final long id = c.getLong(0);
+                    updateValues.put(GroupMembership.GROUP_ROW_ID, id);
+                    updateArgs[0] = Long.toString(id);
+                    mContentResolver.update(ContactsContract.Data.CONTENT_URI, updateValues,
+                            MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS, updateArgs);
+                }
+                // Really delete groups that are marked deleted
+                mContentResolver.delete(uriWithAccountAndIsSyncAdapter(
+                        Groups.CONTENT_URI, emailAddress),
+                        Groups.DELETED + "=1", null);
+                // Clear the dirty flag for all of our groups
+                updateValues.clear();
+                updateValues.put(Groups.DIRTY, 0);
+                mContentResolver.update(uriWithAccountAndIsSyncAdapter(
+                        Groups.CONTENT_URI, emailAddress), updateValues, null,
+                        null);
+            }
+        } finally {
+            c.close();
+        }
+    }
+
+    /**
+     * Helper to add a string to the upsync.
+     * @param s The {@link Serializer} for this sync request
+     * @param cv The {@link ContentValues} with the data for this string.
+     * @param column The column name in cv to find the string.
+     * @param tag The tag to use when adding to s.
+     * @throws IOException
+     */
+    private static void sendStringData(final Serializer s, final ContentValues cv,
+            final String column, final int tag) throws IOException {
+        if (cv.containsKey(column)) {
+            final String value = cv.getAsString(column);
+            if (!TextUtils.isEmpty(value)) {
+                s.data(tag, value);
+            }
+        }
+    }
+
+    /**
+     * Add a nickname to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this nickname.
+     * @throws IOException
+     */
+    private static void sendNickname(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, Nickname.NAME, Tags.CONTACTS2_NICKNAME);
+    }
+
+    /**
+     * Add children data to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for a set of children.
+     * @throws IOException
+     */
+    private static void sendChildren(final Serializer s, final ContentValues cv)
+            throws IOException {
+        boolean first = true;
+        for (int i = 0; i < EasChildren.MAX_CHILDREN; i++) {
+            final String row = EasChildren.ROWS[i];
+            if (cv.containsKey(row)) {
+                if (first) {
+                    s.start(Tags.CONTACTS_CHILDREN);
+                    first = false;
+                }
+                s.data(Tags.CONTACTS_CHILD, cv.getAsString(row));
+            }
+        }
+        if (!first) {
+            s.end();
+        }
+    }
+
+    /**
+     * Add business contact info to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this business contact.
+     * @throws IOException
+     */
+    private static void sendBusiness(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, EasBusiness.ACCOUNT_NAME, Tags.CONTACTS2_ACCOUNT_NAME);
+        sendStringData(s, cv, EasBusiness.CUSTOMER_ID, Tags.CONTACTS2_CUSTOMER_ID);
+        sendStringData(s, cv, EasBusiness.GOVERNMENT_ID, Tags.CONTACTS2_GOVERNMENT_ID);
+    }
+
+    /**
+     * Add a webpage info to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this webpage.
+     * @throws IOException
+     */
+    private static void sendWebpage(final Serializer s, final ContentValues cv) throws IOException {
+        sendStringData(s, cv, Website.URL, Tags.CONTACTS_WEBPAGE);
+    }
+
+    /**
+     * Add personal contact info to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this personal contact.
+     * @throws IOException
+     */
+    private static void sendPersonal(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, EasPersonal.ANNIVERSARY, Tags.CONTACTS_ANNIVERSARY);
+        sendStringData(s, cv, EasPersonal.FILE_AS, Tags.CONTACTS_FILE_AS);
+    }
+
+    /**
+     * Add a phone number to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this phone number.
+     * @param workCount The number of work phone numbers already added.
+     * @param homeCount The number of home phone numbers already added.
+     * @throws IOException
+     */
+    private static void sendPhone(final Serializer s, final ContentValues cv, final int workCount,
+            final int homeCount) throws IOException {
+        final String value = cv.getAsString(Phone.NUMBER);
+        if (value == null) return;
+        switch (cv.getAsInteger(Phone.TYPE)) {
+            case Phone.TYPE_WORK:
+                if (workCount < MAX_PHONE_ROWS) {
+                    s.data(WORK_PHONE_TAGS[workCount], value);
+                }
+                break;
+            case Phone.TYPE_MMS:
+                s.data(Tags.CONTACTS2_MMS, value);
+                break;
+            case Phone.TYPE_ASSISTANT:
+                s.data(Tags.CONTACTS_ASSISTANT_TELEPHONE_NUMBER, value);
+                break;
+            case Phone.TYPE_FAX_WORK:
+                s.data(Tags.CONTACTS_BUSINESS_FAX_NUMBER, value);
+                break;
+            case Phone.TYPE_COMPANY_MAIN:
+                s.data(Tags.CONTACTS2_COMPANY_MAIN_PHONE, value);
+                break;
+            case Phone.TYPE_HOME:
+                if (homeCount < MAX_PHONE_ROWS) {
+                    s.data(HOME_PHONE_TAGS[homeCount], value);
+                }
+                break;
+            case Phone.TYPE_MOBILE:
+                s.data(Tags.CONTACTS_MOBILE_TELEPHONE_NUMBER, value);
+                break;
+            case Phone.TYPE_CAR:
+                s.data(Tags.CONTACTS_CAR_TELEPHONE_NUMBER, value);
+                break;
+            case Phone.TYPE_PAGER:
+                s.data(Tags.CONTACTS_PAGER_NUMBER, value);
+                break;
+            case Phone.TYPE_RADIO:
+                s.data(Tags.CONTACTS_RADIO_TELEPHONE_NUMBER, value);
+                break;
+            case Phone.TYPE_FAX_HOME:
+                s.data(Tags.CONTACTS_HOME_FAX_NUMBER, value);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add a relation to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this relation.
+     * @throws IOException
+     */
+    private static void sendRelation(final Serializer s, final ContentValues cv)
+            throws IOException {
+        final String value = cv.getAsString(Relation.DATA);
+        if (value == null) return;
+        switch (cv.getAsInteger(Relation.TYPE)) {
+            case Relation.TYPE_ASSISTANT:
+                s.data(Tags.CONTACTS_ASSISTANT_NAME, value);
+                break;
+            case Relation.TYPE_MANAGER:
+                s.data(Tags.CONTACTS2_MANAGER_NAME, value);
+                break;
+            case Relation.TYPE_SPOUSE:
+                s.data(Tags.CONTACTS_SPOUSE, value);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add a name to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this name.
+     * @throws IOException
+     */
+    // TODO: This used to return a displayName, but it was always null. Figure out what it really
+    // wanted to return.
+    private static void sendStructuredName(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, StructuredName.FAMILY_NAME, Tags.CONTACTS_LAST_NAME);
+        sendStringData(s, cv, StructuredName.GIVEN_NAME, Tags.CONTACTS_FIRST_NAME);
+        sendStringData(s, cv, StructuredName.MIDDLE_NAME, Tags.CONTACTS_MIDDLE_NAME);
+        sendStringData(s, cv, StructuredName.SUFFIX, Tags.CONTACTS_SUFFIX);
+        sendStringData(s, cv, StructuredName.PHONETIC_GIVEN_NAME, Tags.CONTACTS_YOMI_FIRST_NAME);
+        sendStringData(s, cv, StructuredName.PHONETIC_FAMILY_NAME, Tags.CONTACTS_YOMI_LAST_NAME);
+        sendStringData(s, cv, StructuredName.PREFIX, Tags.CONTACTS_TITLE);
+    }
+
+    /**
+     * Add an address of a particular type to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this address.
+     * @param fieldNames The field names for this address type.
+     * @throws IOException
+     */
+    private static void sendOnePostal(final Serializer s, final ContentValues cv,
+            final int[] fieldNames) throws IOException{
+        sendStringData(s, cv, StructuredPostal.CITY, fieldNames[0]);
+        sendStringData(s, cv, StructuredPostal.COUNTRY, fieldNames[1]);
+        sendStringData(s, cv, StructuredPostal.POSTCODE, fieldNames[2]);
+        sendStringData(s, cv, StructuredPostal.REGION, fieldNames[3]);
+        sendStringData(s, cv, StructuredPostal.STREET, fieldNames[4]);
+    }
+
+    /**
+     * Add an address to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this address.
+     * @throws IOException
+     */
+    private static void sendStructuredPostal(final Serializer s, final ContentValues cv)
+            throws IOException {
+        switch (cv.getAsInteger(StructuredPostal.TYPE)) {
+            case StructuredPostal.TYPE_HOME:
+                sendOnePostal(s, cv, HOME_ADDRESS_TAGS);
+                break;
+            case StructuredPostal.TYPE_WORK:
+                sendOnePostal(s, cv, WORK_ADDRESS_TAGS);
+                break;
+            case StructuredPostal.TYPE_OTHER:
+                sendOnePostal(s, cv, OTHER_ADDRESS_TAGS);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add an organization to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this organization.
+     * @throws IOException
+     */
+    private static void sendOrganization(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, Organization.TITLE, Tags.CONTACTS_JOB_TITLE);
+        sendStringData(s, cv, Organization.COMPANY, Tags.CONTACTS_COMPANY_NAME);
+        sendStringData(s, cv, Organization.DEPARTMENT, Tags.CONTACTS_DEPARTMENT);
+        sendStringData(s, cv, Organization.OFFICE_LOCATION, Tags.CONTACTS_OFFICE_LOCATION);
+    }
+
+    /**
+     * Add an IM to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this IM.
+     * @throws IOException
+     */
+     private static void sendIm(final Serializer s, final ContentValues cv, final int count)
+             throws IOException {
+        final String value = cv.getAsString(Im.DATA);
+        if (value == null) return;
+        if (count < MAX_IM_ROWS) {
+            s.data(IM_TAGS[count], value);
+        }
+    }
+
+    /**
+     * Add a birthday to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this birthday.
+     * @throws IOException
+     */
+    private static void sendBirthday(final Serializer s, final ContentValues cv)
+            throws IOException {
+        sendStringData(s, cv, Event.START_DATE, Tags.CONTACTS_BIRTHDAY);
+    }
+
+    /**
+     * Add a note to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this note.
+     * @throws IOException
+     */
+    private void sendNote(final Serializer s, final ContentValues cv) throws IOException {
+        // Even when there is no local note, we must explicitly upsync an empty note,
+        // which is the only way to force the server to delete any pre-existing note.
+        String note = "";
+        if (cv.containsKey(Note.NOTE)) {
+            // EAS won't accept note data with raw newline characters
+            note = cv.getAsString(Note.NOTE).replaceAll("\n", "\r\n");
+        }
+        // Format of upsync data depends on protocol version
+        if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+            s.start(Tags.BASE_BODY);
+            s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_TEXT).data(Tags.BASE_DATA, note);
+            s.end();
+        } else {
+            s.data(Tags.CONTACTS_BODY, note);
+        }
+    }
+
+    /**
+     * Add a photo to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this photo.
+     * @throws IOException
+     */
+    private static void sendPhoto(final Serializer s, final ContentValues cv) throws IOException {
+        if (cv.containsKey(Photo.PHOTO)) {
+            final byte[] bytes = cv.getAsByteArray(Photo.PHOTO);
+            final String pic = Base64.encodeToString(bytes, Base64.NO_WRAP);
+            s.data(Tags.CONTACTS_PICTURE, pic);
+        } else {
+            // Send an empty tag, which signals the server to delete any pre-existing photo
+            s.tag(Tags.CONTACTS_PICTURE);
+        }
+    }
+
+    /**
+     * Add an email address to the upsync.
+     * @param s The {@link Serializer} for this sync request.
+     * @param cv The {@link ContentValues} with the data for this email address.
+     * @param count The number of email addresses that have already been added.
+     * @param displayName The display name for this contact.
+     * @throws IOException
+     */
+    private void sendEmail(final Serializer s, final ContentValues cv, final int count,
+            final String displayName) throws IOException {
+        // Get both parts of the email address (a newly created one in the UI won't have a name)
+        final String addr = cv.getAsString(Email.DATA);
+        String name = cv.getAsString(Email.DISPLAY_NAME);
+        if (name == null) {
+            if (displayName != null) {
+                name = displayName;
+            } else {
+                name = addr;
+            }
+        }
+        // Compose address from name and addr
+        if (addr != null) {
+            final String value;
+            // Only send the raw email address for EAS 2.5 (Hotmail, in particular, chokes on
+            // an RFC822 address)
+            if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                value = addr;
+            } else {
+                value = '\"' + name + "\" <" + addr + '>';
+            }
+            if (count < MAX_EMAIL_ROWS) {
+                s.data(EMAIL_TAGS[count], value);
+            }
+        }
+    }
+
+    @Override
+    protected void setUpsyncCommands(final Serializer s) throws IOException {
+        // Find any groups of ours that are dirty and dirty those groups' members
+        dirtyContactsWithinDirtyGroups();
+
+        // First, let's find Contacts that have changed.
+        final Uri uri = uriWithAccountAndIsSyncAdapter(
+                ContactsContract.RawContactsEntity.CONTENT_URI, mAccount.mEmailAddress);
+
+        // Get them all atomically
+        final EntityIterator ei = ContactsContract.RawContacts.newEntityIterator(
+                mContentResolver.query(uri, null, ContactsContract.RawContacts.DIRTY + "=1", null,
+                        null));
+        final ContentValues cidValues = new ContentValues();
+        try {
+            boolean first = true;
+            final Uri rawContactUri = addCallerIsSyncAdapterParameter(
+                    ContactsContract.RawContacts.CONTENT_URI);
+            while (ei.hasNext()) {
+                final Entity entity = ei.next();
+                // For each of these entities, create the change commands
+                final ContentValues entityValues = entity.getEntityValues();
+                final String serverId =
+                        entityValues.getAsString(ContactsContract.RawContacts.SOURCE_ID);
+                final ArrayList<Integer> groupIds = new ArrayList<Integer>();
+                if (first) {
+                    s.start(Tags.SYNC_COMMANDS);
+                    LogUtils.i(TAG, "Sending Contacts changes to the server");
+                    first = false;
+                }
+                if (serverId == null) {
+                    // This is a new contact; create a clientId
+                    final String clientId =
+                            "new_" + mMailbox.mId + '_' + System.currentTimeMillis();
+                    LogUtils.i(TAG, "Creating new contact with clientId: %s", clientId);
+                    s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
+                    // And save it in the raw contact
+                    cidValues.put(ContactsContract.RawContacts.SYNC1, clientId);
+                    mContentResolver.update(ContentUris.withAppendedId(rawContactUri,
+                            entityValues.getAsLong(ContactsContract.RawContacts._ID)),
+                            cidValues, null, null);
+                } else {
+                    if (entityValues.getAsInteger(ContactsContract.RawContacts.DELETED) == 1) {
+                        LogUtils.i(TAG, "Deleting contact with serverId: %s", serverId);
+                        s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
+                        mDeletedContacts.add(
+                                entityValues.getAsLong(ContactsContract.RawContacts._ID));
+                        continue;
+                    }
+                    LogUtils.i(TAG, "Upsync change to contact with serverId: %s", serverId);
+                    s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
+                }
+                s.start(Tags.SYNC_APPLICATION_DATA);
+                // Write out the data here
+                int imCount = 0;
+                int emailCount = 0;
+                int homePhoneCount = 0;
+                int workPhoneCount = 0;
+                // TODO: How is this name supposed to be formed?
+                String displayName = null;
+                final ArrayList<ContentValues> emailValues = new ArrayList<ContentValues>();
+                for (final Entity.NamedContentValues ncv: entity.getSubValues()) {
+                    final ContentValues cv = ncv.values;
+                    final String mimeType = cv.getAsString(ContactsContract.Data.MIMETYPE);
+                    if (mimeType.equals(Email.CONTENT_ITEM_TYPE)) {
+                        emailValues.add(cv);
+                    } else if (mimeType.equals(Nickname.CONTENT_ITEM_TYPE)) {
+                        sendNickname(s, cv);
+                    } else if (mimeType.equals(EasChildren.CONTENT_ITEM_TYPE)) {
+                        sendChildren(s, cv);
+                    } else if (mimeType.equals(EasBusiness.CONTENT_ITEM_TYPE)) {
+                        sendBusiness(s, cv);
+                    } else if (mimeType.equals(Website.CONTENT_ITEM_TYPE)) {
+                        sendWebpage(s, cv);
+                    } else if (mimeType.equals(EasPersonal.CONTENT_ITEM_TYPE)) {
+                        sendPersonal(s, cv);
+                    } else if (mimeType.equals(Phone.CONTENT_ITEM_TYPE)) {
+                        sendPhone(s, cv, workPhoneCount, homePhoneCount);
+                        int type = cv.getAsInteger(Phone.TYPE);
+                        if (type == Phone.TYPE_HOME) homePhoneCount++;
+                        if (type == Phone.TYPE_WORK) workPhoneCount++;
+                    } else if (mimeType.equals(Relation.CONTENT_ITEM_TYPE)) {
+                        sendRelation(s, cv);
+                    } else if (mimeType.equals(StructuredName.CONTENT_ITEM_TYPE)) {
+                        sendStructuredName(s, cv);
+                    } else if (mimeType.equals(StructuredPostal.CONTENT_ITEM_TYPE)) {
+                        sendStructuredPostal(s, cv);
+                    } else if (mimeType.equals(Organization.CONTENT_ITEM_TYPE)) {
+                        sendOrganization(s, cv);
+                    } else if (mimeType.equals(Im.CONTENT_ITEM_TYPE)) {
+                        sendIm(s, cv, imCount++);
+                    } else if (mimeType.equals(Event.CONTENT_ITEM_TYPE)) {
+                        Integer eventType = cv.getAsInteger(Event.TYPE);
+                        if (eventType != null && eventType.equals(Event.TYPE_BIRTHDAY)) {
+                            sendBirthday(s, cv);
+                        }
+                    } else if (mimeType.equals(GroupMembership.CONTENT_ITEM_TYPE)) {
+                        // We must gather these, and send them together (below)
+                        groupIds.add(cv.getAsInteger(GroupMembership.GROUP_ROW_ID));
+                    } else if (mimeType.equals(Note.CONTENT_ITEM_TYPE)) {
+                        sendNote(s, cv);
+                    } else if (mimeType.equals(Photo.CONTENT_ITEM_TYPE)) {
+                        sendPhoto(s, cv);
+                    } else {
+                        LogUtils.i(TAG, "Contacts upsync, unknown data: %s", mimeType);
+                    }
+                }
+
+                // We do the email rows last, because we need to make sure we've found the
+                // displayName (if one exists); this would be in a StructuredName rnow
+                for (final ContentValues cv: emailValues) {
+                    sendEmail(s, cv, emailCount++, displayName);
+                }
+
+                // Now, we'll send up groups, if any
+                if (!groupIds.isEmpty()) {
+                    boolean groupFirst = true;
+                    for (final int id: groupIds) {
+                        // Since we get id's from the provider, we need to find their names
+                        final Cursor c = mContentResolver.query(ContentUris.withAppendedId(
+                                Groups.CONTENT_URI, id),
+                                GROUP_TITLE_PROJECTION, null, null, null);
+                        try {
+                            // Presumably, this should always succeed, but ...
+                            if (c.moveToFirst()) {
+                                if (groupFirst) {
+                                    s.start(Tags.CONTACTS_CATEGORIES);
+                                    groupFirst = false;
+                                }
+                                s.data(Tags.CONTACTS_CATEGORY, c.getString(0));
+                            }
+                        } finally {
+                            c.close();
+                        }
+                    }
+                    if (!groupFirst) {
+                        s.end();
+                    }
+                }
+                s.end().end(); // ApplicationData & Change
+                mUpdatedContacts.add(entityValues.getAsLong(ContactsContract.RawContacts._ID));
+            }
+            if (!first) {
+                s.end(); // Commands
+            }
+        } finally {
+            ei.close();
+        }
+
+    }
+
+    @Override
+    protected void cleanup(final int syncResult) {
+        if (syncResult == SYNC_RESULT_FAILED) {
+            return;
+        }
+
+        // Mark the changed contacts dirty = 0
+        // Permanently delete the user deletions
+        ContactsSyncAdapter.ContactOperations ops = new ContactsSyncAdapter.ContactOperations();
+        for (final Long id: mUpdatedContacts) {
+            ops.add(ContentProviderOperation
+                    .newUpdate(ContentUris.withAppendedId(ContactsContract.RawContacts.CONTENT_URI,
+                            id).buildUpon()
+                            .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+                            .build())
+                    .withValue(ContactsContract.RawContacts.DIRTY, 0).build());
+        }
+        for (final Long id: mDeletedContacts) {
+            ops.add(ContentProviderOperation.newDelete(ContentUris.withAppendedId(
+                    ContactsContract.RawContacts.CONTENT_URI, id).buildUpon()
+                    .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").build())
+                    .build());
+        }
+        ops.execute(mContext);
+        if (mParser != null && mParser.isGroupsUsed()) {
+            // Make sure the title column is set for all of our groups
+            // And that all of our groups are visible
+            // TODO Perhaps the visible part should only happen when the group is created, but
+            // this is fine for now.
+            final Uri groupsUri = uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI,
+                    mAccount.mEmailAddress);
+            final Cursor c = mContentResolver.query(groupsUri,
+                    new String[] {Groups.SOURCE_ID, Groups.TITLE},
+                    Groups.TITLE + " IS NULL", null, null);
+            final ContentValues values = new ContentValues();
+            values.put(Groups.GROUP_VISIBLE, 1);
+            try {
+                while (c.moveToNext()) {
+                    final String sourceId = c.getString(0);
+                    values.put(Groups.TITLE, sourceId);
+                    mContentResolver.update(uriWithAccountAndIsSyncAdapter(groupsUri,
+                            mAccount.mEmailAddress), values, Groups.SOURCE_ID + "=?",
+                            new String[] {sourceId});
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    /**
+     * Delete an account from the Contacts provider.
+     * @param context Our {@link Context}
+     * @param emailAddress The email address of the account we wish to delete
+     */
+    public static void wipeAccountFromContentProvider(final Context context,
+            final String emailAddress) {
+        context.getContentResolver().delete(uriWithAccountAndIsSyncAdapter(
+                ContactsContract.RawContacts.CONTENT_URI, emailAddress), null, null);
+    }
+}

diff --git a/src/com/android/exchange/service/EasMailboxSyncHandler.java b/src/com/android/exchange/service/EasMailboxSyncHandler.java
new file mode 100644
index 0000000..efcb4c0
--- /dev/null
+++ b/src/com/android/exchange/service/EasMailboxSyncHandler.java

@@ -0,0 +1,690 @@
+package com.android.exchange.service;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.text.format.DateUtils;
+
+import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.EmailContent.MessageColumns;
+import com.android.emailcommon.provider.EmailContent.SyncColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.SyncWindow;
+import com.android.exchange.Eas;
+import com.android.exchange.EasAuthenticationException;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.AbstractSyncParser;
+import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
+import com.android.exchange.adapter.MoveItemsParser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpStatus;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * Performs an Exchange mailbox sync for "normal" mailboxes.
+ */
+public class EasMailboxSyncHandler extends EasSyncHandler {
+    private static final String TAG = "EasMailboxSyncHandler";
+
+    /**
+     * The projection used for building the fetch request list.
+     */
+    private static final String[] FETCH_REQUEST_PROJECTION = { SyncColumns.SERVER_ID };
+    private static final int FETCH_REQUEST_SERVER_ID = 0;
+
+    /**
+     * The projection used for querying message tables for the purpose of determining what needs
+     * to be set as a sync update.
+     */
+    private static final String[] UPDATES_PROJECTION = { MessageColumns.ID,
+            MessageColumns.MAILBOX_KEY, SyncColumns.SERVER_ID,
+            MessageColumns.FLAGS, MessageColumns.FLAG_READ, MessageColumns.FLAG_FAVORITE };
+    private static final int UPDATES_ID_COLUMN = 0;
+    private static final int UPDATES_MAILBOX_KEY_COLUMN = 1;
+    private static final int UPDATES_SERVER_ID_COLUMN = 2;
+    private static final int UPDATES_FLAG_COLUMN = 3;
+    private static final int UPDATES_READ_COLUMN = 4;
+    private static final int UPDATES_FAVORITE_COLUMN = 5;
+
+    /**
+     * Message flags value to signify that the message has been moved, and eventually needs to be
+     * deleted.
+     */
+    public static final int MESSAGE_FLAG_MOVED_MESSAGE = 1 << Message.FLAG_SYNC_ADAPTER_SHIFT;
+
+    /**
+     * The selection for moved messages that get deleted after a successful sync.
+     */
+    private static final String WHERE_MAILBOX_KEY_AND_MOVED =
+            MessageColumns.MAILBOX_KEY + "=? AND (" + MessageColumns.FLAGS + "&" +
+            MESSAGE_FLAG_MOVED_MESSAGE + ")!=0";
+
+    private static final String EMAIL_WINDOW_SIZE = "5";
+
+    private static final String WHERE_BODY_SOURCE_MESSAGE_KEY =
+            EmailContent.Body.SOURCE_MESSAGE_KEY + "=?";
+
+    // State needed across multiple functions during a Sync.
+    // TODO: We should perhaps invert the meaning of mDeletedMessages & mUpdatedMessages and
+    // store the values we want to *retain* after a successful upsync.
+
+    /**
+     * List of message ids that were read from Message_Deletes and were sent in the Commands section
+     * of the current sync.
+     */
+    private final ArrayList<Long> mDeletedMessages = new ArrayList<Long>();
+
+    /**
+     * List of message ids that were read from Message_Updates and were sent in the Commands section
+     * of the current sync.
+     */
+    private final ArrayList<Long> mUpdatedMessages = new ArrayList<Long>();
+
+    /**
+     * List of server ids for messages to fetch from the server.
+     */
+    private final ArrayList<String> mMessagesToFetch = new ArrayList<String>();
+
+    /**
+     * Holds all the data needed to process a MoveItems request.
+     */
+    private static class MoveRequest {
+        public final long messageId;
+        public final String messageServerId;
+        public final int messageFlags;
+        public final long sourceFolderId;
+        public final String sourceFolderServerId;
+        public final String destFolderServerId;
+
+        public MoveRequest(final long _messageId, final String _messageServerId,
+                final int _messageFlags,
+                final long _sourceFolderId, final String _sourceFolderServerId,
+                final String _destFolderServerId) {
+            messageId = _messageId;
+            messageServerId = _messageServerId;
+            messageFlags = _messageFlags;
+            sourceFolderId = _sourceFolderId;
+            sourceFolderServerId = _sourceFolderServerId;
+            destFolderServerId = _destFolderServerId;
+        }
+    }
+
+    /**
+     * List of all MoveRequests, i.e. all messages which have different mailboxes than they used to.
+     */
+    private final ArrayList<MoveRequest> mMessagesToMove = new ArrayList<MoveRequest>();
+
+    public EasMailboxSyncHandler(final Context context, final ContentResolver contentResolver,
+            final Account account, final Mailbox mailbox, final Bundle syncExtras,
+            final SyncResult syncResult) {
+        super(context, contentResolver, account, mailbox, syncExtras, syncResult);
+    }
+
+    private String getEmailFilter() {
+        int syncLookback = mMailbox.mSyncLookback;
+        if (syncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
+                || mMailbox.mType == Mailbox.TYPE_INBOX) {
+            syncLookback = mAccount.mSyncLookback;
+        }
+        switch (syncLookback) {
+            case SyncWindow.SYNC_WINDOW_1_DAY:
+                return Eas.FILTER_1_DAY;
+            case SyncWindow.SYNC_WINDOW_3_DAYS:
+                return Eas.FILTER_3_DAYS;
+            case SyncWindow.SYNC_WINDOW_1_WEEK:
+                return Eas.FILTER_1_WEEK;
+            case SyncWindow.SYNC_WINDOW_2_WEEKS:
+                return Eas.FILTER_2_WEEKS;
+            case SyncWindow.SYNC_WINDOW_1_MONTH:
+                return Eas.FILTER_1_MONTH;
+            case SyncWindow.SYNC_WINDOW_ALL:
+                return Eas.FILTER_ALL;
+            default:
+                // Auto window is deprecated and will also use the default.
+                return Eas.FILTER_1_WEEK;
+        }
+    }
+
+    /**
+     * Find partially loaded messages and add their server ids to {@link #mMessagesToFetch}.
+     */
+    private void addToFetchRequestList() {
+        final Cursor c = mContentResolver.query(Message.CONTENT_URI, FETCH_REQUEST_PROJECTION,
+                MessageColumns.FLAG_LOADED + "=" + Message.FLAG_LOADED_PARTIAL + " AND " +
+                MessageColumns.MAILBOX_KEY + "=?", new String[] {Long.toString(mMailbox.mId)},
+                null);
+        if (c != null) {
+            try {
+                while (c.moveToNext()) {
+                    mMessagesToFetch.add(c.getString(FETCH_REQUEST_SERVER_ID));
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    @Override
+    protected int getTrafficFlag() {
+        return TrafficFlags.DATA_EMAIL;
+    }
+
+    @Override
+    protected String getSyncKey() {
+        if (mMailbox == null) {
+            return null;
+        }
+        if (mMailbox.mSyncKey == null) {
+            // TODO: Write to DB? Probably not, and just let successful sync do that.
+            mMailbox.mSyncKey = "0";
+        }
+        return mMailbox.mSyncKey;
+    }
+
+    @Override
+    protected String getFolderClassName() {
+        return "Email";
+    }
+
+    @Override
+    protected AbstractSyncParser getParser(final InputStream is) throws IOException {
+        return new EasEmailSyncParser(mContext, mContentResolver, is, mMailbox, mAccount);
+    }
+
+    @Override
+    protected void setInitialSyncOptions(final Serializer s) {
+        // No-op.
+    }
+
+    @Override
+    protected void setNonInitialSyncOptions(final Serializer s) throws IOException {
+        // Check for messages that aren't fully loaded.
+        addToFetchRequestList();
+        // The "empty" case is typical; we send a request for changes, and also specify a sync
+        // window, body preference type (HTML for EAS 12.0 and later; MIME for EAS 2.5), and
+        // truncation
+        // If there are fetch requests, we only want the fetches (i.e. no changes from the server)
+        // so we turn MIME support off.  Note that we are always using EAS 2.5 if there are fetch
+        // requests
+        if (mMessagesToFetch.isEmpty()) {
+            // Permanently delete if in trash mailbox
+            // In Exchange 2003, deletes-as-moves tag = true; no tag = false
+            // In Exchange 2007 and up, deletes-as-moves tag is "0" (false) or "1" (true)
+            final boolean isTrashMailbox = mMailbox.mType == Mailbox.TYPE_TRASH;
+            if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                if (!isTrashMailbox) {
+                    s.tag(Tags.SYNC_DELETES_AS_MOVES);
+                }
+            } else {
+                s.data(Tags.SYNC_DELETES_AS_MOVES, isTrashMailbox ? "0" : "1");
+            }
+            s.tag(Tags.SYNC_GET_CHANGES);
+            s.data(Tags.SYNC_WINDOW_SIZE, EMAIL_WINDOW_SIZE);
+            s.start(Tags.SYNC_OPTIONS);
+            // Set the lookback appropriately (EAS calls this a "filter")
+            s.data(Tags.SYNC_FILTER_TYPE, getEmailFilter());
+            // Set the truncation amount for all classes
+            if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                s.start(Tags.BASE_BODY_PREFERENCE);
+                // HTML for email
+                s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_HTML);
+                s.data(Tags.BASE_TRUNCATION_SIZE, Eas.EAS12_TRUNCATION_SIZE);
+                s.end();
+            } else {
+                // Use MIME data for EAS 2.5
+                s.data(Tags.SYNC_MIME_SUPPORT, Eas.MIME_BODY_PREFERENCE_MIME);
+                s.data(Tags.SYNC_MIME_TRUNCATION, Eas.EAS2_5_TRUNCATION_SIZE);
+            }
+            s.end();
+        } else {
+            // If we have any messages that are not fully loaded, ask for plain text rather than
+            // MIME, to guarantee we'll get usable text body. This also means we should NOT ask for
+            // new messages -- we only want data for the message explicitly fetched.
+            s.start(Tags.SYNC_OPTIONS);
+            s.data(Tags.SYNC_MIME_SUPPORT, Eas.MIME_BODY_PREFERENCE_TEXT);
+            s.data(Tags.SYNC_TRUNCATION, Eas.EAS2_5_TRUNCATION_SIZE);
+            s.end();
+        }
+    }
+
+    /**
+     * Check whether a message is referenced by another (and therefore must be kept around).
+     * @param messageId The id of the message to check.
+     * @return Whether the message in question is referenced by another message.
+     */
+    private boolean messageReferenced(final long messageId) {
+        final Cursor c = mContentResolver.query(EmailContent.Body.CONTENT_URI,
+                EmailContent.Body.ID_PROJECTION, WHERE_BODY_SOURCE_MESSAGE_KEY,
+                new String[] {Long.toString(messageId)}, null);
+        if (c != null) {
+            try {
+                return c.moveToFirst();
+            } finally {
+                c.close();
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Write the command to delete a message to the {@link Serializer}.
+     * @param s The {@link Serializer} for this sync command.
+     * @param serverId The server id for the message to delete.
+     * @param firstCommand Whether any sync commands have already been written to s.
+     * @throws IOException
+     */
+    private static void addDeleteMessageCommand(final Serializer s, final String serverId,
+            final boolean firstCommand) throws IOException {
+        if (firstCommand) {
+            s.start(Tags.SYNC_COMMANDS);
+        }
+        s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
+    }
+
+    /**
+     * Adds a sync delete command for all messages in the Message_Deletes table.
+     * @param s The {@link Serializer} for this sync command.
+     * @param hasCommands Whether any Commands have already been written to s.
+     * @return Whether this function wrote any commands to s.
+     * @throws IOException
+     */
+    private boolean addDeletedCommands(final Serializer s, final boolean hasCommands)
+            throws IOException {
+        boolean wroteCommands = false;
+        final Cursor c = mContentResolver.query(Message.DELETED_CONTENT_URI,
+                Message.ID_COLUMNS_PROJECTION, MessageColumns.MAILBOX_KEY + '=' + mMailbox.mId,
+                null, null);
+        if (c != null) {
+            try {
+                while (c.moveToNext()) {
+                    final String serverId = c.getString(Message.ID_COLUMNS_SYNC_SERVER_ID);
+                    final long messageId = c.getLong(Message.ID_COLUMNS_ID_COLUMN);
+                    // Only upsync delete commands for messages that have server ids and are not
+                    // referenced by other messages.
+                    if (serverId != null && !messageReferenced(messageId)) {
+                        addDeleteMessageCommand(s, serverId, wroteCommands || hasCommands);
+                        wroteCommands = true;
+                        mDeletedMessages.add(messageId);
+                    }
+                }
+            } finally {
+                c.close();
+            }
+        }
+
+        return wroteCommands;
+    }
+
+    /**
+     * Create date/time in RFC8601 format.  Oddly enough, for calendar date/time, Microsoft uses
+     * a different format that excludes the punctuation (this is why I'm not putting this in a
+     * parent class)
+     */
+    private static String formatDateTime(final Calendar calendar) {
+        final StringBuilder sb = new StringBuilder();
+        //YYYY-MM-DDTHH:MM:SS.MSSZ
+        sb.append(calendar.get(Calendar.YEAR));
+        sb.append('-');
+        sb.append(String.format(Locale.US, "%02d", calendar.get(Calendar.MONTH) + 1));
+        sb.append('-');
+        sb.append(String.format(Locale.US, "%02d", calendar.get(Calendar.DAY_OF_MONTH)));
+        sb.append('T');
+        sb.append(String.format(Locale.US, "%02d", calendar.get(Calendar.HOUR_OF_DAY)));
+        sb.append(':');
+        sb.append(String.format(Locale.US, "%02d", calendar.get(Calendar.MINUTE)));
+        sb.append(':');
+        sb.append(String.format(Locale.US, "%02d", calendar.get(Calendar.SECOND)));
+        sb.append(".000Z");
+        return sb.toString();
+    }
+
+    /**
+     * Get the server id for a mailbox from the content provider.
+     * @param mailboxId The id of the mailbox we're interested in.
+     * @return The server id for the mailbox.
+     */
+    private String getServerIdForMailbox(final long mailboxId) {
+        final Cursor c = mContentResolver.query(
+                ContentUris.withAppendedId(Mailbox.CONTENT_URI, mailboxId),
+                new String [] { EmailContent.MailboxColumns.SERVER_ID }, null, null, null);
+        if (c != null) {
+            try {
+                if (c.moveToNext()) {
+                    return c.getString(0);
+                }
+            } finally {
+                c.close();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * For a message that's in the Message_Updates table, add a sync command to the
+     * {@link Serializer} if appropriate, and add the message to a list if it should be removed from
+     * Message_Updates.
+     * @param updatedMessageCursor The {@link Cursor} positioned at the message from Message_Updates
+     *                             that we're processing.
+     * @param s The {@link Serializer} for this sync command.
+     * @param hasCommands Whether the {@link Serializer} already has sync commands added to it.
+     * @param trashMailboxId The id for the trash mailbox.
+     * @return Whether we added a sync command to s.
+     * @throws IOException
+     */
+    private boolean handleOneUpdatedMessage(final Cursor updatedMessageCursor, final Serializer s,
+            final boolean hasCommands, final long trashMailboxId) throws IOException {
+        final long messageId = updatedMessageCursor.getLong(UPDATES_ID_COLUMN);
+        // Get the current state of this message (updated table has original state).
+        final Cursor currentCursor = mContentResolver.query(
+                ContentUris.withAppendedId(Message.CONTENT_URI, messageId),
+                UPDATES_PROJECTION, null, null, null);
+        if (currentCursor == null) {
+            // If, somehow, the message isn't still around, we still want to handle it as having
+            // been updated so that it gets removed from the updated table.
+            mUpdatedMessages.add(messageId);
+            return false;
+        }
+
+        try {
+            if (currentCursor.moveToFirst()) {
+                final String serverId = currentCursor.getString(UPDATES_SERVER_ID_COLUMN);
+                if (serverId == null) {
+                    // No serverId means there's nothing to do, but we should still remove from the
+                    // updated table.
+                    mUpdatedMessages.add(messageId);
+                    return false;
+                }
+
+                final long currentMailboxId = currentCursor.getLong(UPDATES_MAILBOX_KEY_COLUMN);
+                final int currentFlags = currentCursor.getInt(UPDATES_FLAG_COLUMN);
+
+                // Handle message deletion (i.e. move to trash).
+                if (currentMailboxId == trashMailboxId) {
+                    mUpdatedMessages.add(messageId);
+                    addDeleteMessageCommand(s, serverId, !hasCommands);
+                    // Also mark the message as moved in the DB (so the copy will be deleted if/when
+                    // the server version is synced)
+                    final ContentValues cv = new ContentValues(1);
+                    cv.put(MessageColumns.FLAGS, currentFlags | MESSAGE_FLAG_MOVED_MESSAGE);
+                    mContentResolver.update(
+                            ContentUris.withAppendedId(Message.CONTENT_URI, messageId),
+                            cv, null, null);
+                    return true;
+                }
+
+                // Handle message moved.
+                final long originalMailboxId =
+                        updatedMessageCursor.getLong(UPDATES_MAILBOX_KEY_COLUMN);
+                if (currentMailboxId != originalMailboxId) {
+                    final String sourceMailboxId = getServerIdForMailbox(originalMailboxId);
+                    final String destMailboxId;
+                    if (sourceMailboxId != null) {
+                        destMailboxId = getServerIdForMailbox(currentMailboxId);
+                    } else {
+                        destMailboxId = null;
+                    }
+                    if (destMailboxId != null) {
+                        mMessagesToMove.add(
+                                new MoveRequest(messageId, serverId, currentFlags,
+                                        originalMailboxId, sourceMailboxId, destMailboxId));
+                        // Since we don't want to remove this message from updated table until it
+                        // downsyncs, we do not add it to updatedIds.
+                    } else {
+                        // TODO: If the message's mailboxes aren't there, handle it better.
+                    }
+                } else {
+                    mUpdatedMessages.add(messageId);
+                }
+
+                final int favorite;
+                final boolean favoriteChanged;
+                // We can only send flag changes to the server in 12.0 or later
+                if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+                    favorite = currentCursor.getInt(UPDATES_FAVORITE_COLUMN);
+                    favoriteChanged =
+                            favorite != updatedMessageCursor.getInt(UPDATES_FAVORITE_COLUMN);
+                } else {
+                    favorite = 0;
+                    favoriteChanged = false;
+                }
+
+                final int read = currentCursor.getInt(UPDATES_READ_COLUMN);
+                final boolean readChanged =
+                        read != updatedMessageCursor.getInt(UPDATES_READ_COLUMN);
+
+                if (favoriteChanged || readChanged) {
+                    if (!hasCommands) {
+                        s.start(Tags.SYNC_COMMANDS);
+                    }
+                    s.start(Tags.SYNC_CHANGE);
+                    s.data(Tags.SYNC_SERVER_ID, serverId);
+                    s.start(Tags.SYNC_APPLICATION_DATA);
+                    if (readChanged) {
+                        s.data(Tags.EMAIL_READ, Integer.toString(read));
+                    }
+
+                    // "Flag" is a relatively complex concept in EAS 12.0 and above.  It is not only
+                    // the boolean "favorite" that we think of in Gmail, but it also represents a
+                    // follow up action, which can include a subject, start and due dates, and even
+                    // recurrences.  We don't support any of this as yet, but EAS 12.0 and higher
+                    // require that a flag contain a status, a type, and four date fields, two each
+                    // for start date and end (due) date.
+                    if (favoriteChanged) {
+                        if (favorite != 0) {
+                            // Status 2 = set flag
+                            s.start(Tags.EMAIL_FLAG).data(Tags.EMAIL_FLAG_STATUS, "2");
+                            // "FollowUp" is the standard type
+                            s.data(Tags.EMAIL_FLAG_TYPE, "FollowUp");
+                            final long now = System.currentTimeMillis();
+                            final Calendar calendar =
+                                GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));
+                            calendar.setTimeInMillis(now);
+                            // Flags are required to have a start date and end date (duplicated)
+                            // First, we'll set the current date/time in GMT as the start time
+                            String utc = formatDateTime(calendar);
+                            s.data(Tags.TASK_START_DATE, utc).data(Tags.TASK_UTC_START_DATE, utc);
+                            // And then we'll use one week from today for completion date
+                            calendar.setTimeInMillis(now + DateUtils.WEEK_IN_MILLIS);
+                            utc = formatDateTime(calendar);
+                            s.data(Tags.TASK_DUE_DATE, utc).data(Tags.TASK_UTC_DUE_DATE, utc);
+                            s.end();
+                        } else {
+                            s.tag(Tags.EMAIL_FLAG);
+                        }
+                    }
+                    s.end().end();  // SYNC_APPLICATION_DATA, SYNC_CHANGE
+                    return true;
+                }
+            }
+        } finally {
+            currentCursor.close();
+        }
+        return false;
+    }
+
+    /**
+     * Send all message move requests and process responses.
+     * TODO: Make this just one request/response, which requires changes to the parser.
+     * @throws IOException
+     */
+    private void performMessageMove() throws IOException {
+
+        for (final MoveRequest req : mMessagesToMove) {
+            final Serializer s = new Serializer();
+            s.start(Tags.MOVE_MOVE_ITEMS);
+            s.start(Tags.MOVE_MOVE);
+            s.data(Tags.MOVE_SRCMSGID, req.messageServerId);
+            s.data(Tags.MOVE_SRCFLDID, req.sourceFolderServerId);
+            s.data(Tags.MOVE_DSTFLDID, req.destFolderServerId);
+            s.end();
+            s.end().done();
+            final EasResponse resp = sendHttpClientPost("MoveItems", s.toByteArray());
+            try {
+                final int status = resp.getStatus();
+                if (status == HttpStatus.SC_OK) {
+                    if (!resp.isEmpty()) {
+                        final MoveItemsParser p = new MoveItemsParser(resp.getInputStream());
+                        p.parse();
+                        final int statusCode = p.getStatusCode();
+                        final ContentValues cv = new ContentValues();
+                        if (statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
+                            // Restore the old mailbox id
+                            cv.put(MessageColumns.MAILBOX_KEY, req.sourceFolderId);
+                            mContentResolver.update(
+                                    ContentUris.withAppendedId(Message.CONTENT_URI, req.messageId),
+                                    cv, null, null);
+                        } else if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS) {
+                            // Update with the new server id
+                            cv.put(SyncColumns.SERVER_ID, p.getNewServerId());
+                            cv.put(Message.FLAGS, req.messageFlags | MESSAGE_FLAG_MOVED_MESSAGE);
+                            mContentResolver.update(
+                                    ContentUris.withAppendedId(Message.CONTENT_URI, req.messageId),
+                                    cv, null, null);
+                        }
+                        if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS
+                                || statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
+                            // If we revert or succeed, we no longer need the update information
+                            // OR the now-duplicate email (the new copy will be synced down)
+                            mContentResolver.delete(ContentUris.withAppendedId(
+                                    Message.UPDATED_CONTENT_URI, req.messageId), null, null);
+                        } else {
+                            // In this case, we're retrying, so do nothing.  The request will be
+                            // handled next sync
+                        }
+                    }
+                } else if (resp.isAuthError()) {
+                    throw new EasAuthenticationException();
+                } else {
+                    LogUtils.i(TAG, "Move items request failed, code: %d", status);
+                    throw new IOException();
+                }
+            } finally {
+                resp.close();
+            }
+        }
+    }
+
+    /**
+     * For each message in Message_Updates, add a sync command if appropriate, and add its id to
+     * our list of processed messages if appropriate.
+     * @param s The {@link Serializer} for this sync request.
+     * @param hasCommands Whether sync commands have already been written to s.
+     * @return Whether this function added any sync commands to s.
+     * @throws IOException
+     */
+    private boolean addUpdatedCommands(final Serializer s, final boolean hasCommands)
+            throws IOException {
+        // Find our trash mailbox, since deletions will have been moved there.
+        final long trashMailboxId =
+                Mailbox.findMailboxOfType(mContext, mMailbox.mAccountKey, Mailbox.TYPE_TRASH);
+        final Cursor c = mContentResolver.query(Message.UPDATED_CONTENT_URI, UPDATES_PROJECTION,
+                MessageColumns.MAILBOX_KEY + '=' + mMailbox.mId, null, null);
+        boolean addedCommands = false;
+        if (c != null) {
+            try {
+                while (c.moveToNext()) {
+                    addedCommands |= handleOneUpdatedMessage(c, s, hasCommands || addedCommands,
+                            trashMailboxId);
+                }
+            } finally {
+                c.close();
+            }
+        }
+
+        // mMessagesToMove is now populated. If it's non-empty, let's send the move request now.
+        if (!mMessagesToMove.isEmpty()) {
+            performMessageMove();
+        }
+
+        return addedCommands;
+    }
+
+    /**
+     * Add FETCH commands for messages that need a body (i.e. we didn't find it during our earlier
+     * sync; this happens only in EAS 2.5 where the body couldn't be found after parsing the
+     * message's MIME data).
+     * @param s The {@link Serializer} for this sync request.
+     * @param hasCommands Whether sync commands have already been written to s.
+     * @return Whether this function added any sync commands to s.
+     * @throws IOException
+     */
+    private boolean addFetchCommands(final Serializer s, final boolean hasCommands)
+            throws IOException {
+        if (!hasCommands && !mMessagesToFetch.isEmpty()) {
+            s.start(Tags.SYNC_COMMANDS);
+        }
+        for (final String serverId : mMessagesToFetch) {
+            s.start(Tags.SYNC_FETCH).data(Tags.SYNC_SERVER_ID, serverId).end();
+        }
+
+        return !mMessagesToFetch.isEmpty();
+    }
+
+    @Override
+    protected void setUpsyncCommands(final Serializer s) throws IOException {
+        boolean addedCommands = addDeletedCommands(s, false);
+        addedCommands = addFetchCommands(s, addedCommands);
+        addedCommands = addUpdatedCommands(s, addedCommands);
+        if (addedCommands) {
+            s.end();
+        }
+    }
+
+    @Override
+    protected void cleanup(final int syncResult) {
+        // After a successful sync, we have things to delete from the DB.
+        if (syncResult != SYNC_RESULT_FAILED) {
+            ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+            // Delete any moved messages (since we've just synced the mailbox, and no longer need
+            // the placeholder message); this prevents duplicates from appearing in the mailbox.
+            // TODO: Verify this still makes sense.
+            ops.add(ContentProviderOperation.newDelete(Message.CONTENT_URI)
+                    .withSelection(WHERE_MAILBOX_KEY_AND_MOVED,
+                            new String[] {Long.toString(mMailbox.mId)}).build());
+            // Delete any entries in Message_Updates and Message_Deletes that were upsynced.
+            for (final long id: mDeletedMessages) {
+                ops.add(ContentProviderOperation.newDelete(
+                        ContentUris.withAppendedId(Message.DELETED_CONTENT_URI, id)).build());
+            }
+            for (final long id: mUpdatedMessages) {
+                ops.add(ContentProviderOperation.newDelete(
+                        ContentUris.withAppendedId(Message.UPDATED_CONTENT_URI, id)).build());
+            }
+            try {
+                mContentResolver.applyBatch(EmailContent.AUTHORITY, ops);
+            } catch (final RemoteException e) {
+                // TODO: Improve handling.
+            } catch (final OperationApplicationException e) {
+                // TODO: Improve handing.
+            }
+        }
+
+        if (syncResult == SYNC_RESULT_MORE_AVAILABLE) {
+            // Prepare our member variables for another sync request.
+            mDeletedMessages.clear();
+            mUpdatedMessages.clear();
+            mMessagesToFetch.clear();
+            mMessagesToMove.clear();
+        }
+    }
+}

diff --git a/src/com/android/exchange/service/EasMeetingResponder.java b/src/com/android/exchange/service/EasMeetingResponder.java
new file mode 100644
index 0000000..b9aad1d
--- /dev/null
+++ b/src/com/android/exchange/service/EasMeetingResponder.java

@@ -0,0 +1,225 @@
+package com.android.exchange.service;
+
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Entity;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Events;
+
+import com.android.emailcommon.mail.Address;
+import com.android.emailcommon.mail.MeetingInfo;
+import com.android.emailcommon.mail.PackedString;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.EmailServiceConstants;
+import com.android.emailcommon.utility.Utility;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.MeetingResponseParser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.exchange.utility.CalendarUtilities;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpStatus;
+
+import java.io.IOException;
+
+/**
+ * Responds to a meeting request, both notifying the EAS server and sending email.
+ */
+public class EasMeetingResponder extends EasServerConnection {
+
+    private static final String TAG = "EasMeetingResponder";
+
+    /** Projection for getting the server id for a mailbox. */
+    private static final String[] MAILBOX_SERVER_ID_PROJECTION = { MailboxColumns.SERVER_ID };
+    private static final int MAILBOX_SERVER_ID_COLUMN = 0;
+
+    /** EAS protocol values for UserResponse. */
+    private static final int EAS_RESPOND_ACCEPT = 1;
+    private static final int EAS_RESPOND_TENTATIVE = 2;
+    private static final int EAS_RESPOND_DECLINE = 3;
+
+    /** Value to use if we get a UI response value that we can't handle. */
+    private static final int EAS_RESPOND_UNKNOWN = -1;
+
+    private EasMeetingResponder(final Context context, final Account account) {
+        super(context, account);
+    }
+
+    /**
+     * Translate from {@link UIProvider.MessageOperations} constants to EAS values.
+     * They're currently identical but this is for future-proofing.
+     * @param messageOperationResponse The response value that came from the UI.
+     * @return The EAS protocol value to use.
+     */
+    private static int messageOperationResponseToUserResponse(final int messageOperationResponse) {
+        switch (messageOperationResponse) {
+            case UIProvider.MessageOperations.RESPOND_ACCEPT:
+                return EAS_RESPOND_ACCEPT;
+            case UIProvider.MessageOperations.RESPOND_TENTATIVE:
+                return EAS_RESPOND_TENTATIVE;
+            case UIProvider.MessageOperations.RESPOND_DECLINE:
+                return EAS_RESPOND_DECLINE;
+        }
+        return EAS_RESPOND_UNKNOWN;
+    }
+
+    /**
+     * Send the response to both the EAS server and as email (if appropriate).
+     * @param context Our {@link Context}.
+     * @param messageId The db id for the message containing the meeting request.
+     * @param response The UI's value for the user's response to the meeting.
+     */
+    public static void sendMeetingResponse(final Context context, final long messageId,
+            final int response) {
+        final int easResponse = messageOperationResponseToUserResponse(response);
+        if (easResponse == EAS_RESPOND_UNKNOWN) {
+            LogUtils.e(TAG, "Bad response value: %d", response);
+            return;
+        }
+        final Message msg = Message.restoreMessageWithId(context, messageId);
+        if (msg == null) {
+            LogUtils.d(TAG, "Could not load message %d", messageId);
+            return;
+        }
+        final Account account = Account.restoreAccountWithId(context, msg.mAccountKey);
+        if (account == null) {
+            LogUtils.e(TAG, "Could not load account %d for message %d", msg.mAccountKey, msg.mId);
+            return;
+        }
+        final String mailboxServerId = Utility.getFirstRowString(context,
+                ContentUris.withAppendedId(Mailbox.CONTENT_URI, msg.mMailboxKey),
+                MAILBOX_SERVER_ID_PROJECTION, null, null, null, MAILBOX_SERVER_ID_COLUMN);
+        if (mailboxServerId == null) {
+            LogUtils.e(TAG, "Could not load mailbox %d for message %d", msg.mMailboxKey, msg.mId);
+            return;
+        }
+
+        final EasMeetingResponder responder = new EasMeetingResponder(context, account);
+        try {
+            responder.sendResponse(msg, mailboxServerId, easResponse);
+        } catch (final IOException e) {
+            LogUtils.e(TAG, "IOException: %s", e.getMessage());
+        }
+    }
+
+    /**
+     * Send an email response to a meeting invitation.
+     * @param meetingInfo The meeting info that was extracted from the invitation message.
+     * @param response The EAS value for the user's response to the meeting.
+     */
+    private void sendMeetingResponseMail(final PackedString meetingInfo, final int response) {
+        // This will come as "First Last" <box@server.blah>, so we use Address to
+        // parse it into parts; we only need the email address part for the ics file
+        final Address[] addrs = Address.parse(meetingInfo.get(MeetingInfo.MEETING_ORGANIZER_EMAIL));
+        // It shouldn't be possible, but handle it anyway
+        if (addrs.length != 1) return;
+        final String organizerEmail = addrs[0].getAddress();
+
+        final String dtStamp = meetingInfo.get(MeetingInfo.MEETING_DTSTAMP);
+        final String dtStart = meetingInfo.get(MeetingInfo.MEETING_DTSTART);
+        final String dtEnd = meetingInfo.get(MeetingInfo.MEETING_DTEND);
+
+        // What we're doing here is to create an Entity that looks like an Event as it would be
+        // stored by CalendarProvider
+        final ContentValues entityValues = new ContentValues(6);
+        final Entity entity = new Entity(entityValues);
+
+        // Fill in times, location, title, and organizer
+        entityValues.put("DTSTAMP",
+                CalendarUtilities.convertEmailDateTimeToCalendarDateTime(dtStamp));
+        entityValues.put(Events.DTSTART, Utility.parseEmailDateTimeToMillis(dtStart));
+        entityValues.put(Events.DTEND, Utility.parseEmailDateTimeToMillis(dtEnd));
+        entityValues.put(Events.EVENT_LOCATION, meetingInfo.get(MeetingInfo.MEETING_LOCATION));
+        entityValues.put(Events.TITLE, meetingInfo.get(MeetingInfo.MEETING_TITLE));
+        entityValues.put(Events.ORGANIZER, organizerEmail);
+
+        // Add ourselves as an attendee, using our account email address
+        final ContentValues attendeeValues = new ContentValues(2);
+        attendeeValues.put(Attendees.ATTENDEE_RELATIONSHIP,
+                Attendees.RELATIONSHIP_ATTENDEE);
+        attendeeValues.put(Attendees.ATTENDEE_EMAIL, mAccount.mEmailAddress);
+        entity.addSubValue(Attendees.CONTENT_URI, attendeeValues);
+
+        // Add the organizer
+        final ContentValues organizerValues = new ContentValues(2);
+        organizerValues.put(Attendees.ATTENDEE_RELATIONSHIP,
+                Attendees.RELATIONSHIP_ORGANIZER);
+        organizerValues.put(Attendees.ATTENDEE_EMAIL, organizerEmail);
+        entity.addSubValue(Attendees.CONTENT_URI, organizerValues);
+
+        // Create a message from the Entity we've built.  The message will have fields like
+        // to, subject, date, and text filled in.  There will also be an "inline" attachment
+        // which is in iCalendar format
+        final int flag;
+        switch(response) {
+            case EmailServiceConstants.MEETING_REQUEST_ACCEPTED:
+                flag = Message.FLAG_OUTGOING_MEETING_ACCEPT;
+                break;
+            case EmailServiceConstants.MEETING_REQUEST_DECLINED:
+                flag = Message.FLAG_OUTGOING_MEETING_DECLINE;
+                break;
+            case EmailServiceConstants.MEETING_REQUEST_TENTATIVE:
+            default:
+                flag = Message.FLAG_OUTGOING_MEETING_TENTATIVE;
+                break;
+        }
+        final Message outgoingMsg =
+            CalendarUtilities.createMessageForEntity(mContext, entity, flag,
+                    meetingInfo.get(MeetingInfo.MEETING_UID), mAccount);
+        // Assuming we got a message back (we might not if the event has been deleted), send it
+        if (outgoingMsg != null) {
+            sendMessage(mAccount, outgoingMsg);
+        }
+    }
+
+    /**
+     * Send the response to the EAS server, and also via email if requested.
+     * @param msg The email message for the meeting invitation.
+     * @param mailboxServerId The server id for the mailbox that msg is in.
+     * @param response The EAS value for the user's response.
+     * @throws IOException
+     */
+    private void sendResponse(final Message msg, final String mailboxServerId, final int response)
+            throws IOException {
+        final Serializer s = new Serializer();
+        s.start(Tags.MREQ_MEETING_RESPONSE).start(Tags.MREQ_REQUEST);
+        s.data(Tags.MREQ_USER_RESPONSE, Integer.toString(response));
+        s.data(Tags.MREQ_COLLECTION_ID, mailboxServerId);
+        s.data(Tags.MREQ_REQ_ID, msg.mServerId);
+        s.end().end().done();
+        final EasResponse resp = sendHttpClientPost("MeetingResponse", s.toByteArray());
+        try {
+            final int status = resp.getStatus();
+            if (status == HttpStatus.SC_OK) {
+                if (!resp.isEmpty()) {
+                    // TODO: Improve the parsing to actually handle error statuses.
+                    new MeetingResponseParser(resp.getInputStream()).parse();
+
+                    if (msg.mMeetingInfo != null) {
+                        final PackedString meetingInfo = new PackedString(msg.mMeetingInfo);
+                        final String responseRequested =
+                                meetingInfo.get(MeetingInfo.MEETING_RESPONSE_REQUESTED);
+                        // If there's no tag, or a non-zero tag, we send the response mail
+                        if (!"0".equals(responseRequested)) {
+                            sendMeetingResponseMail(meetingInfo, response);
+                        }
+                    }
+                }
+            } else if (resp.isAuthError()) {
+                // TODO: Handle this gracefully.
+                //throw new EasAuthenticationException();
+            } else {
+                LogUtils.e(TAG, "Meeting response request failed, code: %d", status);
+                throw new IOException();
+            }
+        } finally {
+            resp.close();
+        }
+    }
+}

diff --git a/src/com/android/exchange/service/EasOutboxSyncHandler.java b/src/com/android/exchange/service/EasOutboxSyncHandler.java
new file mode 100644
index 0000000..7c56d6d
--- /dev/null
+++ b/src/com/android/exchange/service/EasOutboxSyncHandler.java

@@ -0,0 +1,559 @@
+package com.android.exchange.service;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.TrafficStats;
+import android.net.Uri;
+import android.text.format.DateUtils;
+
+import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.internet.Rfc822Output;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailcommon.provider.EmailContent.Body;
+import com.android.emailcommon.provider.EmailContent.BodyColumns;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.EmailContent.MessageColumns;
+import com.android.emailcommon.provider.EmailContent.SyncColumns;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.utility.Utility;
+import com.android.exchange.CommandStatusException.CommandStatus;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.Parser;
+import com.android.exchange.adapter.Parser.EmptyStreamException;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.InputStreamEntity;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+/**
+ * Performs an Exchange Outbox sync, i.e. sends all mail from the Outbox.
+ */
+public class EasOutboxSyncHandler extends EasServerConnection {
+    // Value for a message's server id when sending fails.
+    public static final int SEND_FAILED = 1;
+
+    // WHERE clause to query for unsent messages.
+    // TODO: Is the SEND_FAILED check actually what we want?
+    public static final String MAILBOX_KEY_AND_NOT_SEND_FAILED =
+            MessageColumns.MAILBOX_KEY + "=? and (" + SyncColumns.SERVER_ID + " is null or " +
+            SyncColumns.SERVER_ID + "!=" + SEND_FAILED + ')';
+
+    // This needs to be long enough to send the longest reasonable message, without being so long
+    // as to effectively "hang" sending of mail.  The standard 30 second timeout isn't long enough
+    // for pictures and the like.  For now, we'll use 15 minutes, in the knowledge that any socket
+    // failure would probably generate an Exception before timing out anyway
+    public static final long SEND_MAIL_TIMEOUT = 15 * DateUtils.MINUTE_IN_MILLIS;
+
+    private final Mailbox mMailbox;
+    private final File mCacheDir;
+
+    public EasOutboxSyncHandler(final Context context, final Account account,
+            final Mailbox mailbox) {
+        super(context, account);
+        mMailbox = mailbox;
+        mCacheDir = context.getCacheDir();
+    }
+
+    public void performSync() {
+        // Use SMTP flags for sending mail
+        TrafficStats.setThreadStatsTag(TrafficFlags.getSmtpFlags(mContext, mAccount));
+        // Get a cursor to Outbox messages
+        final Cursor c = mContext.getContentResolver().query(Message.CONTENT_URI,
+                Message.CONTENT_PROJECTION, MAILBOX_KEY_AND_NOT_SEND_FAILED,
+                new String[] {Long.toString(mMailbox.mId)}, null);
+        try {
+            // Loop through the messages, sending each one
+            while (c.moveToNext()) {
+                final Message message = new Message();
+                message.restore(c);
+                if (Utility.hasUnloadedAttachments(mContext, message.mId)) {
+                    // We'll just have to wait on this...
+                    continue;
+                }
+
+                // TODO: Fix -- how do we want to signal to UI that we started syncing?
+                // Note the entire callback mechanism here needs improving.
+                //sendMessageStatus(message.mId, null, EmailServiceStatus.IN_PROGRESS, 0);
+
+                if (!sendOneMessage(message,
+                        SmartSendInfo.getSmartSendInfo(mContext, mAccount, message))) {
+                    break;
+                }
+            }
+        } finally {
+            // TODO: Some sort of sendMessageStatus() is needed here.
+            c.close();
+        }
+    }
+
+    /**
+     * Information needed for SmartReply/SmartForward.
+     */
+    private static class SmartSendInfo {
+        public static final String[] BODY_SOURCE_PROJECTION =
+                new String[] {BodyColumns.SOURCE_MESSAGE_KEY};
+        public static final String WHERE_MESSAGE_KEY = Body.MESSAGE_KEY + "=?";
+
+        final String mItemId;
+        final String mCollectionId;
+        final boolean mIsReply;
+        final ArrayList<Attachment> mRequiredAtts;
+
+        private SmartSendInfo(final String itemId, final String collectionId, final boolean isReply,
+                final ArrayList<Attachment> requiredAtts) {
+            mItemId = itemId;
+            mCollectionId = collectionId;
+            mIsReply = isReply;
+            mRequiredAtts = requiredAtts;
+        }
+
+        public String generateSmartSendCmd() {
+            final StringBuilder sb = new StringBuilder();
+            sb.append(isForward() ? "SmartForward" : "SmartReply");
+            sb.append("&ItemId=");
+            sb.append(Uri.encode(mItemId, ":"));
+            sb.append("&CollectionId=");
+            sb.append(Uri.encode(mCollectionId, ":"));
+            return sb.toString();
+        }
+
+        public boolean isForward() {
+            return !mIsReply;
+        }
+
+        /**
+         * See if a given attachment is among an array of attachments; it is if the locations of
+         * both are the same (we're looking to see if they represent the same attachment on the
+         * server. Note that an attachment that isn't on the server (e.g. an outbound attachment
+         * picked from the  gallery) won't have a location, so the result will always be false.
+         *
+         * @param att the attachment to test
+         * @param atts the array of attachments to look in
+         * @return whether the test attachment is among the array of attachments
+         */
+        private static boolean amongAttachments(final Attachment att, final Attachment[] atts) {
+            final String location = att.mLocation;
+            if (location == null) return false;
+            for (final Attachment a: atts) {
+                if (location.equals(a.mLocation)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * If this message should use SmartReply or SmartForward, return an object with the data
+         * for the smart send.
+         *
+         * @param context the caller's context
+         * @param account the Account we're sending from
+         * @param message the Message being sent
+         * @return an object to support smart sending, or null if not applicable.
+         */
+        public static SmartSendInfo getSmartSendInfo(final Context context,
+                final Account account, final Message message) {
+            final int flags = message.mFlags;
+            // We only care about the original message if we include quoted text.
+            if ((flags & Message.FLAG_NOT_INCLUDE_QUOTED_TEXT) != 0) {
+                return null;
+            }
+            final boolean reply = (flags & Message.FLAG_TYPE_REPLY) != 0;
+            final boolean forward = (flags & Message.FLAG_TYPE_FORWARD) != 0;
+            // We also only care for replies or forwards.
+            if (!reply && !forward) {
+                return null;
+            }
+            // Just a sanity check here, since we assume that reply and forward are mutually
+            // exclusive throughout this class.
+            if (reply && forward) {
+                return null;
+            }
+            // If we don't support SmartForward and it's a forward, then don't proceed.
+            if (forward && (account.mFlags & Account.FLAGS_SUPPORTS_SMART_FORWARD) == 0) {
+                return null;
+            }
+
+            // Note: itemId and collectionId are the terms used by EAS to refer to the serverId and
+            // mailboxId of a Message
+            String itemId = null;
+            String collectionId = null;
+
+            // First, we need to get the id of the reply/forward message
+            String[] cols = Utility.getRowColumns(context, Body.CONTENT_URI, BODY_SOURCE_PROJECTION,
+                    WHERE_MESSAGE_KEY, new String[] {Long.toString(message.mId)});
+            long refId = 0;
+            if (cols != null) {
+                refId = Long.parseLong(cols[0]);
+                // Then, we need the serverId and mailboxKey of the message
+                cols = Utility.getRowColumns(context, Message.CONTENT_URI, refId,
+                        SyncColumns.SERVER_ID, MessageColumns.MAILBOX_KEY,
+                        MessageColumns.PROTOCOL_SEARCH_INFO);
+                if (cols != null) {
+                    itemId = cols[0];
+                    final long boxId = Long.parseLong(cols[1]);
+                    // Then, we need the serverId of the mailbox
+                    cols = Utility.getRowColumns(context, Mailbox.CONTENT_URI, boxId,
+                            MailboxColumns.SERVER_ID);
+                    if (cols != null) {
+                        collectionId = cols[0];
+                    }
+                }
+            }
+            // We need either a longId or both itemId (serverId) and collectionId (mailboxId) to
+            // process a smart reply or a smart forward
+            if (itemId != null && collectionId != null) {
+                final ArrayList<Attachment> requiredAtts;
+                if (forward) {
+                    // See if we can really smart forward (all reference attachments must be sent)
+                    final Attachment[] outAtts =
+                            Attachment.restoreAttachmentsWithMessageId(context, message.mId);
+                    final Attachment[] refAtts =
+                            Attachment.restoreAttachmentsWithMessageId(context, refId);
+                    for (final Attachment refAtt: refAtts) {
+                        // If an original attachment isn't among what's going out, we can't be smart
+                        if (!amongAttachments(refAtt, outAtts)) {
+                            return null;
+                        }
+                    }
+                    requiredAtts = new ArrayList<Attachment>();
+                    for (final Attachment outAtt: outAtts) {
+                        // If an outgoing attachment isn't in original message, we must send it
+                        if (!amongAttachments(outAtt, refAtts)) {
+                            requiredAtts.add(outAtt);
+                        }
+                    }
+                } else {
+                    requiredAtts = null;
+                }
+                return new SmartSendInfo(itemId, collectionId, reply, requiredAtts);
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Our own HttpEntity subclass that is able to insert opaque data (in this case the MIME
+     * representation of the message body as stored in a temporary file) into the serializer stream
+     */
+    private static class SendMailEntity extends InputStreamEntity {
+        private final FileInputStream mFileStream;
+        private final long mFileLength;
+        private final int mSendTag;
+        private final Message mMessage;
+        private final SmartSendInfo mSmartSendInfo;
+
+        public SendMailEntity(final FileInputStream instream, final long length, final int tag,
+                final Message message, final SmartSendInfo smartSendInfo) {
+            super(instream, length);
+            mFileStream = instream;
+            mFileLength = length;
+            mSendTag = tag;
+            mMessage = message;
+            mSmartSendInfo = smartSendInfo;
+        }
+
+        /**
+         * We always return -1 because we don't know the actual length of the POST data (this
+         * causes HttpClient to send the data in "chunked" mode)
+         */
+        @Override
+        public long getContentLength() {
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                // Calculate the overhead for the WBXML data
+                writeTo(baos, false);
+                // Return the actual size that will be sent
+                return baos.size() + mFileLength;
+            } catch (final IOException e) {
+                // Just return -1 (unknown)
+            } finally {
+                try {
+                    baos.close();
+                } catch (final IOException e) {
+                    // Ignore
+                }
+            }
+            return -1;
+        }
+
+        @Override
+        public void writeTo(final OutputStream outstream) throws IOException {
+            writeTo(outstream, true);
+        }
+
+        /**
+         * Write the message to the output stream
+         * @param outstream the output stream to write
+         * @param withData whether or not the actual data is to be written; true when sending
+         *   mail; false when calculating size only
+         * @throws IOException
+         */
+        public void writeTo(final OutputStream outstream, final boolean withData)
+                throws IOException {
+            // Not sure if this is possible; the check is taken from the superclass
+            if (outstream == null) {
+                throw new IllegalArgumentException("Output stream may not be null");
+            }
+
+            // We'll serialize directly into the output stream
+            final Serializer s = new Serializer(outstream);
+            // Send the appropriate initial tag
+            s.start(mSendTag);
+            // The Message-Id for this message (note that we cannot use the messageId stored in
+            // the message, as EAS 14 limits the length to 40 chars and we use 70+)
+            s.data(Tags.COMPOSE_CLIENT_ID, "SendMail-" + System.nanoTime());
+            // We always save sent mail
+            s.tag(Tags.COMPOSE_SAVE_IN_SENT_ITEMS);
+
+            // If we're using smart reply/forward, we need info about the original message
+            if (mSendTag != Tags.COMPOSE_SEND_MAIL) {
+                if (mSmartSendInfo != null) {
+                    s.start(Tags.COMPOSE_SOURCE);
+                    // For search results, use the long id (stored in mProtocolSearchInfo); else,
+                    // use folder id/item id combo
+                    if (mMessage.mProtocolSearchInfo != null) {
+                        s.data(Tags.COMPOSE_LONG_ID, mMessage.mProtocolSearchInfo);
+                    } else {
+                        s.data(Tags.COMPOSE_ITEM_ID, mSmartSendInfo.mItemId);
+                        s.data(Tags.COMPOSE_FOLDER_ID, mSmartSendInfo.mCollectionId);
+                    }
+                    s.end();  // Tags.COMPOSE_SOURCE
+                }
+            }
+
+            // Start the MIME tag; this is followed by "opaque" data (byte array)
+            s.start(Tags.COMPOSE_MIME);
+            // Send opaque data from the file stream
+            if (withData) {
+                s.opaque(mFileStream, (int)mFileLength);
+            } else {
+                s.opaqueWithoutData((int)mFileLength);
+            }
+            // And we're done
+            s.end().end().done();
+        }
+    }
+
+    private static class SendMailParser extends Parser {
+        private final int mStartTag;
+        private int mStatus;
+
+        public SendMailParser(final InputStream in, final int startTag) throws IOException {
+            super(in);
+            mStartTag = startTag;
+        }
+
+        public int getStatus() {
+            return mStatus;
+        }
+
+        /**
+         * The only useful info in the SendMail response is the status; we capture and save it
+         */
+        @Override
+        public boolean parse() throws IOException {
+            if (nextTag(START_DOCUMENT) != mStartTag) {
+                throw new IOException();
+            }
+            while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
+                if (tag == Tags.COMPOSE_STATUS) {
+                    mStatus = getValueInt();
+                } else {
+                    skipTag();
+                }
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Attempt to send one message.
+     * @param message The message to send.
+     * @param smartSendInfo The SmartSendInfo for this message, or null if we don't have or don't
+     *      want to use smart send.
+     * @return Whether or not sending this message succeeded.
+     * TODO: Improve how we handle the types of failures. I've left the old error codes in as TODOs
+     * for future reference.
+     */
+    private boolean sendOneMessage(final Message message, final SmartSendInfo smartSendInfo) {
+        final File tmpFile;
+        try {
+            tmpFile = File.createTempFile("eas_", "tmp", mCacheDir);
+        } catch (final IOException e) {
+            return false; // TODO: Handle SyncStatus.FAILURE_IO;
+        }
+
+        final EasResponse resp;
+        // Send behavior differs pre and post EAS14.
+        final boolean isEas14 = (Double.parseDouble(mAccount.mProtocolVersion) >=
+                Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE);
+        final int modeTag = getModeTag(isEas14, smartSendInfo);
+        try {
+            if (!writeMessageToTempFile(tmpFile, message, smartSendInfo)) {
+                return false; // TODO: Handle SyncStatus.FAILURE_IO;
+            }
+
+            final FileInputStream fileStream;
+            try {
+                fileStream = new FileInputStream(tmpFile);
+            } catch (final FileNotFoundException e) {
+                return false; // TODO: Handle SyncStatus.FAILURE_IO;
+            }
+            try {
+
+                final long fileLength = tmpFile.length();
+                final HttpEntity entity;
+                if (isEas14) {
+                    entity = new SendMailEntity(fileStream, fileLength, modeTag, message,
+                            smartSendInfo);
+                } else {
+                    entity = new InputStreamEntity(fileStream, fileLength);
+                }
+
+                // Create the appropriate command.
+                String cmd = "SendMail";
+                if (smartSendInfo != null) {
+                    // In EAS 14, we don't send itemId and collectionId in the command
+                    if (isEas14) {
+                        cmd = smartSendInfo.isForward() ? "SmartForward" : "SmartReply";
+                    } else {
+                        cmd = smartSendInfo.generateSmartSendCmd();
+                    }
+                }
+                // If we're not EAS 14, add our save-in-sent setting here
+                if (!isEas14) {
+                    cmd += "&SaveInSent=T";
+                }
+                // Finally, post SendMail to the server
+                try {
+                    resp = sendHttpClientPost(cmd, entity, SEND_MAIL_TIMEOUT);
+                } catch (final IOException e) {
+                    return false; // TODO: Handle SyncStatus.FAILURE_IO;
+                }
+
+            } finally {
+                try {
+                    fileStream.close();
+                } catch (final IOException e) {
+                    // TODO: Should we do anything here, or is it ok to just proceed?
+                }
+            }
+        } finally {
+            if (tmpFile.exists()) {
+                tmpFile.delete();
+            }
+        }
+
+        try {
+            final int code = resp.getStatus();
+            if (code == HttpStatus.SC_OK) {
+                // HTTP OK before EAS 14 is a thumbs up; in EAS 14, we've got to parse
+                // the reply
+                if (isEas14) {
+                    try {
+                        // Try to parse the result
+                        final SendMailParser p = new SendMailParser(resp.getInputStream(), modeTag);
+                        // If we get here, the SendMail failed; go figure
+                        p.parse();
+                        // The parser holds the status
+                        final int status = p.getStatus();
+                        if (CommandStatus.isNeedsProvisioning(status)) {
+                            return false; // TODO: Handle SyncStatus.FAILURE_SECURITY;
+                        } else if (status == CommandStatus.ITEM_NOT_FOUND &&
+                                smartSendInfo != null) {
+                            // Let's retry without "smart" commands.
+                            return sendOneMessage(message, null);
+                        }
+                        // TODO: Set syncServerId = SEND_FAILED in DB?
+                        return false; // TODO: Handle SyncStatus.FAILURE_MESSAGE;
+                    } catch (final EmptyStreamException e) {
+                        // This is actually fine; an empty stream means SendMail succeeded
+                    } catch (final IOException e) {
+                        // Parsing failed in some other way.
+                        return false; // TODO: Handle SyncStatus.FAILURE_IO;
+                    }
+                }
+            } else if (code == HttpStatus.SC_INTERNAL_SERVER_ERROR && smartSendInfo != null) {
+                // Let's retry without "smart" commands.
+                return sendOneMessage(message, null);
+            } else {
+                if (resp.isAuthError()) {
+                    return false; // TODO: Handle SyncStatus.FAILURE_LOGIN;
+                } else if (resp.isProvisionError()) {
+                    return false; // TODO: Handle SyncStatus.FAILURE_SECURITY;
+                }
+            }
+        } finally {
+            resp.close();
+        }
+
+        // If we manage to get here, the message sent successfully. Hooray!
+        // Delete the sent message.
+        mContext.getContentResolver().delete(
+                ContentUris.withAppendedId(Message.CONTENT_URI, message.mId), null, null);
+        return true;
+    }
+
+    /**
+     * Writes message to the temp file.
+     * @param tmpFile The temp file to use.
+     * @param message The {@link Message} to write.
+     * @param smartSendInfo The {@link SmartSendInfo} for this message send attempt.
+     * @return Whether we could successfully write the file.
+     */
+    private boolean writeMessageToTempFile(final File tmpFile, final Message message,
+            final SmartSendInfo smartSendInfo) {
+        final FileOutputStream fileStream;
+        try {
+            fileStream = new FileOutputStream(tmpFile);
+        } catch (final FileNotFoundException e) {
+            return false;
+        }
+        try {
+            final boolean smartSend = smartSendInfo != null;
+            final ArrayList<Attachment> attachments =
+                    smartSend ? smartSendInfo.mRequiredAtts : null;
+            Rfc822Output.writeTo(mContext, message, fileStream, smartSend, true, attachments);
+        } catch (final Exception e) {
+            // TODO: Handle file write errors.
+        } finally {
+            try {
+                fileStream.close();
+            } catch (final IOException e) {
+                // TODO: Should we do anything here, or is it ok to just proceed?
+            }
+        }
+
+        return true;
+    }
+
+    private static int getModeTag(final boolean isEas14, final SmartSendInfo smartSendInfo) {
+        if (isEas14) {
+            if (smartSendInfo == null) {
+                return Tags.COMPOSE_SEND_MAIL;
+            } else if (smartSendInfo.isForward()) {
+                return Tags.COMPOSE_SMART_FORWARD;
+            } else {
+                return Tags.COMPOSE_SMART_REPLY;
+            }
+        }
+        return 0;
+    }
+}

diff --git a/src/com/android/exchange/service/EasServerConnection.java b/src/com/android/exchange/service/EasServerConnection.java
new file mode 100644
index 0000000..062dfcc
--- /dev/null
+++ b/src/com/android/exchange/service/EasServerConnection.java

@@ -0,0 +1,444 @@
+package com.android.exchange.service;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Base64;
+
+import com.android.emailcommon.internet.MimeUtility;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.AccountServiceProxy;
+import com.android.emailcommon.utility.EmailClientConnectionManager;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.eas.EasConnectionCache;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpOptions;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Base class for communicating with an EAS server. Anything that needs to send messages to the
+ * server can subclass this to get access to the {@link #sendHttpClientPost} family of functions.
+ * TODO: This class has a regrettable name. It's not a connection, but rather a task that happens
+ * to have (and use) a connection to the server.
+ */
+public class EasServerConnection {
+    /** Logging tag. */
+    private static final String TAG = "EasServerConnection";
+
+    /**
+     * Timeout for establishing a connection to the server.
+     */
+    private static final long CONNECTION_TIMEOUT = 20 * DateUtils.SECOND_IN_MILLIS;
+
+    /**
+     * Timeout for http requests after the connection has been established.
+     */
+    protected static final long COMMAND_TIMEOUT = 30 * DateUtils.SECOND_IN_MILLIS;
+
+    private static final String DEVICE_TYPE = "Android";
+    protected static final String USER_AGENT = DEVICE_TYPE + '/' + Build.VERSION.RELEASE + '-' +
+        Eas.CLIENT_VERSION;
+
+    /** Message MIME type for EAS version 14 and later. */
+    private static final String EAS_14_MIME_TYPE = "application/vnd.ms-sync.wbxml";
+
+    /**
+     * Value for {@link #mStoppedReason} when we haven't been stopped.
+     */
+    public static final int STOPPED_REASON_NONE = 0;
+
+    /**
+     * Passed to {@link #stop} to indicate that this stop request should terminate this task.
+     */
+    public static final int STOPPED_REASON_ABORT = 1;
+
+    /**
+     * Passed to {@link #stop} to indicate that this stop request should restart this task (e.g. in
+     * order to reload parameters).
+     */
+    public static final int STOPPED_REASON_RESTART = 2;
+
+    private static String sDeviceId = null;
+
+    protected final Context mContext;
+    // TODO: Make this private if possible. Subclasses must be careful about altering the HostAuth
+    // to not screw up any connection caching (use redirectHostAuth).
+    protected final HostAuth mHostAuth;
+    protected final Account mAccount;
+
+    // Bookkeeping for interrupting a POST. This is primarily for use by Ping (there's currently
+    // no mechanism for stopping a sync).
+    // Access to these variables should be synchronized on this.
+    private HttpPost mPendingPost = null;
+    private boolean mStopped = false;
+    private int mStoppedReason = STOPPED_REASON_NONE;
+
+    /**
+     * The protocol version to use, as a double.
+     */
+    private double mProtocolVersion = 0.0d;
+
+    /**
+     * The client for any requests made by this object. This is created lazily, and cleared
+     * whenever our host auth is redirected.
+     */
+    private HttpClient mClient;
+
+    /**
+     * The connection manager for any requests made by this object. This is created lazily, and
+     * cleared whenever our host auth is redirected.
+     */
+    private EmailClientConnectionManager mConnectionManager;
+
+    public EasServerConnection(final Context context, final Account account,
+            final HostAuth hostAuth) {
+        mContext = context;
+        mHostAuth = hostAuth;
+        mAccount = account;
+        setProtocolVersion(account.mProtocolVersion);
+    }
+
+    public EasServerConnection(final Context context, final Account account) {
+        this(context, account, HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv));
+    }
+
+    protected EmailClientConnectionManager getClientConnectionManager() {
+        if (mConnectionManager == null) {
+            mConnectionManager =
+                    EasConnectionCache.instance().getConnectionManager(mContext, mHostAuth);
+        }
+        return mConnectionManager;
+    }
+
+    public void redirectHostAuth(final String newAddress) {
+        mClient = null;
+        mConnectionManager = null;
+        mHostAuth.mAddress = newAddress;
+        if (mHostAuth.isSaved()) {
+            EasConnectionCache.instance().uncacheConnectionManager(mHostAuth);
+            final ContentValues cv = new ContentValues(1);
+            cv.put(EmailContent.HostAuthColumns.ADDRESS, newAddress);
+            mHostAuth.update(mContext, cv);
+        }
+    }
+
+    private HttpClient getHttpClient(final long timeout) {
+        if (mClient == null) {
+            final HttpParams params = new BasicHttpParams();
+            HttpConnectionParams.setConnectionTimeout(params, (int)(CONNECTION_TIMEOUT));
+            HttpConnectionParams.setSoTimeout(params, (int)(timeout));
+            HttpConnectionParams.setSocketBufferSize(params, 8192);
+            mClient = new DefaultHttpClient(getClientConnectionManager(), params);
+        }
+        return mClient;
+    }
+
+    private String makeAuthString() {
+        final String cs = mHostAuth.mLogin + ":" + mHostAuth.mPassword;
+        return "Basic " + Base64.encodeToString(cs.getBytes(), Base64.NO_WRAP);
+    }
+
+    private String makeUserString() {
+        if (sDeviceId == null) {
+            sDeviceId = new AccountServiceProxy(mContext).getDeviceId();
+            if (sDeviceId == null) {
+                LogUtils.e(TAG, "Could not get device id, defaulting to '0'");
+                sDeviceId = "0";
+            }
+        }
+        return "&User=" + Uri.encode(mHostAuth.mLogin) + "&DeviceId=" +
+                sDeviceId + "&DeviceType=" + DEVICE_TYPE;
+    }
+
+    private String makeBaseUriString() {
+        return EmailClientConnectionManager.makeScheme(mHostAuth.shouldUseSsl(),
+                mHostAuth.shouldTrustAllServerCerts(), mHostAuth.mClientCertAlias) +
+                "://" + mHostAuth.mAddress + "/Microsoft-Server-ActiveSync";
+    }
+
+    public String makeUriString(final String cmd) {
+        String uriString = makeBaseUriString();
+        if (cmd != null) {
+            uriString += "?Cmd=" + cmd + makeUserString();
+        }
+        return uriString;
+    }
+
+    private String makeUriString(final String cmd, final String extra) {
+        return makeUriString(cmd) + extra;
+    }
+
+    /**
+     * If a sync causes us to update our protocol version, this function must be called so that
+     * subsequent calls to {@link #getProtocolVersion()} will do the right thing.
+     */
+    protected void setProtocolVersion(String protocolVersionString) {
+        if (protocolVersionString == null) {
+            protocolVersionString = Eas.DEFAULT_PROTOCOL_VERSION;
+        }
+        mProtocolVersion = Eas.getProtocolVersionDouble(protocolVersionString);
+    }
+
+    /**
+     * @return The protocol version for this connection.
+     */
+    public double getProtocolVersion() {
+        return mProtocolVersion;
+    }
+
+    /**
+     * Send an http OPTIONS request to server.
+     * @return The {@link EasResponse} from the Exchange server.
+     * @throws IOException
+     */
+    protected EasResponse sendHttpClientOptions() throws IOException {
+        // For OPTIONS, just use the base string and the single header
+        final HttpOptions method = new HttpOptions(URI.create(makeBaseUriString()));
+        method.setHeader("Authorization", makeAuthString());
+        method.setHeader("User-Agent", USER_AGENT);
+        return EasResponse.fromHttpRequest(getClientConnectionManager(),
+                getHttpClient(COMMAND_TIMEOUT), method);
+    }
+
+    protected void resetAuthorization(final HttpPost post) {
+        post.removeHeaders("Authorization");
+        post.setHeader("Authorization", makeAuthString());
+    }
+
+    /**
+     * Make an {@link HttpPost} for a specific request.
+     * @param uri The uri for this request, as a {@link String}.
+     * @param entity The {@link HttpEntity} for this request.
+     * @param contentType The Content-Type for this request.
+     * @param usePolicyKey Whether or not a policy key should be sent.
+     * @return
+     */
+    public HttpPost makePost(final String uri, final HttpEntity entity, final String contentType,
+            final boolean usePolicyKey) {
+        final HttpPost post = new HttpPost(uri);
+        post.setHeader("Authorization", makeAuthString());
+        post.setHeader("MS-ASProtocolVersion", String.valueOf(mProtocolVersion));
+        post.setHeader("User-Agent", USER_AGENT);
+        post.setHeader("Accept-Encoding", "gzip");
+        if (contentType != null) {
+            post.setHeader("Content-Type", contentType);
+        }
+        if (usePolicyKey) {
+            // If there's an account in existence, use its key; otherwise (we're creating the
+            // account), send "0".  The server will respond with code 449 if there are policies
+            // to be enforced
+            final String key;
+            final String accountKey = mAccount.mSecuritySyncKey;
+            if (!TextUtils.isEmpty(accountKey)) {
+                key = accountKey;
+            } else {
+                key = "0";
+            }
+            post.setHeader("X-MS-PolicyKey", key);
+        }
+        post.setEntity(entity);
+        return post;
+    }
+
+    /**
+     * Send a POST request to the server.
+     * @param cmd The command we're sending to the server.
+     * @param entity The {@link HttpEntity} containing the payload of the message.
+     * @param timeout The timeout for this POST.
+     * @return The response from the Exchange server.
+     * @throws IOException
+     */
+    protected EasResponse sendHttpClientPost(String cmd, final HttpEntity entity,
+            final long timeout) throws IOException {
+        final boolean isPingCommand = cmd.equals("Ping");
+
+        // Split the mail sending commands
+        String extra = null;
+        boolean msg = false;
+        if (cmd.startsWith("SmartForward&") || cmd.startsWith("SmartReply&")) {
+            final int cmdLength = cmd.indexOf('&');
+            extra = cmd.substring(cmdLength);
+            cmd = cmd.substring(0, cmdLength);
+            msg = true;
+        } else if (cmd.startsWith("SendMail&")) {
+            msg = true;
+        }
+
+        // Send the proper Content-Type header; it's always wbxml except for messages when
+        // the EAS protocol version is < 14.0
+        // If entity is null (e.g. for attachments), don't set this header
+        final String contentType;
+        if (msg && (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE)) {
+            contentType = MimeUtility.MIME_TYPE_RFC822;
+        } else if (entity != null) {
+            contentType = EAS_14_MIME_TYPE;
+        }
+        else {
+            contentType = null;
+        }
+        final String uriString;
+        if (extra == null) {
+            uriString = makeUriString(cmd);
+        } else {
+            uriString = makeUriString(cmd, extra);
+        }
+        final HttpPost method = makePost(uriString, entity, contentType, !isPingCommand);
+        // NOTE
+        // The next lines are added at the insistence of $VENDOR, who is seeing inappropriate
+        // network activity related to the Ping command on some networks with some servers.
+        // This code should be removed when the underlying issue is resolved
+        if (isPingCommand) {
+            method.setHeader("Connection", "close");
+        }
+        return executePost(method, timeout);
+    }
+
+    public EasResponse sendHttpClientPost(final String cmd, final byte[] bytes,
+            final long timeout) throws IOException {
+        final ByteArrayEntity entity;
+        if (bytes == null) {
+            entity = null;
+        } else {
+            entity = new ByteArrayEntity(bytes);
+        }
+        return sendHttpClientPost(cmd, entity, timeout);
+    }
+
+    protected EasResponse sendHttpClientPost(final String cmd, final byte[] bytes)
+            throws IOException {
+        return sendHttpClientPost(cmd, bytes, COMMAND_TIMEOUT);
+    }
+
+    /**
+     * Executes an {@link HttpPost}.
+     * Note: this function must not be called by multiple threads concurrently. Only one thread may
+     * send server requests from a particular object at a time.
+     * @param method The post to execute.
+     * @param timeout The timeout to use.
+     * @return The response from the Exchange server.
+     * @throws IOException
+     */
+    public EasResponse executePost(final HttpPost method, final long timeout)
+            throws IOException {
+        // The synchronized blocks are here to support the stop() function, specifically to handle
+        // when stop() is called first. Notably, they are NOT here in order to guard against
+        // concurrent access to this function, which is not supported.
+        synchronized (this) {
+            if (mStopped) {
+                mStopped = false;
+                // If this gets stopped after the POST actually starts, it throws an IOException.
+                // Therefore if we get stopped here, let's throw the same sort of exception, so
+                // callers can equate IOException with "this POST got killed for some reason".
+                throw new IOException("Command was stopped before POST");
+            }
+           mPendingPost = method;
+        }
+        boolean postCompleted = false;
+        try {
+            final EasResponse response = EasResponse.fromHttpRequest(getClientConnectionManager(),
+                    getHttpClient(timeout), method);
+            postCompleted = true;
+            return response;
+        } finally {
+            synchronized (this) {
+                mPendingPost = null;
+                if (postCompleted) {
+                    mStoppedReason = STOPPED_REASON_NONE;
+                }
+            }
+        }
+    }
+
+    protected EasResponse executePost(final HttpPost method) throws IOException {
+        return executePost(method, COMMAND_TIMEOUT);
+    }
+
+    /**
+     * If called while this object is executing a POST, interrupt it with an {@link IOException}.
+     * Otherwise cause the next attempt to execute a POST to be interrupted with an
+     * {@link IOException}.
+     * @param reason The reason for requesting a stop. This should be one of the STOPPED_REASON_*
+     *               constants defined in this class, other than {@link #STOPPED_REASON_NONE} which
+     *               is used to signify that no stop has occurred.
+     *               This class simply stores the value; subclasses are responsible for checking
+     *               this value when catching the {@link IOException} and responding appropriately.
+     */
+    public synchronized void stop(final int reason) {
+        // Only process legitimate reasons.
+        if (reason >= STOPPED_REASON_ABORT && reason <= STOPPED_REASON_RESTART) {
+            final boolean isMidPost = (mPendingPost != null);
+            LogUtils.i(TAG, "%s with reason %d", (isMidPost ? "Interrupt" : "Stop next"), reason);
+            mStoppedReason = reason;
+            if (isMidPost) {
+                mPendingPost.abort();
+            } else {
+                mStopped = true;
+            }
+        }
+    }
+
+    /**
+     * @return The reason supplied to the last call to {@link #stop}, or
+     *         {@link #STOPPED_REASON_NONE} if {@link #stop} hasn't been called since the last
+     *         successful POST.
+     */
+    public synchronized int getStoppedReason() {
+        return mStoppedReason;
+    }
+
+    /**
+     * Convenience method for adding a Message to an account's outbox
+     * @param account The {@link Account} from which to send the message.
+     * @param msg The message to send
+     */
+    protected void sendMessage(final Account account, final EmailContent.Message msg) {
+        long mailboxId = Mailbox.findMailboxOfType(mContext, account.mId, Mailbox.TYPE_OUTBOX);
+        // TODO: Improve system mailbox handling.
+        if (mailboxId == Mailbox.NO_MAILBOX) {
+            LogUtils.d(TAG, "No outbox for account %d, creating it", account.mId);
+            final Mailbox outbox =
+                    Mailbox.newSystemMailbox(mContext, account.mId, Mailbox.TYPE_OUTBOX);
+            outbox.save(mContext);
+            mailboxId = outbox.mId;
+        }
+        msg.mMailboxKey = mailboxId;
+        msg.mAccountKey = account.mId;
+        msg.save(mContext);
+        requestSyncForMailbox(new android.accounts.Account(account.mEmailAddress,
+                Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), EmailContent.AUTHORITY, mailboxId);
+    }
+
+    /**
+     * Issue a {@link android.content.ContentResolver#requestSync} for a specific mailbox.
+     * @param amAccount The {@link android.accounts.Account} for the account we're pinging.
+     * @param authority The authority for the mailbox that needs to sync.
+     * @param mailboxId The id of the mailbox that needs to sync.
+     */
+    protected static void requestSyncForMailbox(final android.accounts.Account amAccount,
+            final String authority, final long mailboxId) {
+        final Bundle extras = new Bundle(1);
+        extras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, mailboxId);
+        ContentResolver.requestSync(amAccount, authority, extras);
+    }
+
+}

diff --git a/src/com/android/exchange/service/EasSyncHandler.java b/src/com/android/exchange/service/EasSyncHandler.java
new file mode 100644
index 0000000..0054163
--- /dev/null
+++ b/src/com/android/exchange/service/EasSyncHandler.java

@@ -0,0 +1,375 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.service;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SyncResult;
+import android.net.TrafficStats;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+
+import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.CommandStatusException;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.AbstractSyncParser;
+import com.android.exchange.adapter.Parser;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpStatus;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Base class for syncing a single collection from an Exchange server. A "collection" is a single
+ * mailbox, or contacts for an account, or calendar for an account. (Tasks is part of the protocol
+ * but not implemented.)
+ * A single {@link ContentResolver#requestSync} for a single collection corresponds to a single
+ * object (of the appropriate subclass) being created and {@link #performSync} being called on it.
+ * This in turn will result in one or more Sync POST requests being sent to the Exchange server;
+ * from the client's point of view, these multiple Exchange Sync requests are all part of the same
+ * "sync" (i.e. the fact that there are multiple requests to the server is a detail of the Exchange
+ * protocol).
+ * Different collection types (e.g. mail, contacts, calendar) should subclass this class and
+ * implement the various abstract functions. The majority of how the sync flow is common to all,
+ * aside from a few details and the {@link Parser} used.
+ * Details on how this class (and Exchange Sync) works:
+ * - Overview MSDN link: http://msdn.microsoft.com/en-us/library/ee159766(v=exchg.80).aspx
+ * - Sync MSDN link: http://msdn.microsoft.com/en-us/library/gg675638(v=exchg.80).aspx
+ * - The very first time, the client sends a Sync request with SyncKey = 0 and no other parameters.
+ *   This initial Sync request simply gets us a real SyncKey.
+ *   TODO: We should add the initial Sync to {@link EasAccountSyncHandler}.
+ * - Non-initial Sync requests can be for one or more collections; this implementation does one at
+ *   a time. TODO: allow sync for multiple collections to be aggregated?
+ * - For each collection, we send SyncKey, ServerId, other modifiers, Options, and Commands. The
+ *   protocol has a specific order in which these elements must appear in the request.
+ * - {@link #buildEasRequest} forms the XML for the request, using {@link #setInitialSyncOptions},
+ *   {@link #setNonInitialSyncOptions}, and {@link #setUpsyncCommands} to fill in the details
+ *   specific for each collection type.
+ * - The Sync response may specify that there's more data available on the server, in which case
+ *   we keep sending Sync requests to get that data.
+ * - The ordering constraints and other details may require subclasses to have member variables to
+ *   store state between the various calls while performing a single Sync request. These may need
+ *   to be reset between Sync requests to the Exchange server. Additionally, there are possibly
+ *   other necessary cleanups after parsing a Sync response. These are handled in {@link #cleanup}.
+ */
+public abstract class EasSyncHandler extends EasServerConnection {
+    private static final String TAG = "EasSyncHandler";
+
+    /** Window size for PIM (contact & calendar) sync options. */
+    protected static final String PIM_WINDOW_SIZE = "4";
+
+    // TODO: For each type of failure, provide info about why.
+    protected static final int SYNC_RESULT_FAILED = -1;
+    protected static final int SYNC_RESULT_DONE = 0;
+    protected static final int SYNC_RESULT_MORE_AVAILABLE = 1;
+
+    /** Maximum number of Sync requests we'll send to the Exchange server in one sync attempt. */
+    private static final int MAX_LOOPING_COUNT = 100;
+
+    protected final ContentResolver mContentResolver;
+    protected final Mailbox mMailbox;
+    protected final Bundle mSyncExtras;
+    protected final SyncResult mSyncResult;
+
+    protected EasSyncHandler(final Context context, final ContentResolver contentResolver,
+            final Account account, final Mailbox mailbox, final Bundle syncExtras,
+            final SyncResult syncResult) {
+        super(context, account);
+        mContentResolver = contentResolver;
+        mMailbox = mailbox;
+        mSyncExtras = syncExtras;
+        mSyncResult = syncResult;
+    }
+
+    /**
+     * Create an instance of the appropriate subclass to handle sync for mailbox.
+     * @param context
+     * @param contentResolver
+     * @param accountManagerAccount The {@link android.accounts.Account} for this sync.
+     * @param account The {@link Account} for mailbox.
+     * @param mailbox The {@link Mailbox} to sync.
+     * @param syncExtras The extras for this sync, for consumption by {@link #performSync}.
+     * @param syncResult The output results for this sync, which may be written to by
+     *      {@link #performSync}.
+     * @return An appropriate EasSyncHandler for this mailbox, or null if this sync can't be
+     *      handled.
+     */
+    public static EasSyncHandler getEasSyncHandler(final Context context,
+            final ContentResolver contentResolver,
+            final android.accounts.Account accountManagerAccount,
+            final Account account, final Mailbox mailbox,
+            final Bundle syncExtras, final SyncResult syncResult) {
+        if (account != null && mailbox != null) {
+            switch (mailbox.mType) {
+                case Mailbox.TYPE_INBOX:
+                case Mailbox.TYPE_MAIL:
+                case Mailbox.TYPE_DRAFTS:
+                case Mailbox.TYPE_SENT:
+                case Mailbox.TYPE_TRASH:
+                    return new EasMailboxSyncHandler(context, contentResolver, account, mailbox,
+                            syncExtras, syncResult);
+                case Mailbox.TYPE_CALENDAR:
+                    return new EasCalendarSyncHandler(context, contentResolver,
+                            accountManagerAccount, account, mailbox, syncExtras, syncResult);
+                case Mailbox.TYPE_CONTACTS:
+                    return new EasContactsSyncHandler(context, contentResolver,
+                            accountManagerAccount, account, mailbox, syncExtras, syncResult);
+            }
+        }
+        // Unknown mailbox type.
+        return null;
+    }
+
+    // Interface for subclasses to implement:
+    // Subclasses must implement the abstract functions below to provide the information needed by
+    // performSync.
+
+    /**
+     * Get the flag for traffic bookkeeping for this sync type.
+     * @return The appropriate value from {@link TrafficFlags} for this sync.
+     */
+    protected abstract int getTrafficFlag();
+
+    /**
+     * Get the sync key for this mailbox.
+     * @return The sync key for the object being synced. "0" means this is the first sync. If
+     *      there is an error in getting the sync key, this function returns null.
+     */
+    protected abstract String getSyncKey();
+
+    /**
+     * Get the folder class name for this mailbox.
+     * @return The string for this folder class, as defined by the Exchange spec.
+     */
+    // TODO: refactor this to be the same strings as EasPingSyncHandler#handleOneMailbox.
+    protected abstract String getFolderClassName();
+
+    /**
+     * Return an {@link AbstractSyncParser} appropriate for this sync type and response.
+     * @param is The {@link InputStream} for the {@link EasResponse} for this sync.
+     * @return The {@link AbstractSyncParser} for this response.
+     * @throws IOException
+     */
+    protected abstract AbstractSyncParser getParser(final InputStream is) throws IOException;
+
+    /**
+     * Add to the {@link Serializer} for this sync the child elements of a Collection needed for an
+     * initial sync for this collection.
+     * @param s The {@link Serializer} for this sync.
+     * @throws IOException
+     */
+    protected abstract void setInitialSyncOptions(final Serializer s) throws IOException;
+
+    /**
+     * Add to the {@link Serializer} for this sync the child elements of a Collection needed for a
+     * non-initial sync for this collection, OTHER THAN Commands (which are written by
+     * {@link #setUpsyncCommands}.
+     * @param s The {@link Serializer} for this sync.
+     * @throws IOException
+     */
+    protected abstract void setNonInitialSyncOptions(final Serializer s) throws IOException;
+
+    /**
+     * Add all Commands to the {@link Serializer} for this Sync request. Strictly speaking, it's
+     * not all Upsync requests since Fetch is also a command, but largely that's what this section
+     * is used for.
+     * @param s The {@link Serializer} for this sync.
+     * @throws IOException
+     */
+    protected abstract void setUpsyncCommands(final Serializer s) throws IOException;
+
+    /**
+     * Perform any necessary cleanup after processing a Sync response.
+     */
+    protected abstract void cleanup(final int syncResult);
+
+    // End of abstract functions.
+
+    /**
+     * Shared non-initial sync options for PIM (contacts & calendar) objects.
+     * @param s The {@link Serializer} for this sync request.
+     * @param filter The lookback to use, or null if no lookback is desired.
+     * @throws IOException
+     */
+    protected void setPimSyncOptions(final Serializer s, final String filter) throws IOException {
+        s.tag(Tags.SYNC_DELETES_AS_MOVES);
+        s.tag(Tags.SYNC_GET_CHANGES);
+        s.data(Tags.SYNC_WINDOW_SIZE, PIM_WINDOW_SIZE);
+        s.start(Tags.SYNC_OPTIONS);
+        // Set the filter (lookback), if provided
+        if (filter != null) {
+            s.data(Tags.SYNC_FILTER_TYPE, filter);
+        }
+        // Set the truncation amount and body type
+        if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+            s.start(Tags.BASE_BODY_PREFERENCE);
+            // Plain text
+            s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_TEXT);
+            s.data(Tags.BASE_TRUNCATION_SIZE, Eas.EAS12_TRUNCATION_SIZE);
+            s.end();
+        } else {
+            s.data(Tags.SYNC_TRUNCATION, Eas.EAS2_5_TRUNCATION_SIZE);
+        }
+        s.end();
+    }
+
+    /**
+     * Create and populate the {@link Serializer} for this Sync POST to the Exchange server.
+     * @param syncKey The sync key to use for this request.
+     * @param initialSync Whether this sync is the first for this object.
+     * @return The {@link Serializer} for to use for this request.
+     * @throws IOException
+     */
+    private Serializer buildEasRequest(final String syncKey, final boolean initialSync)
+            throws IOException {
+        final String className = getFolderClassName();
+        LogUtils.i(TAG, "Syncing account %d mailbox %d (class %s) with syncKey %s", mAccount.mId,
+                mMailbox.mId, className, syncKey);
+
+        final Serializer s = new Serializer();
+
+        s.start(Tags.SYNC_SYNC);
+        s.start(Tags.SYNC_COLLECTIONS);
+        s.start(Tags.SYNC_COLLECTION);
+        // The "Class" element is removed in EAS 12.1 and later versions
+        if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_SP1_DOUBLE) {
+            s.data(Tags.SYNC_CLASS, className);
+        }
+        s.data(Tags.SYNC_SYNC_KEY, syncKey);
+        s.data(Tags.SYNC_COLLECTION_ID, mMailbox.mServerId);
+        if (initialSync) {
+            setInitialSyncOptions(s);
+        } else {
+            setNonInitialSyncOptions(s);
+            setUpsyncCommands(s);
+        }
+        s.end().end().end().done();
+
+        return s;
+    }
+
+    /**
+     * Interpret a successful (HTTP code = 200) response from the Exchange server.
+     * @param resp The {@link EasResponse} for the Sync message.
+     * @return One of {@link #SYNC_RESULT_FAILED}, {@link #SYNC_RESULT_MORE_AVAILABLE}, or
+     *      {@link #SYNC_RESULT_DONE} as appropriate for the server response.
+     */
+    private int parse(final EasResponse resp) {
+        try {
+            final AbstractSyncParser parser = getParser(resp.getInputStream());
+            final boolean moreAvailable = parser.parse();
+            if (moreAvailable) {
+                return SYNC_RESULT_MORE_AVAILABLE;
+            }
+        } catch (final Parser.EmptyStreamException e) {
+            // This indicates a compressed response which was empty, which is OK.
+        } catch (final IOException e) {
+            return SYNC_RESULT_FAILED;
+        } catch (final CommandStatusException e) {
+            return SYNC_RESULT_FAILED;
+        }
+        return SYNC_RESULT_DONE;
+    }
+
+    /**
+     * Send one Sync POST to the Exchange server, and handle the response.
+     * @return One of {@link #SYNC_RESULT_FAILED}, {@link #SYNC_RESULT_MORE_AVAILABLE}, or
+     *      {@link #SYNC_RESULT_DONE} as appropriate for the server response.
+     */
+    private int performOneSync() {
+        final String syncKey = getSyncKey();
+        if (syncKey == null) {
+            return SYNC_RESULT_FAILED;
+        }
+        final boolean initialSync = syncKey.equals("0");
+
+        final EasResponse resp;
+        try {
+            final Serializer s = buildEasRequest(syncKey, initialSync);
+            final long timeout = initialSync ? 120 * DateUtils.SECOND_IN_MILLIS : COMMAND_TIMEOUT;
+            resp = sendHttpClientPost("Sync", s.toByteArray(), timeout);
+        } catch (final IOException e) {
+            return SYNC_RESULT_FAILED;
+        }
+
+        final int result;
+        try {
+            final int code = resp.getStatus();
+            if (code == HttpStatus.SC_OK) {
+                // A successful sync can have an empty response -- this indicates no change.
+                // In the case of a compressed stream, resp will be non-empty, but parse() handles
+                // that case.
+                if (!resp.isEmpty()) {
+                    result = parse(resp);
+                } else {
+                    result = SYNC_RESULT_DONE;
+                }
+            } else if (resp.isProvisionError()) {
+                return SYNC_RESULT_FAILED; // TODO: Handle SyncStatus.FAILURE_SECURITY;
+            } else if (resp.isAuthError()) {
+                return SYNC_RESULT_FAILED; // TODO: Handle SyncStatus.FAILURE_LOGIN;
+            } else {
+                return SYNC_RESULT_FAILED; // TODO: Handle SyncStatus.FAILURE_OTHER;
+            }
+        } finally {
+            resp.close();
+        }
+
+        cleanup(result);
+
+        if (initialSync && result != SYNC_RESULT_FAILED) {
+            // TODO: Handle Automatic Lookback
+        }
+
+        return result;
+    }
+
+    /**
+     * Perform the sync, updating {@link #mSyncResult} as appropriate (which was passed in from
+     * the system SyncManager and will be read by it on the way out).
+     * This function can send multiple Sync messages to the Exchange server, up to
+     * {@link #MAX_LOOPING_COUNT}, due to the server replying to a Sync request with MoreAvailable.
+     * In the case of errors, this function should not attempt any retries, but rather should
+     * set {@link #mSyncResult} to reflect the problem and let the system SyncManager handle
+     * any it.
+     */
+    public final void performSync() {
+        // Set up traffic stats bookkeeping.
+        final int trafficFlags = TrafficFlags.getSyncFlags(mContext, mAccount);
+        TrafficStats.setThreadStatsTag(trafficFlags | getTrafficFlag());
+
+        // TODO: Properly handle UI status updates.
+        //syncMailboxStatus(EmailServiceStatus.IN_PROGRESS, 0);
+        int syncResult = SYNC_RESULT_MORE_AVAILABLE;
+        int loopingCount = 0;
+        while (syncResult == SYNC_RESULT_MORE_AVAILABLE && loopingCount < MAX_LOOPING_COUNT) {
+            syncResult = performOneSync();
+            // TODO: Clear pending request queue.
+            ++loopingCount;
+        }
+        if (syncResult == SYNC_RESULT_MORE_AVAILABLE) {
+            // TODO: Signal caller that it probably wants to sync again.
+        }
+    }
+}

diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
new file mode 100644
index 0000000..53b29a5
--- /dev/null
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java

@@ -0,0 +1,607 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.service;
+
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.IBinder;
+
+import com.android.emailcommon.Api;
+import com.android.emailcommon.TempDirectory;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.IEmailService;
+import com.android.emailcommon.service.IEmailServiceCallback;
+import com.android.emailcommon.service.SearchParams;
+import com.android.emailcommon.utility.Utility;
+import com.android.exchange.Eas;
+import com.android.exchange.adapter.PingParser;
+import com.android.exchange.adapter.Search;
+import com.android.exchange.eas.EasOperation;
+import com.android.exchange.eas.EasPing;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.utils.LogUtils;
+
+import java.util.HashMap;
+
+/**
+ * Service for communicating with Exchange servers. There are three main parts of this class:
+ * TODO: Flesh out these comments.
+ * 1) An {@link AbstractThreadedSyncAdapter} to handle actually performing syncs.
+ * 2) Bookkeeping for running Ping requests, which handles push notifications.
+ * 3) An {@link IEmailService} Stub to handle RPC from the UI.
+ */
+public class EmailSyncAdapterService extends AbstractSyncAdapterService {
+
+    private static final String TAG = "EASEmailSyncAdaptSvc";
+
+    /**
+     * If sync extras do not include a mailbox id, then we want to perform a full sync.
+     */
+    private static final long FULL_ACCOUNT_SYNC = Mailbox.NO_MAILBOX;
+
+    /** Projection used for getting email address for an account. */
+    private static final String[] ACCOUNT_EMAIL_PROJECTION = { AccountColumns.EMAIL_ADDRESS };
+
+    /**
+     * Bookkeeping for handling synchronization between pings and syncs.
+     * "Ping" refers to a hanging POST or GET that is used to receive push notifications. Ping is
+     * the term for the Exchange command, but this code should be generic enough to be easily
+     * extended to IMAP.
+     * "Sync" refers to an actual sync command to either fetch mail state, account state, or send
+     * mail (send is implemented as "sync the outbox").
+     * TODO: Outbox sync probably need not stop a ping in progress.
+     * Basic rules of how these interact (note that all rules are per account):
+     * - Only one ping or sync may run at a time.
+     * - Due to how {@link AbstractThreadedSyncAdapter} works, sync requests will not occur while
+     *   a sync is in progress.
+     * - On the other hand, ping requests may come in while handling a ping.
+     * - "Ping request" is shorthand for "a request to change our ping parameters", which includes
+     *   a request to stop receiving push notifications.
+     * - If neither a ping nor a sync is running, then a request for either will run it.
+     * - If a sync is running, new ping requests block until the sync completes.
+     * - If a ping is running, a new sync request stops the ping and creates a pending ping
+     *   (which blocks until the sync completes).
+     * - If a ping is running, a new ping request stops the ping and either starts a new one or
+     *   does nothing, as appopriate (since a ping request can be to stop pushing).
+     * - As an optimization, while a ping request is waiting to run, subsequent ping requests are
+     *   ignored (the pending ping will pick up the latest ping parameters at the time it runs).
+     */
+    public class SyncHandlerSynchronizer {
+        /**
+         * Map of account id -> ping handler.
+         * For a given account id, there are three possible states:
+         * 1) If no ping or sync is currently running, there is no entry in the map for the account.
+         * 2) If a ping is running, there is an entry with the appropriate ping handler.
+         * 3) If there is a sync running, there is an entry with null as the value.
+         * We cannot have more than one ping or sync running at a time.
+         */
+        private final HashMap<Long, PingTask> mPingHandlers = new HashMap<Long, PingTask>();
+
+        /**
+         * Wait until neither a sync nor a ping is running on this account, and then return.
+         * If there's a ping running, actively stop it. (For syncs, we have to just wait.)
+         * @param accountId The account we want to wait for.
+         */
+        private synchronized void waitUntilNoActivity(final long accountId) {
+            while (mPingHandlers.containsKey(accountId)) {
+                final PingTask pingHandler = mPingHandlers.get(accountId);
+                if (pingHandler != null) {
+                    pingHandler.stop();
+                }
+                try {
+                    wait();
+                } catch (final InterruptedException e) {
+                    // TODO: When would this happen, and how should I handle it?
+                }
+            }
+        }
+
+        /**
+         * Use this to see if we're currently syncing, as opposed to pinging or doing nothing.
+         * @param accountId The account to check.
+         * @return Whether that account is currently running a sync.
+         */
+        private synchronized boolean isRunningSync(final long accountId) {
+            return (mPingHandlers.containsKey(accountId) && mPingHandlers.get(accountId) == null);
+        }
+
+        /**
+         * If there are no running pings, stop the service.
+         */
+        private void stopServiceIfNoPings() {
+            for (final PingTask pingHandler : mPingHandlers.values()) {
+                if (pingHandler != null) {
+                    return;
+                }
+            }
+            EmailSyncAdapterService.this.stopSelf();
+        }
+
+        /**
+         * Called prior to starting a sync to update our bookkeeping. We don't actually run the sync
+         * here; the caller must do that.
+         * @param accountId The account on which we are running a sync.
+         */
+        public synchronized void startSync(final long accountId) {
+            waitUntilNoActivity(accountId);
+            mPingHandlers.put(accountId, null);
+        }
+
+        /**
+         * Starts or restarts a ping for an account, if the current account state indicates that it
+         * wants to push.
+         * @param account The account whose ping is being modified.
+         */
+        public synchronized void modifyPing(final Account account) {
+            // If a sync is currently running, it will start a ping when it's done, so there's no
+            // need to do anything right now.
+            if (isRunningSync(account.mId)) {
+                return;
+            }
+
+            // If a ping is currently running, tell it to restart to pick up new params.
+            final PingTask pingSyncHandler = mPingHandlers.get(account.mId);
+            if (pingSyncHandler != null) {
+                pingSyncHandler.restart();
+                return;
+            }
+
+            // If we're here, then there's neither a sync nor a ping running. Start a new ping.
+            final EmailSyncAdapterService service = EmailSyncAdapterService.this;
+            if (account.mSyncInterval == Account.CHECK_INTERVAL_PUSH) {
+                // TODO: Also check if we have any mailboxes that WANT push.
+                // This account needs to ping.
+                // Note: unlike startSync, we CANNOT allow the caller to do the actual work.
+                // If we return before the ping starts, there's a race condition where another
+                // ping or sync might start first. It only works for startSync because sync is
+                // higher priority than ping (i.e. a ping can't start while a sync is pending)
+                // and only one sync can run at a time.
+                final PingTask pingHandler = new PingTask(service, account, this);
+                mPingHandlers.put(account.mId, pingHandler);
+                pingHandler.start();
+                // Whenever we have a running ping, make sure this service stays running.
+                service.startService(new Intent(service, EmailSyncAdapterService.class));
+            }
+        }
+
+        /**
+         * Updates the synchronization bookkeeping when a sync is done.
+         * @param account The account whose sync just finished.
+         */
+        public synchronized void syncComplete(final Account account) {
+            mPingHandlers.remove(account.mId);
+            // Syncs can interrupt pings, so we should check if we need to start one now.
+            modifyPing(account);
+            stopServiceIfNoPings();
+            notifyAll();
+        }
+
+        /**
+         * Updates the synchronization bookkeeping when a ping is done. Also requests a ping-only
+         * sync if necessary.
+         * @param amAccount The {@link android.accounts.Account} for this account.
+         * @param accountId The account whose ping just finished.
+         * @param pingStatus The status value from {@link PingParser} for the last ping performed.
+         *                   This cannot be one of the values that results in another ping, so this
+         *                   function only needs to handle the terminal statuses.
+         */
+        public synchronized void pingComplete(final android.accounts.Account amAccount,
+                final long accountId, final int pingStatus) {
+            mPingHandlers.remove(accountId);
+
+            // TODO: if (pingStatus == PingParser.STATUS_FAILED), notify UI.
+            // TODO: if (pingStatus == PingParser.STATUS_REQUEST_TOO_MANY_FOLDERS), notify UI.
+
+            if (pingStatus == EasOperation.RESULT_REQUEST_FAILURE) {
+                // Request a new ping through the SyncManager. This will do the right thing if the
+                // exception was due to loss of network connectivity, etc. (i.e. it will wait for
+                // network to restore and then request it).
+                EasPing.requestPing(amAccount);
+            } else {
+                stopServiceIfNoPings();
+            }
+
+            // TODO: It might be the case that only STATUS_CHANGES_FOUND and
+            // STATUS_FOLDER_REFRESH_NEEDED need to notifyAll(). Think this through.
+            notifyAll();
+        }
+
+    }
+    private final SyncHandlerSynchronizer mSyncHandlerMap = new SyncHandlerSynchronizer();
+
+    /**
+     * The binder for IEmailService.
+     */
+    private final IEmailService.Stub mBinder = new IEmailService.Stub() {
+
+        private String getEmailAddressForAccount(final long accountId) {
+            final String emailAddress = Utility.getFirstRowString(EmailSyncAdapterService.this,
+                    Account.CONTENT_URI, ACCOUNT_EMAIL_PROJECTION, Account.ID_SELECTION,
+                    new String[] {Long.toString(accountId)}, null, 0);
+            if (emailAddress == null) {
+                LogUtils.e(TAG, "Could not find email address for account %d", accountId);
+            }
+            return emailAddress;
+        }
+
+        @Override
+        public Bundle validate(final HostAuth hostAuth) {
+            LogUtils.d(TAG, "IEmailService.validate");
+            return new EasAccountValidator(EmailSyncAdapterService.this, hostAuth).validate();
+        }
+
+        @Override
+        public Bundle autoDiscover(final String username, final String password) {
+            LogUtils.d(TAG, "IEmailService.autoDiscover");
+            return new EasAutoDiscover(EmailSyncAdapterService.this, username, password)
+                    .doAutodiscover();
+        }
+
+        @Override
+        public void updateFolderList(final long accountId) {
+            LogUtils.d(TAG, "IEmailService.updateFolderList: %d", accountId);
+            final String emailAddress = getEmailAddressForAccount(accountId);
+            if (emailAddress != null) {
+                ContentResolver.requestSync(new android.accounts.Account(
+                        emailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+                        EmailContent.AUTHORITY, new Bundle());
+            }
+        }
+
+        @Override
+        public void setLogging(final int flags) {
+            // TODO: fix this?
+            // Protocol logging
+            Eas.setUserDebug(flags);
+            // Sync logging
+            //setUserDebug(flags);
+        }
+
+        @Override
+        public void loadAttachment(final IEmailServiceCallback callback, final long attachmentId,
+                final boolean background) {
+            LogUtils.d(TAG, "IEmailService.loadAttachment: %d", attachmentId);
+            // TODO: Prevent this from happening in parallel with a sync?
+            EasAttachmentLoader.loadAttachment(EmailSyncAdapterService.this, attachmentId,
+                    callback);
+        }
+
+        @Override
+        public void sendMeetingResponse(final long messageId, final int response) {
+            LogUtils.d(TAG, "IEmailService.sendMeetingResponse: %d, %d", messageId, response);
+            EasMeetingResponder.sendMeetingResponse(EmailSyncAdapterService.this, messageId,
+                    response);
+        }
+
+        /**
+         * Delete PIM (calendar, contacts) data for the specified account
+         *
+         * @param emailAddress the email address for the account whose data should be deleted
+         */
+        @Override
+        public void deleteAccountPIMData(final String emailAddress) {
+            LogUtils.d(TAG, "IEmailService.deleteAccountPIMData");
+            if (emailAddress != null) {
+                final Context context = EmailSyncAdapterService.this;
+                EasContactsSyncHandler.wipeAccountFromContentProvider(context, emailAddress);
+                EasCalendarSyncHandler.wipeAccountFromContentProvider(context, emailAddress);
+            }
+            // TODO: Run account reconciler?
+        }
+
+        @Override
+        public int searchMessages(final long accountId, final SearchParams searchParams,
+                final long destMailboxId) {
+            LogUtils.d(TAG, "IEmailService.searchMessages");
+            return Search.searchMessages(EmailSyncAdapterService.this, accountId, searchParams,
+                    destMailboxId);
+            // TODO: may need an explicit callback to replace the one to IEmailServiceCallback.
+        }
+
+        @Override
+        public void sendMail(final long accountId) {}
+
+        @Override
+        public int getCapabilities(final Account acct) {
+            String easVersion = acct.mProtocolVersion;
+            Double easVersionDouble = 2.5D;
+            if (easVersion != null) {
+                try {
+                    easVersionDouble = Double.parseDouble(easVersion);
+                } catch (NumberFormatException e) {
+                    // Stick with 2.5
+                }
+            }
+            if (easVersionDouble >= 12.0D) {
+                return AccountCapabilities.SYNCABLE_FOLDERS |
+                        AccountCapabilities.SERVER_SEARCH |
+                        AccountCapabilities.FOLDER_SERVER_SEARCH |
+                        AccountCapabilities.SANITIZED_HTML |
+                        AccountCapabilities.SMART_REPLY |
+                        AccountCapabilities.SERVER_SEARCH |
+                        AccountCapabilities.UNDO |
+                        AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
+            } else {
+                return AccountCapabilities.SYNCABLE_FOLDERS |
+                        AccountCapabilities.SANITIZED_HTML |
+                        AccountCapabilities.SMART_REPLY |
+                        AccountCapabilities.UNDO |
+                        AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
+            }
+        }
+
+        @Override
+        public void serviceUpdated(final String emailAddress) {
+            // Not required for EAS
+        }
+
+        // All IEmailService messages below are UNCALLED in Email.
+        // TODO: Remove.
+        @Deprecated
+        @Override
+        public int getApiLevel() {
+            return Api.LEVEL;
+        }
+
+        @Deprecated
+        @Override
+        public void startSync(long mailboxId, boolean userRequest, int deltaMessageCount) {}
+
+        @Deprecated
+        @Override
+        public void stopSync(long mailboxId) {}
+
+        @Deprecated
+        @Override
+        public void loadMore(long messageId) {}
+
+        @Deprecated
+        @Override
+        public boolean createFolder(long accountId, String name) {
+            return false;
+        }
+
+        @Deprecated
+        @Override
+        public boolean deleteFolder(long accountId, String name) {
+            return false;
+        }
+
+        @Deprecated
+        @Override
+        public boolean renameFolder(long accountId, String oldName, String newName) {
+            return false;
+        }
+
+        @Deprecated
+        @Override
+        public void hostChanged(long accountId) {}
+    };
+
+    public EmailSyncAdapterService() {
+        super();
+    }
+
+    /**
+     * {@link AsyncTask} for restarting pings for all accounts that need it.
+     */
+    private static class RestartPingsTask extends AsyncTask<Void, Void, Void> {
+        private static final String PUSH_ACCOUNTS_SELECTION =
+                AccountColumns.SYNC_INTERVAL + "=" + Integer.toString(Account.CHECK_INTERVAL_PUSH);
+
+        private final ContentResolver mContentResolver;
+        private final SyncHandlerSynchronizer mSyncHandlerMap;
+
+        public RestartPingsTask(final ContentResolver contentResolver,
+                final SyncHandlerSynchronizer syncHandlerMap) {
+            mContentResolver = contentResolver;
+            mSyncHandlerMap = syncHandlerMap;
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            final Cursor c = mContentResolver.query(Account.CONTENT_URI,
+                    Account.CONTENT_PROJECTION, PUSH_ACCOUNTS_SELECTION, null, null);
+            if (c != null) {
+                try {
+                    while (c.moveToNext()) {
+                        final Account account = new Account();
+                        account.restore(c);
+                        mSyncHandlerMap.modifyPing(account);
+                    }
+                } finally {
+                    c.close();
+                }
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // Restart push for all accounts that need it.
+        new RestartPingsTask(getContentResolver(), mSyncHandlerMap).executeOnExecutor(
+                AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (intent.getAction().equals(Eas.EXCHANGE_SERVICE_INTENT_ACTION)) {
+            return mBinder;
+        }
+        return super.onBind(intent);
+    }
+
+    @Override
+    protected AbstractThreadedSyncAdapter newSyncAdapter() {
+        return new SyncAdapterImpl(this);
+    }
+
+    // TODO: Handle cancelSync() appropriately.
+    private class SyncAdapterImpl extends AbstractThreadedSyncAdapter {
+        public SyncAdapterImpl(Context context) {
+            super(context, true /* autoInitialize */);
+        }
+
+        @Override
+        public void onPerformSync(final android.accounts.Account acct, final Bundle extras,
+                final String authority, final ContentProviderClient provider,
+                final SyncResult syncResult) {
+            LogUtils.i(TAG, "performSync: extras = %s", extras.toString());
+            TempDirectory.setTempDirectory(EmailSyncAdapterService.this);
+
+            // TODO: Perform any connectivity checks, bail early if we don't have proper network
+            // for this sync operation.
+
+            final Context context = getContext();
+            final ContentResolver cr = context.getContentResolver();
+
+            // Get the EmailContent Account
+            final Account account;
+            final Cursor accountCursor = cr.query(Account.CONTENT_URI, Account.CONTENT_PROJECTION,
+                    AccountColumns.EMAIL_ADDRESS + "=?", new String[] {acct.name}, null);
+            try {
+                if (!accountCursor.moveToFirst()) {
+                    // Could not load account.
+                    // TODO: improve error handling.
+                    return;
+                }
+                account = new Account();
+                account.restore(accountCursor);
+            } finally {
+                accountCursor.close();
+            }
+            // Get the mailbox that we want to sync.
+            // There are four possibilities for Mailbox.SYNC_EXTRA_MAILBOX_ID:
+            // 1) Mailbox.SYNC_EXTRA_MAILBOX_ID_PUSH_ONLY: Restart push if appropriate.
+            // 2) Mailbox.SYNC_EXTRA_MAILBOX_ID_ACCOUNT_ONLY: Sync only the account data.
+            // 3) Not present: Perform a full account sync.
+            // 4) Non-negative value: It's an actual mailbox id, sync that mailbox only.
+            final long mailboxId = extras.getLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, FULL_ACCOUNT_SYNC);
+
+            // If we're just twiddling the push, we do the lightweight thing and just bail.
+            if (mailboxId == Mailbox.SYNC_EXTRA_MAILBOX_ID_PUSH_ONLY) {
+                mSyncHandlerMap.modifyPing(account);
+                return;
+            }
+
+            // Do the bookkeeping for starting a sync, including stopping a ping if necessary.
+            mSyncHandlerMap.startSync(account.mId);
+
+            // TODO: Should we refresh the account here? It may have changed while waiting for any
+            // pings to stop. It may not matter since the things that may have been twiddled might
+            // not affect syncing.
+
+            if (mailboxId == FULL_ACCOUNT_SYNC ||
+                    mailboxId == Mailbox.SYNC_EXTRA_MAILBOX_ID_ACCOUNT_ONLY) {
+                final EasAccountSyncHandler accountSyncHandler =
+                        new EasAccountSyncHandler(context, account);
+                accountSyncHandler.performSync();
+
+                if (mailboxId == FULL_ACCOUNT_SYNC) {
+                    // Full account sync includes all mailboxes that participate in system sync.
+                    final Cursor c = Mailbox.getMailboxIdsForSync(cr, account.mId);
+                    if (c != null) {
+                        try {
+                            while (c.moveToNext()) {
+                                syncMailbox(context, cr, acct, account, c.getLong(0), extras,
+                                        syncResult, false);
+                            }
+                        } finally {
+                            c.close();
+                        }
+                    }
+                }
+            } else {
+                // Sync the mailbox that was explicitly requested.
+                syncMailbox(context, cr, acct, account, mailboxId, extras, syncResult, true);
+            }
+
+            // Clean up the bookkeeping, including restarting ping if necessary.
+            mSyncHandlerMap.syncComplete(account);
+
+            // TODO: It may make sense to have common error handling here. Two possible mechanisms:
+            // 1) performSync return value can signal some useful info.
+            // 2) syncResult can contain useful info.
+        }
+
+        /**
+         * Update the mailbox's sync status with the provider and, if we're finished with the sync,
+         * write the last sync time as well.
+         * @param context Our {@link Context}.
+         * @param mailbox The mailbox whose sync status to update.
+         * @param cv A {@link ContentValues} object to use for updating the provider.
+         * @param syncStatus The status for the current sync.
+         */
+        private void updateMailbox(final Context context, final Mailbox mailbox,
+                final ContentValues cv, final int syncStatus) {
+            cv.put(Mailbox.UI_SYNC_STATUS, syncStatus);
+            if (syncStatus == EmailContent.SYNC_STATUS_NONE) {
+                cv.put(Mailbox.SYNC_TIME, System.currentTimeMillis());
+            }
+            mailbox.update(context, cv);
+        }
+
+        private boolean syncMailbox(final Context context, final ContentResolver cr,
+                final android.accounts.Account acct, final Account account, final long mailboxId,
+                final Bundle extras, final SyncResult syncResult, final boolean isMailboxSync) {
+            final Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
+            if (mailbox == null) {
+                return false;
+            }
+
+            final boolean success;
+            // Non-mailbox syncs are whole account syncs initiated by the AccountManager and are
+            // treated as background syncs.
+            // TODO: Push will be treated as "user" syncs, and probably should be background.
+            final ContentValues cv = new ContentValues(2);
+            updateMailbox(context, mailbox, cv, isMailboxSync ?
+                    EmailContent.SYNC_STATUS_USER : EmailContent.SYNC_STATUS_BACKGROUND);
+
+            if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
+                final EasOutboxSyncHandler outboxSyncHandler =
+                        new EasOutboxSyncHandler(context, account, mailbox);
+                outboxSyncHandler.performSync();
+                success = true;
+            } else if(mailbox.isSyncable()) {
+                final EasSyncHandler syncHandler = EasSyncHandler.getEasSyncHandler(context, cr,
+                        acct, account, mailbox, extras, syncResult);
+                success = (syncHandler != null);
+                if (syncHandler != null) {
+                    syncHandler.performSync();
+                }
+            } else {
+                success = false;
+            }
+            updateMailbox(context, mailbox, cv, EmailContent.SYNC_STATUS_NONE);
+            return success;
+        }
+    }
+}

diff --git a/src/com/android/exchange/service/PingTask.java b/src/com/android/exchange/service/PingTask.java
new file mode 100644
index 0000000..0378958
--- /dev/null
+++ b/src/com/android/exchange/service/PingTask.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.exchange.service;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import com.android.emailcommon.provider.Account;
+import com.android.exchange.adapter.PingParser;
+import com.android.exchange.eas.EasPing;
+
+/**
+ * Thread management class for Ping operations.
+ */
+public class PingTask extends AsyncTask<Void, Void, Void> {
+    private final EasPing mOperation;
+    private final EmailSyncAdapterService.SyncHandlerSynchronizer mSyncHandlerMap;
+
+    public PingTask(final Context context, final Account account,
+            final EmailSyncAdapterService.SyncHandlerSynchronizer syncHandlerMap) {
+        mOperation = new EasPing(context, account);
+        mSyncHandlerMap = syncHandlerMap;
+    }
+
+    /** Start the ping loop. */
+    public void start() {
+        executeOnExecutor(THREAD_POOL_EXECUTOR);
+    }
+
+    /** Abort the ping loop (used when another operation interrupts the ping). */
+    public void stop() {
+        mOperation.abort();
+    }
+
+    /** Restart the ping loop (used when a ping request happens during a ping). */
+    public void restart() {
+        mOperation.restart();
+    }
+
+    @Override
+    protected Void doInBackground(Void... params) {
+        int pingStatus;
+        do {
+            pingStatus = mOperation.doPing();
+        } while (PingParser.shouldPingAgain(pingStatus));
+
+        mSyncHandlerMap.pingComplete(mOperation.getAmAccount(), mOperation.getAccountId(),
+                pingStatus);
+        return null;
+    }
+}

diff --git a/exchange2/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
similarity index 98%
rename from exchange2/src/com/android/exchange/utility/CalendarUtilities.java
rename to src/com/android/exchange/utility/CalendarUtilities.java
index 2872e80..ee66ea1 100644
--- a/exchange2/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java

@@ -25,7 +25,6 @@
 import android.content.EntityIterator;
 import android.content.res.Resources;
 import android.net.Uri;
-import android.os.RemoteException;
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Events;
@@ -33,7 +32,6 @@
 import android.text.TextUtils;
 import android.text.format.Time;
 import android.util.Base64;
-import android.util.Log;
 
 import com.android.calendarcommon2.DateException;
 import com.android.calendarcommon2.Duration;
@@ -47,12 +45,11 @@
 import com.android.emailcommon.service.AccountServiceProxy;
 import com.android.emailcommon.utility.Utility;
 import com.android.exchange.Eas;
-import com.android.exchange.EasSyncService;
 import com.android.exchange.ExchangeService;
 import com.android.exchange.R;
 import com.android.exchange.adapter.Serializer;
 import com.android.exchange.adapter.Tags;
-import com.android.internal.util.ArrayUtils;
+import com.android.mail.utils.LogUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
@@ -784,6 +781,15 @@
         return tziStringToTimeZone(timeZoneString, MINUTES);
     }
 
+    static private boolean hasTimeZoneId(String[] timeZoneIds, String id) {
+    for (String timeZoneId: timeZoneIds) {
+            if (id.equals(timeZoneId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Given a String as directly read from EAS, tries to find a TimeZone in the database of all
      * time zones that corresponds to that String.  If the test time zone string includes DST and
@@ -815,7 +821,7 @@
                 // If the default time zone is a match
                 TimeZone defaultTimeZone = TimeZone.getDefault();
                 if (!defaultTimeZone.useDaylightTime() &&
-                        ArrayUtils.contains(zoneIds, defaultTimeZone.getID())) {
+                        hasTimeZoneId(zoneIds, defaultTimeZone.getID())) {
                     if (Eas.USER_LOG) {
                         ExchangeService.log(TAG, "TimeZone without DST found to be default: " +
                                 defaultTimeZone.getID());
@@ -1371,19 +1377,21 @@
         }
 
         if (Eas.USER_LOG) {
-            Log.d(Logging.LOG_TAG, "Created rrule: " + rrule);
+            LogUtils.d(Logging.LOG_TAG, "Created rrule: " + rrule);
         }
         return rrule.toString();
     }
 
     /**
      * Create a Calendar in CalendarProvider to which synced Events will be linked
-     * @param service the sync service requesting Calendar creation
+     * @param context
+     * @param contentResolver
      * @param account the account being synced
      * @param mailbox the Exchange mailbox for the calendar
      * @return the unique id of the Calendar
      */
-    static public long createCalendar(EasSyncService service, Account account, Mailbox mailbox) {
+    static public long createCalendar(final Context context, final ContentResolver contentResolver,
+            final Account account, final Mailbox mailbox) {
         // Create a Calendar object
         ContentValues cv = new ContentValues();
         // TODO How will this change if the user changes his account display name?
@@ -1401,14 +1409,13 @@
         cv.put(Calendars.ALLOWED_AVAILABILITY, ALLOWED_AVAILABILITIES);
 
         // TODO Coordinate account colors w/ Calendar, if possible
-        int color = new AccountServiceProxy(service.mContext).getAccountColor(account.mId);
+        int color = new AccountServiceProxy(context).getAccountColor(account.mId);
         cv.put(Calendars.CALENDAR_COLOR, color);
         cv.put(Calendars.CALENDAR_TIME_ZONE, Time.getCurrentTimezone());
         cv.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_OWNER);
         cv.put(Calendars.OWNER_ACCOUNT, account.mEmailAddress);
 
-        Uri uri = service.mContentResolver.insert(
-                asSyncAdapter(Calendars.CONTENT_URI, account.mEmailAddress,
+        Uri uri = contentResolver.insert(asSyncAdapter(Calendars.CONTENT_URI, account.mEmailAddress,
                         Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE), cv);
         // We save the id of the calendar into mSyncStatus
         if (uri != null) {
@@ -1974,7 +1981,7 @@
             msg.mAttachments = new ArrayList<Attachment>();
             msg.mAttachments.add(att);
         } catch (IOException e) {
-            Log.w(TAG, "IOException in createMessageForEntity");
+            LogUtils.w(TAG, "IOException in createMessageForEntity");
             return null;
         }
 
@@ -1997,18 +2004,15 @@
      *            there aren't any addressees; if false, return the Message
      *            regardless (addressees will be filled in later)
      * @return a Message with many fields pre-filled (more later)
-     * @throws RemoteException if there is an issue retrieving the Event from
-     *             CalendarProvider
      */
     static public EmailContent.Message createMessageForEventId(Context context, long eventId,
-            int messageFlag, String uid, Account account) throws RemoteException {
+            int messageFlag, String uid, Account account) {
         return createMessageForEventId(context, eventId, messageFlag, uid, account,
                 null /* specifiedAttendee */);
     }
 
     static public EmailContent.Message createMessageForEventId(Context context, long eventId,
-            int messageFlag, String uid, Account account, String specifiedAttendee)
-            throws RemoteException {
+            int messageFlag, String uid, Account account, String specifiedAttendee) {
         ContentResolver cr = context.getContentResolver();
         EntityIterator eventIterator = EventsEntity.newEntityIterator(cr.query(
                 ContentUris.withAppendedId(Events.CONTENT_URI, eventId), null, null, null, null),

diff --git a/exchange2/src/com/android/exchange/utility/FileLogger.java b/src/com/android/exchange/utility/FileLogger.java
similarity index 97%
rename from exchange2/src/com/android/exchange/utility/FileLogger.java
rename to src/com/android/exchange/utility/FileLogger.java
index bb17151..11323c2 100644
--- a/exchange2/src/com/android/exchange/utility/FileLogger.java
+++ b/src/com/android/exchange/utility/FileLogger.java

@@ -16,7 +16,6 @@
 
 package com.android.exchange.utility;
 
-import android.content.Context;
 import android.os.Environment;
 
 import java.io.FileWriter;
@@ -30,7 +29,7 @@
     public static String LOG_FILE_NAME =
         Environment.getExternalStorageDirectory() + "/emaillog.txt";
 
-    public synchronized static FileLogger getLogger (Context c) {
+    public synchronized static FileLogger getLogger() {
         LOGGER = new FileLogger();
         return LOGGER;
     }

diff --git a/exchange2/src/com/android/exchange/utility/SimpleIcsWriter.java b/src/com/android/exchange/utility/SimpleIcsWriter.java
similarity index 98%
rename from exchange2/src/com/android/exchange/utility/SimpleIcsWriter.java
rename to src/com/android/exchange/utility/SimpleIcsWriter.java
index 1bb8463..9980c96 100644
--- a/exchange2/src/com/android/exchange/utility/SimpleIcsWriter.java
+++ b/src/com/android/exchange/utility/SimpleIcsWriter.java

@@ -21,7 +21,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 /**
  * Class to generate iCalender object (*.ics) per RFC 5545.

diff --git a/exchange2/src/com/android/exchange/utility/UriCodec.java b/src/com/android/exchange/utility/UriCodec.java
similarity index 90%
rename from exchange2/src/com/android/exchange/utility/UriCodec.java
rename to src/com/android/exchange/utility/UriCodec.java
index bd3d459..815d2aa 100644
--- a/exchange2/src/com/android/exchange/utility/UriCodec.java
+++ b/src/com/android/exchange/utility/UriCodec.java

@@ -21,7 +21,25 @@
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 
-// Note: This class copied verbatim from libcore.net
+class Misc {
+    public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    private static final char[] UPPER_CASE_DIGITS = {
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+        'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+        'U', 'V', 'W', 'X', 'Y', 'Z'
+    };
+
+    public static String byteToHexString(byte b) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(UPPER_CASE_DIGITS[(b >> 4) & 0xf]);
+        sb.append(UPPER_CASE_DIGITS[b & 0xf]);
+        return sb.toString();
+    }
+}
+
+// Note: The UriCodec class is copied verbatim from libcore.net
 
 /**
  * Encodes and decodes {@code application/x-www-form-urlencoded} content.
@@ -31,7 +49,6 @@
  * character like "\u0080" may be encoded to multiple octets like %C2%80.
  */
 public abstract class UriCodec {
-    public static final Charset UTF_8 = Charset.forName("UTF-8");
 
     /**
      * Returns true if {@code c} does not need to be escaped.
@@ -137,11 +154,11 @@
     }
 
     public final void appendEncoded(StringBuilder builder, String s) {
-        appendEncoded(builder, s, UTF_8, false);
+        appendEncoded(builder, s, Misc.UTF_8, false);
     }
 
     public final void appendPartiallyEncoded(StringBuilder builder, String s) {
-        appendEncoded(builder, s, UTF_8, true);
+        appendEncoded(builder, s, Misc.UTF_8, true);
     }
 
     /**
@@ -200,7 +217,7 @@
     }
 
     public static String decode(String s) {
-        return decode(s, false, UTF_8);
+        return decode(s, false, Misc.UTF_8);
     }
 
     private static void appendHex(StringBuilder builder, String s, Charset charset) {
@@ -211,6 +228,6 @@
 
     private static void appendHex(StringBuilder sb, byte b) {
         sb.append('%');
-        sb.append(Byte.toHexString(b, true));
+        sb.append(Misc.byteToHexString(b));
     }
 }

diff --git a/exchange2/src/com/android/exchange/utility/patent_disclaimer.txt b/src/com/android/exchange/utility/patent_disclaimer.txt
similarity index 100%
rename from exchange2/src/com/android/exchange/utility/patent_disclaimer.txt
rename to src/com/android/exchange/utility/patent_disclaimer.txt


diff --git a/tests/Android.mk b/tests/Android.mk
index 0ab5427..6055226 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk

@@ -18,7 +18,8 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+#LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_SDK_VERSION := current
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -27,8 +28,8 @@
 # running the tests using an instrumentation targeting Exchange, we
 # automatically get all of its classes loaded into our environment.
 
-LOCAL_PACKAGE_NAME := ExchangeTests
+LOCAL_PACKAGE_NAME := Exchange2Tests
 
-LOCAL_INSTRUMENTATION_FOR := Exchange
+LOCAL_INSTRUMENTATION_FOR := Exchange2
 
-# include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)

diff --git a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
index 4198c08..b70d308 100644
--- a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
+++ b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java

@@ -29,17 +29,17 @@
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.text.TextUtils;
-import android.util.Log;
 
-import com.android.emailcommon.AccountManagerTypes;
 import com.android.emailcommon.Logging;
 import com.android.exchange.utility.ExchangeTestCase;
+import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+
 @MediumTest
 public class CalendarSyncEnablerTest extends ExchangeTestCase {
 
@@ -49,7 +49,7 @@
     private HashMap<Account, Boolean> origCalendarSyncStates = new HashMap<Account, Boolean>();
 
     // To make the rest of the code shorter thus more readable...
-    private static final String EAT = AccountManagerTypes.TYPE_EXCHANGE;
+    private static final String EAT = "com.android.exchange";
 
     @Override
     public void setUp() throws Exception {
@@ -179,7 +179,7 @@
         // set up on the device.  Otherwise there'll be no difference from
         // testEnableEasCalendarSync.
         if (AccountManager.get(getContext()).getAccountsByType(EAT).length > 0) {
-            Log.w(Logging.LOG_TAG, "testEnableEasCalendarSyncWithNoExchangeAccounts skipped:"
+            LogUtils.w(Logging.LOG_TAG, "testEnableEasCalendarSyncWithNoExchangeAccounts skipped:"
                     + " It only runs when there's no Exchange account on the device.");
             return;
         }
@@ -207,12 +207,11 @@
     }
 
     protected Account[] getExchangeAccounts() {
-        return AccountManager.get(getContext()).getAccountsByType(
-                AccountManagerTypes.TYPE_EXCHANGE);
+        return AccountManager.get(getContext()).getAccountsByType(EAT);
     }
 
     protected Account makeAccountManagerAccount(String username) {
-        return new Account(username, AccountManagerTypes.TYPE_EXCHANGE);
+        return new Account(username, EAT);
     }
 
     protected void createAccountManagerAccount(String username) {

diff --git a/exchange2/tests/src/com/android/exchange/EasAccountServiceTests.java b/tests/src/com/android/exchange/EasAccountServiceTests.java
similarity index 100%
rename from exchange2/tests/src/com/android/exchange/EasAccountServiceTests.java
rename to tests/src/com/android/exchange/EasAccountServiceTests.java


diff --git a/tests/src/com/android/exchange/EasOutboxServiceTests.java b/tests/src/com/android/exchange/EasOutboxServiceTests.java
index da995d1..56c2147 100644
--- a/tests/src/com/android/exchange/EasOutboxServiceTests.java
+++ b/tests/src/com/android/exchange/EasOutboxServiceTests.java

@@ -32,16 +32,12 @@
     public void testGenerateSmartSendCmd() {
         EasOutboxService svc = new EasOutboxService(mProviderContext, new Mailbox());
         // Test encoding of collection id; colon should be preserved
-        OriginalMessageInfo info = new OriginalMessageInfo("1339085683659694034", "Mail:^f", null);
+        OriginalMessageInfo info = new OriginalMessageInfo(0, "1339085683659694034", "Mail:^f");
         String cmd = svc.generateSmartSendCmd(true, info);
         assertEquals("SmartReply&ItemId=1339085683659694034&CollectionId=Mail:%5Ef", cmd);
         // Test encoding of item id
-        info = new OriginalMessageInfo("14:&3", "6", null);
+        info = new OriginalMessageInfo(0, "14:&3", "6");
         cmd = svc.generateSmartSendCmd(false, info);
         assertEquals("SmartForward&ItemId=14:%263&CollectionId=6", cmd);
-        // Test use of long id
-        info = new OriginalMessageInfo("1339085683659694034", "Mail:^f", "3232323AAA");
-        cmd = svc.generateSmartSendCmd(false, info);
-        assertEquals("SmartForward&LongId=3232323AAA", cmd);
     }
 }

diff --git a/tests/src/com/android/exchange/EasSyncServiceTests.java b/tests/src/com/android/exchange/EasSyncServiceTests.java
index 54d76b3..150b1f1 100644
--- a/tests/src/com/android/exchange/EasSyncServiceTests.java
+++ b/tests/src/com/android/exchange/EasSyncServiceTests.java

@@ -128,46 +128,4 @@
         assertEquals("https://" + HOST + "/Microsoft-Server-ActiveSync?Cmd=Sync" +
                 svc.mUserString, uriString);
     }
-
-    public void testResetHeartbeats() {
-        EasSyncService svc = new EasSyncService();
-        // Test case in which the minimum and force heartbeats need to come up
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 300;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(400);
-        assertEquals(400, svc.mPingMinHeartbeat);
-        assertEquals(1000, svc.mPingMaxHeartbeat);
-        assertEquals(400, svc.mPingHeartbeat);
-        assertEquals(400, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-
-        // Test case in which the force heartbeat needs to come up
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 100;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(150);
-        assertEquals(200, svc.mPingMinHeartbeat);
-        assertEquals(1000, svc.mPingMaxHeartbeat);
-        assertEquals(150, svc.mPingHeartbeat);
-        assertEquals(150, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-
-        // Test case in which the maximum needs to come down
-        svc.mPingMaxHeartbeat = 1000;
-        svc.mPingMinHeartbeat = 200;
-        svc.mPingHeartbeat = 800;
-        svc.mPingForceHeartbeat = 100;
-        svc.mPingHeartbeatDropped = true;
-        svc.resetHeartbeats(600);
-        assertEquals(200, svc.mPingMinHeartbeat);
-        assertEquals(600, svc.mPingMaxHeartbeat);
-        assertEquals(600, svc.mPingHeartbeat);
-        assertEquals(100, svc.mPingForceHeartbeat);
-        assertFalse(svc.mPingHeartbeatDropped);
-    }
 }

diff --git a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
index 6b30b1d..18e75bc 100644
--- a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
+++ b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java

@@ -21,7 +21,8 @@
 
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.ExchangeService.SyncError;
+import com.android.emailsync.AbstractSyncService;
+import com.android.emailsync.SyncManager.SyncError;
 import com.android.exchange.provider.EmailContentSetupUtils;
 import com.android.exchange.utility.ExchangeTestCase;
 

diff --git a/tests/src/com/android/exchange/RequestTests.java b/tests/src/com/android/exchange/RequestTests.java
index d736404..8453fd2 100644
--- a/tests/src/com/android/exchange/RequestTests.java
+++ b/tests/src/com/android/exchange/RequestTests.java

@@ -17,6 +17,7 @@
 package com.android.exchange;
 
 import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailsync.PartRequest;
 
 import android.test.AndroidTestCase;
 

diff --git a/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java b/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java
index 2e2f553..6d6fc2e 100644
--- a/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java
+++ b/tests/src/com/android/exchange/adapter/CalendarSyncAdapterTests.java

@@ -44,6 +44,9 @@
 import java.util.List;
 import java.util.TimeZone;
 
+// We can't build the commented-out methods under the SDK because the required constructor in
+// MockProvider won't build.
+
 /**
  * You can run this entire test case with:
  *   runtest -c com.android.exchange.adapter.CalendarSyncAdapterTests exchange
@@ -60,7 +63,7 @@
     private static final String SINGLE_ATTENDEE_NAME = "Bill Attendee";
 
     private Context mMockContext;
-    private MockContentResolver mMockResolver;
+    //private MockContentResolver mMockResolver;
 
     // This is the US/Pacific time zone as a base64-encoded TIME_ZONE_INFORMATION structure, as
     // it would appear coming from an Exchange server
@@ -93,15 +96,15 @@
     public void setUp() throws Exception {
         super.setUp();
 
-        mMockResolver = new MockContentResolver();
-        final String filenamePrefix = "test.";
-        RenamingDelegatingContext targetContextWrapper = new
-        RenamingDelegatingContext(
-                new MockContext2(), // The context that most methods are delegated to
-                getContext(), // The context that file methods are delegated to
-                filenamePrefix);
-        mMockContext = new IsolatedContext(mMockResolver, targetContextWrapper);
-        mMockResolver.addProvider(MockProvider.AUTHORITY, new MockProvider(mMockContext));
+//        mMockResolver = new MockContentResolver();
+//        final String filenamePrefix = "test.";
+//        RenamingDelegatingContext targetContextWrapper = new
+//        RenamingDelegatingContext(
+//                new MockContext2(), // The context that most methods are delegated to
+//                getContext(), // The context that file methods are delegated to
+//                filenamePrefix);
+//        mMockContext = new IsolatedContext(mMockResolver, targetContextWrapper);
+//        mMockResolver.addProvider(MockProvider.AUTHORITY, new MockProvider(mMockContext));
     }
 
     public CalendarSyncAdapterTests() {
@@ -266,14 +269,15 @@
         s.end();
     }
 
+    // TODO: When @hide methods are available for tests, uncomment below
     private int countInsertOperationsForTable(CalendarOperations ops, String tableName) {
         int cnt = 0;
         for (Operation op: ops) {
             ContentProviderOperation cpo =
                     AbstractSyncAdapter.operationToContentProviderOperation(op, 0);
             List<String> segments = cpo.getUri().getPathSegments();
-            if (segments.get(0).equalsIgnoreCase(tableName) &&
-                    cpo.getType() == ContentProviderOperation.TYPE_INSERT) {
+            if (segments.get(0).equalsIgnoreCase(tableName)) { // &&
+                    //cpo.getType() == ContentProviderOperation.TYPE_INSERT) {
                 cnt++;
             }
         }
@@ -344,63 +348,63 @@
         }
     }
 
-    public void testAddEvent() throws IOException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 10);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
+//    public void testAddEvent() throws IOException {
+//        TestEvent event = new TestEvent();
+//        event.setupPreAttendees();
+//        event.start(Tags.CALENDAR_ATTENDEES);
+//        addAttendeesToSerializer(event, 10);
+//        event.end(); // CALENDAR_ATTENDEES
+//        event.setupPostAttendees();
+//
+//        EasCalendarSyncParser p = event.getParser();
+//        p.addEvent(p.mOps, "1:1", false);
+//        // There should be 1 event
+//        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
+//        // Two attendees (organizer and 10 attendees)
+//        assertEquals(11, countInsertOperationsForTable(p.mOps, "attendees"));
+//        // dtstamp, meeting status, attendees, attendees redacted, and upsync prohibited
+//        assertEquals(5, countInsertOperationsForTable(p.mOps, "extendedproperties"));
+//    }
 
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        // There should be 1 event
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
-        // Two attendees (organizer and 10 attendees)
-        assertEquals(11, countInsertOperationsForTable(p.mOps, "attendees"));
-        // dtstamp, meeting status, attendees, attendees redacted, and upsync prohibited
-        assertEquals(5, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
+//    public void testAddEventIllegal() throws IOException {
+//        // We don't send a start time; the event is illegal and nothing should be added
+//        TestEvent event = new TestEvent();
+//        event.start(Tags.SYNC_APPLICATION_DATA);
+//        event.data(Tags.CALENDAR_TIME_ZONE, TEST_TIME_ZONE);
+//        event.data(Tags.CALENDAR_DTSTAMP, "20100518T213156Z");
+//        event.data(Tags.CALENDAR_SUBJECT, "Documentation");
+//        event.data(Tags.CALENDAR_UID, "4417556B-27DE-4ECE-B679-A63EFE1F9E85");
+//        event.data(Tags.CALENDAR_ORGANIZER_NAME, "Fred Squatibuquitas");
+//        event.data(Tags.CALENDAR_ORGANIZER_EMAIL, "fred.squatibuquitas@prettylongdomainname.com");
+//        event.start(Tags.CALENDAR_ATTENDEES);
+//        addAttendeesToSerializer(event, 10);
+//        event.end(); // CALENDAR_ATTENDEES
+//        event.setupPostAttendees();
+//
+//        EasCalendarSyncParser p = event.getParser();
+//        p.addEvent(p.mOps, "1:1", false);
+//        assertEquals(0, countInsertOperationsForTable(p.mOps, "events"));
+//        assertEquals(0, countInsertOperationsForTable(p.mOps, "attendees"));
+//        assertEquals(0, countInsertOperationsForTable(p.mOps, "extendedproperties"));
+//    }
 
-    public void testAddEventIllegal() throws IOException {
-        // We don't send a start time; the event is illegal and nothing should be added
-        TestEvent event = new TestEvent();
-        event.start(Tags.SYNC_APPLICATION_DATA);
-        event.data(Tags.CALENDAR_TIME_ZONE, TEST_TIME_ZONE);
-        event.data(Tags.CALENDAR_DTSTAMP, "20100518T213156Z");
-        event.data(Tags.CALENDAR_SUBJECT, "Documentation");
-        event.data(Tags.CALENDAR_UID, "4417556B-27DE-4ECE-B679-A63EFE1F9E85");
-        event.data(Tags.CALENDAR_ORGANIZER_NAME, "Fred Squatibuquitas");
-        event.data(Tags.CALENDAR_ORGANIZER_EMAIL, "fred.squatibuquitas@prettylongdomainname.com");
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 10);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "events"));
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "attendees"));
-        assertEquals(0, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
-
-    public void testAddEventRedactedAttendees() throws IOException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeesToSerializer(event, 100);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
-
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", false);
-        // There should be 1 event
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
-        // One attendees (organizer; all others are redacted)
-        assertEquals(1, countInsertOperationsForTable(p.mOps, "attendees"));
-        // dtstamp, meeting status, and attendees redacted
-        assertEquals(3, countInsertOperationsForTable(p.mOps, "extendedproperties"));
-    }
+//    public void testAddEventRedactedAttendees() throws IOException {
+//        TestEvent event = new TestEvent();
+//        event.setupPreAttendees();
+//        event.start(Tags.CALENDAR_ATTENDEES);
+//        addAttendeesToSerializer(event, 100);
+//        event.end(); // CALENDAR_ATTENDEES
+//        event.setupPostAttendees();
+//
+//        EasCalendarSyncParser p = event.getParser();
+//        p.addEvent(p.mOps, "1:1", false);
+//        // There should be 1 event
+//        assertEquals(1, countInsertOperationsForTable(p.mOps, "events"));
+//        // One attendees (organizer; all others are redacted)
+//        assertEquals(1, countInsertOperationsForTable(p.mOps, "attendees"));
+//        // dtstamp, meeting status, and attendees redacted
+//        assertEquals(3, countInsertOperationsForTable(p.mOps, "extendedproperties"));
+//    }
 
     /**
      * Setup for the following three tests, which check attendee status of an added event
@@ -411,67 +415,67 @@
      * @throws RemoteException
      * @throws OperationApplicationException
      */
-    private Cursor setupAddEventOneAttendee(String userEmail, boolean update)
-            throws IOException, RemoteException, OperationApplicationException {
-        TestEvent event = new TestEvent();
-        event.setupPreAttendees();
-        event.start(Tags.CALENDAR_ATTENDEES);
-        addAttendeeToSerializer(event, SINGLE_ATTENDEE_EMAIL, SINGLE_ATTENDEE_NAME);
-        event.setUserEmailAddress(userEmail);
-        event.end(); // CALENDAR_ATTENDEES
-        event.setupPostAttendees();
+//    private Cursor setupAddEventOneAttendee(String userEmail, boolean update)
+//            throws IOException, RemoteException, OperationApplicationException {
+//        TestEvent event = new TestEvent();
+//        event.setupPreAttendees();
+//        event.start(Tags.CALENDAR_ATTENDEES);
+//        addAttendeeToSerializer(event, SINGLE_ATTENDEE_EMAIL, SINGLE_ATTENDEE_NAME);
+//        event.setUserEmailAddress(userEmail);
+//        event.end(); // CALENDAR_ATTENDEES
+//        event.setupPostAttendees();
+//
+//        EasCalendarSyncParser p = event.getParser();
+//        p.addEvent(p.mOps, "1:1", update);
+//        // Send the CPO's to the mock provider
+//        ArrayList<ContentProviderOperation> cpos = new ArrayList<ContentProviderOperation>();
+//        for (Operation op: p.mOps) {
+//            cpos.add(AbstractSyncAdapter.operationToContentProviderOperation(op, 0));
+//        }
+//        mMockResolver.applyBatch(MockProvider.AUTHORITY, cpos);
+//        return mMockResolver.query(MockProvider.uri(Attendees.CONTENT_URI), ATTENDEE_PROJECTION,
+//                null, null, null);
+//    }
 
-        EasCalendarSyncParser p = event.getParser();
-        p.addEvent(p.mOps, "1:1", update);
-        // Send the CPO's to the mock provider
-        ArrayList<ContentProviderOperation> cpos = new ArrayList<ContentProviderOperation>();
-        for (Operation op: p.mOps) {
-            cpos.add(AbstractSyncAdapter.operationToContentProviderOperation(op, 0));
-        }
-        mMockResolver.applyBatch(MockProvider.AUTHORITY, cpos);
-        return mMockResolver.query(MockProvider.uri(Attendees.CONTENT_URI), ATTENDEE_PROJECTION,
-                null, null, null);
-    }
-
-    public void testAddEventOneAttendee() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee("foo@bar.com", false);
-        assertEquals(2, c.getCount());
-        // The organizer should be "accepted", the unknown attendee "none"
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
-
-    public void testAddEventSelfAttendee() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, false);
-        // The organizer should be "accepted", and our user/attendee should be "done" even though
-        // the busy status = 2 (because we can't tell from a status of 2 on new events)
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
-
-    public void testAddEventSelfAttendeeUpdate() throws IOException, RemoteException,
-            OperationApplicationException {
-        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, true);
-        // The organizer should be "accepted", and our user/attendee should be "accepted" (because
-        // busy status = 2 and this is an update
-        while (c.moveToNext()) {
-            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            } else {
-                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
-            }
-        }
-    }
+//    public void testAddEventOneAttendee() throws IOException, RemoteException,
+//            OperationApplicationException {
+//        Cursor c = setupAddEventOneAttendee("foo@bar.com", false);
+//        assertEquals(2, c.getCount());
+//        // The organizer should be "accepted", the unknown attendee "none"
+//        while (c.moveToNext()) {
+//            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
+//                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
+//            } else {
+//                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
+//            }
+//        }
+//    }
+//
+//    public void testAddEventSelfAttendee() throws IOException, RemoteException,
+//            OperationApplicationException {
+//        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, false);
+//        // The organizer should be "accepted", and our user/attendee should be "done" even though
+//        // the busy status = 2 (because we can't tell from a status of 2 on new events)
+//        while (c.moveToNext()) {
+//            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
+//                assertEquals(Attendees.ATTENDEE_STATUS_NONE, c.getInt(ATTENDEE_STATUS));
+//            } else {
+//                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
+//            }
+//        }
+//    }
+//
+//    public void testAddEventSelfAttendeeUpdate() throws IOException, RemoteException,
+//            OperationApplicationException {
+//        Cursor c = setupAddEventOneAttendee(SINGLE_ATTENDEE_EMAIL, true);
+//        // The organizer should be "accepted", and our user/attendee should be "accepted" (because
+//        // busy status = 2 and this is an update
+//        while (c.moveToNext()) {
+//            if (SINGLE_ATTENDEE_EMAIL.equals(c.getString(ATTENDEE_EMAIL))) {
+//                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
+//            } else {
+//                assertEquals(Attendees.ATTENDEE_STATUS_ACCEPTED, c.getInt(ATTENDEE_STATUS));
+//            }
+//        }
+//    }
 }

diff --git a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
index dc5d15b..3f11496 100644
--- a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
+++ b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java

@@ -22,7 +22,9 @@
 import android.test.suitebuilder.annotation.MediumTest;
 
 import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
 import com.android.emailcommon.service.SyncWindow;
 import com.android.exchange.CommandStatusException;
 import com.android.exchange.EasSyncService;
@@ -50,70 +52,6 @@
         super();
     }
 
-    public void testIsValidMailFolder() throws IOException {
-        EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
-        FolderSyncParser parser = new FolderSyncParser(getTestInputStream(), adapter);
-        HashMap<String, Mailbox> mailboxMap = new HashMap<String, Mailbox>();
-        // The parser needs the mAccount set
-        parser.mAccount = mAccount;
-        mAccount.save(getContext());
-
-        // Don't save the box; just create it, and give it a server id
-        Mailbox boxMailType = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_MAIL);
-        boxMailType.mServerId = "__1:1";
-        // Automatically valid since TYPE_MAIL
-        assertTrue(parser.isValidMailFolder(boxMailType, mailboxMap));
-
-        Mailbox boxCalendarType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_CALENDAR);
-        Mailbox boxContactsType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_CONTACTS);
-        Mailbox boxTasksType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_TASKS);
-        // Automatically invalid since TYPE_CALENDAR and TYPE_CONTACTS
-        assertFalse(parser.isValidMailFolder(boxCalendarType, mailboxMap));
-        assertFalse(parser.isValidMailFolder(boxContactsType, mailboxMap));
-        assertFalse(parser.isValidMailFolder(boxTasksType, mailboxMap));
-
-        // Unknown boxes are invalid unless they have a parent that's valid
-        Mailbox boxUnknownType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId, false,
-                mProviderContext, Mailbox.TYPE_UNKNOWN);
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        boxUnknownType.mParentServerId = boxMailType.mServerId;
-        // We shouldn't find the parent yet
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        // Put the mailbox in the map; the unknown box should now be valid
-        mailboxMap.put(boxMailType.mServerId, boxMailType);
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-
-        // Clear the map, but save away the parent box
-        mailboxMap.clear();
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        boxMailType.save(mProviderContext);
-        // The box should now be valid
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-
-        // Somewhat harder case.  The parent will be in the map, but also unknown.  The parent's
-        // parent will be in the database.
-        Mailbox boxParentUnknownType = EmailContentSetupUtils.setupMailbox("box", mAccount.mId,
-                false, mProviderContext, Mailbox.TYPE_UNKNOWN);
-        assertFalse(parser.isValidMailFolder(boxParentUnknownType, mailboxMap));
-        // Give the unknown type parent a parent (boxMailType)
-        boxParentUnknownType.mServerId = "__1:2";
-        boxParentUnknownType.mParentServerId = boxMailType.mServerId;
-        // Give our unknown box an unknown parent
-        boxUnknownType.mParentServerId = boxParentUnknownType.mServerId;
-        // Confirm the box is still invalid
-        assertFalse(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-        // Put the unknown type parent into the mailbox map
-        mailboxMap.put(boxParentUnknownType.mServerId, boxParentUnknownType);
-        // Our unknown box should now be valid, because 1) the parent is unknown, BUT 2) the
-        // parent's parent is a mail type
-        assertTrue(parser.isValidMailFolder(boxUnknownType, mailboxMap));
-    }
-
     private Mailbox setupBoxSync(int interval, int lookback, String serverId) {
         // Don't save the box; just create it, and give it a server id
         Mailbox box = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, false,
@@ -148,17 +86,17 @@
         parser.mContentResolver = mProviderContext.getContentResolver();
 
         // Don't save the box; just create it, and give it a server id
-        Mailbox box1 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox box1 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 null);
-        Mailbox box2 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox box2 = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 null);
         Mailbox boxa = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_1_MONTH,
                 null);
         Mailbox boxb = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_2_WEEKS,
                 null);
-        Mailbox boxc = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxc = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 null);
-        Mailbox boxd = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxd = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 null);
         Mailbox boxe = setupBoxSync(Account.CHECK_INTERVAL_PUSH, SyncWindow.SYNC_WINDOW_1_DAY,
                 null);
@@ -178,19 +116,19 @@
                 new String[] {parser.mAccountIdAsString});
 
         // Create new boxes, all with default values for interval & window
-        Mailbox box1x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox box1x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 box1.mServerId);
-        Mailbox box2x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox box2x = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 box2.mServerId);
-        Mailbox boxax = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxax = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 boxa.mServerId);
-        Mailbox boxbx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxbx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 boxb.mServerId);
-        Mailbox boxcx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxcx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 boxc.mServerId);
-        Mailbox boxdx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxdx = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 boxd.mServerId);
-        Mailbox boxex = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_UNKNOWN,
+        Mailbox boxex = setupBoxSync(Account.CHECK_INTERVAL_NEVER, SyncWindow.SYNC_WINDOW_ACCOUNT,
                 boxe.mServerId);
 
         // Restore the sync options
@@ -361,7 +299,7 @@
      * @throws CommandStatusException
      */
     private void testComplexFolderListParse(String fileName) throws IOException,
-    CommandStatusException {
+            CommandStatusException {
         EasSyncService service = getTestService();
         EmailSyncAdapter adapter = new EmailSyncAdapter(service);
         FolderSyncParser parser = new MockFolderSyncParser(fileName, adapter);
@@ -415,4 +353,24 @@
     public void testComplexFolderListParse2() throws CommandStatusException, IOException {
         testComplexFolderListParse("FolderSyncParserTest2.txt");
     }
+
+    // Much larger test (from user with issues related to Type 1 folders)
+    public void testComplexFolderListParse3() throws CommandStatusException, IOException {
+        EasSyncService service = getTestService();
+        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
+        FolderSyncParser parser = new MockFolderSyncParser("FolderSyncParserTest3.txt", adapter);
+        mAccount.save(mProviderContext);
+        mMailboxQueryArgs[0] = Long.toString(mAccount.mId);
+        parser.mAccount = mAccount;
+        parser.mAccountId = mAccount.mId;
+        parser.mAccountIdAsString = Long.toString(mAccount.mId);
+        parser.mContext = mProviderContext;
+        parser.mContentResolver = mResolver;
+        parser.parse();
+
+        int cnt = EmailContent.count(mProviderContext, Mailbox.CONTENT_URI,
+                MailboxColumns.ACCOUNT_KEY + "=" + mAccount.mId, null);
+        // 270 in the file less 4 "conflicts" folders
+        assertEquals(266, cnt);
+    }
 }

diff --git a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
index 57b5fb9..0a7714a 100644
--- a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
+++ b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java

@@ -19,6 +19,7 @@
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
 import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.MailboxUtilities;
 import com.android.exchange.utility.ExchangeTestCase;
 
 import android.content.ContentResolver;
@@ -43,9 +44,11 @@
     // Flag sets found in regular email folders that are parents or children
     private static final int PARENT_FLAGS =
             Mailbox.FLAG_ACCEPTS_MOVED_MAIL | Mailbox.FLAG_HOLDS_MAIL |
-            Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE;
+            Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE |
+            Mailbox.FLAG_SUPPORTS_SETTINGS;
     private static final int CHILD_FLAGS =
-            Mailbox.FLAG_ACCEPTS_MOVED_MAIL | Mailbox.FLAG_HOLDS_MAIL;
+            Mailbox.FLAG_ACCEPTS_MOVED_MAIL | Mailbox.FLAG_HOLDS_MAIL |
+            Mailbox.FLAG_SUPPORTS_SETTINGS;
 
     @Override
     public void setUp() throws Exception {
@@ -97,10 +100,10 @@
 
         // Test that flags and parent key are set properly
         assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_HAS_CHILDREN |
-                Mailbox.FLAG_CHILDREN_VISIBLE, box1.mFlags);
+                Mailbox.FLAG_CHILDREN_VISIBLE | Mailbox.FLAG_SUPPORTS_SETTINGS, box1.mFlags);
         assertEquals(-1, box1.mParentKey);
 
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL, box2.mFlags);
+        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_SUPPORTS_SETTINGS, box2.mFlags);
         assertEquals(box1.mId, box2.mParentKey);
 
         assertEquals(Mailbox.FLAG_HAS_CHILDREN | Mailbox.FLAG_CHILDREN_VISIBLE, box3.mFlags);
@@ -109,7 +112,8 @@
         assertEquals(0, box4.mFlags);
         assertEquals(box3.mId, box4.mParentKey);
 
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_ACCEPTS_MOVED_MAIL, box5.mFlags);
+        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_ACCEPTS_MOVED_MAIL |
+                Mailbox.FLAG_SUPPORTS_SETTINGS, box5.mFlags);
         assertEquals(box3.mId, box5.mParentKey);
     }
 
@@ -201,7 +205,7 @@
                 "box3", mAccount.mId, false, mProviderContext, Mailbox.TYPE_MAIL, box2);
         box3.mParentKey = Mailbox.PARENT_KEY_UNINITIALIZED;
         box3.save(mProviderContext);
-        simulateFolderSyncChangeHandling(accountSelector, box2 /*box3's parent*/);
+        simulateFolderSyncChangeHandling(accountSelector, box3 /*box3's parent*/);
 
         box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
         box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
@@ -561,7 +565,7 @@
         // Box 2 should be a child with no parent (see above).  Since it's an outbox, the flags are
         // only "holds mail".
         assertEquals(Mailbox.NO_MAILBOX, box2.mParentKey);
-        assertEquals(Mailbox.FLAG_HOLDS_MAIL, box2.mFlags);
+        assertEquals(Mailbox.FLAG_HOLDS_MAIL | Mailbox.FLAG_SUPPORTS_SETTINGS, box2.mFlags);
     }
 
     /**
@@ -623,7 +627,6 @@
         assertEquals(box2.mId, box3.mParentKey);
     }
 
-
     /**
      * Tests the proper separation of two accounts using the methodology from the previous test.
      * This test will fail if MailboxUtilities fails to distinguish between mailboxes in different
@@ -759,4 +762,64 @@
         assertEquals(CHILD_FLAGS, box6.mFlags);
         assertEquals(box5.mId, box6.mParentKey);
     }
+
+    /**
+     * Tests the proper separation of two accounts using the methodology from the previous test.
+     * This test will fail if MailboxUtilities fails to distinguish between mailboxes in different
+     * accounts that happen to have the same serverId
+     */
+    public void testSetupHierarchicalNames() {
+        // Set up account and mailboxes
+        mAccount = setupTestAccount("acct1", true);
+        long accountId = mAccount.mId;
+
+        // Box3 is in Box1
+        Mailbox box1 = EmailContentSetupUtils.setupMailbox(
+                "box1", accountId, false, mProviderContext, Mailbox.TYPE_MAIL);
+        box1.mServerId = "1:1";
+        box1.save(mProviderContext);
+        Mailbox box2 = EmailContentSetupUtils.setupMailbox(
+                "box2", accountId, false, mProviderContext, Mailbox.TYPE_MAIL);
+        box2.mServerId = "1:2";
+        box2.save(mProviderContext);
+        Mailbox box3 = EmailContentSetupUtils.setupMailbox(
+                "box3", accountId, false, mProviderContext, Mailbox.TYPE_MAIL, box1);
+        box3.mServerId = "1:3";
+        box3.save(mProviderContext);
+
+        // Box4 is in Box2; Box5 is in Box4; Box 6 is in Box5
+        Mailbox box4 = EmailContentSetupUtils.setupMailbox(
+                "box4", accountId, false, mProviderContext, Mailbox.TYPE_MAIL, box2);
+        box4.mServerId = "1:4";
+        box4.save(mProviderContext);
+        Mailbox box5 = EmailContentSetupUtils.setupMailbox(
+                "box5", accountId, false, mProviderContext, Mailbox.TYPE_MAIL, box4);
+        box5.mServerId = "1:5";
+        box5.save(mProviderContext);
+        Mailbox box6 = EmailContentSetupUtils.setupMailbox(
+                "box6", accountId, false, mProviderContext, Mailbox.TYPE_MAIL, box5);
+        box6.mServerId = "1:6";
+        box6.save(mProviderContext);
+
+        // Setup hierarchy
+        String accountSelector1 = MailboxColumns.ACCOUNT_KEY + " IN (" + accountId + ")";
+        MailboxUtilities.fixupUninitializedParentKeys(mProviderContext, accountSelector1);
+        // Setup hierarchy names
+        MailboxUtilities.setupHierarchicalNames(mProviderContext, accountId);
+        box1 = Mailbox.restoreMailboxWithId(mProviderContext, box1.mId);
+        box2 = Mailbox.restoreMailboxWithId(mProviderContext, box2.mId);
+        box3 = Mailbox.restoreMailboxWithId(mProviderContext, box3.mId);
+        box4 = Mailbox.restoreMailboxWithId(mProviderContext, box4.mId);
+        box5 = Mailbox.restoreMailboxWithId(mProviderContext, box5.mId);
+        box6 = Mailbox.restoreMailboxWithId(mProviderContext, box6.mId);
+
+        // box1 and box don't need a hierarchy, so the column is null
+        assertNull(box1.mHierarchicalName);
+        assertNull(box2.mHierarchicalName);
+        // the others have various levels of depth
+        assertEquals("box1/box3", box3.mHierarchicalName);
+        assertEquals("box2/box4", box4.mHierarchicalName);
+        assertEquals("box2/box4/box5", box5.mHierarchicalName);
+        assertEquals("box2/box4/box5/box6", box6.mHierarchicalName);
+    }
 }

diff --git a/tests/src/com/android/exchange/provider/MockProvider.java b/tests/src/com/android/exchange/provider/MockProvider.java
index 177ec55..009c5e1 100644
--- a/tests/src/com/android/exchange/provider/MockProvider.java
+++ b/tests/src/com/android/exchange/provider/MockProvider.java

@@ -61,6 +61,9 @@
  *
  *     NOTE: See MockProviderTests for usage examples
  **/
+
+// The constructor call below is commented out because it won't compile under SDK
+
 public class MockProvider extends ContentProvider {
     public static final String AUTHORITY = "com.android.exchange.mock.provider";
     /*package*/ static final UriMatcher sURIMatcher = new UriMatcher(UriMatcher.NO_MATCH);
@@ -70,9 +73,9 @@
 
     public static final String ID_COLUMN = "_id";
 
-    public MockProvider(Context context) {
-        super(context, null, null, null);
-    }
+    //    public MockProvider(Context context) {
+    //        super(context, null, null, null);
+    //    }
 
     public MockProvider() {
         super();
@@ -90,7 +93,7 @@
      */
     public static Uri uri(Uri uri) {
         return new Uri.Builder().scheme("content").authority(AUTHORITY)
-            .path(uri.getPath().substring(1)).build();
+                .path(uri.getPath().substring(1)).build();
     }
 
     @Override

diff --git a/tests/src/com/android/exchange/provider/MockProviderTests.java b/tests/src/com/android/exchange/provider/MockProviderTests.java
index 897f0d8..854b6ff 100644
--- a/tests/src/com/android/exchange/provider/MockProviderTests.java
+++ b/tests/src/com/android/exchange/provider/MockProviderTests.java

@@ -35,10 +35,13 @@
  * You can run this entire test case with:
  *   runtest -c com.android.exchange.provider.MockProviderTests exchange
  */
+
+// These tests won't run because MockProvider can't be built under the SDK
+
 @SmallTest
 public class MockProviderTests extends ProviderTestCase2<MockProvider> {
     Context mMockContext;
-    MockContentResolver mMockResolver;
+    //MockContentResolver mMockResolver;
 
     private static final String CANHAZ_AUTHORITY = "com.android.canhaz";
     private static final String PONY_TABLE = "pony";
@@ -62,8 +65,8 @@
     public void setUp() throws Exception {
         super.setUp();
         mMockContext = getMockContext();
-        mMockResolver = (MockContentResolver)mMockContext.getContentResolver();
-        mMockResolver.addProvider(CANHAZ_AUTHORITY, new MockProvider(mMockContext));
+        //mMockResolver = (MockContentResolver)mMockContext.getContentResolver();
+        //mMockResolver.addProvider(CANHAZ_AUTHORITY, new MockProvider(mMockContext));
     }
 
     @Override
@@ -80,113 +83,113 @@
         return cv;
     }
 
-    private ContentProviderResult[] setupPonies() throws RemoteException,
-            OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        Uri uri = new Uri.Builder().scheme("content").authority(CANHAZ_AUTHORITY)
-            .path(PONY_TABLE).build();
-        // Our array of CPO's to be used with applyBatch
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-
-        // Insert two ponies
-        ContentValues pony1 = ponyValues("Flicka", "wayward", 4, true);
-        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony1).build());
-        ContentValues pony2 = ponyValues("Elise", "dastardly", 3, false);
-        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony2).build());
-        // Apply the batch with one insert operation
-        return mMockResolver.applyBatch(MockProvider.AUTHORITY, ops);
-    }
+//    private ContentProviderResult[] setupPonies() throws RemoteException,
+//            OperationApplicationException {
+//        // The Uri is content://com.android.canhaz/pony
+//        Uri uri = new Uri.Builder().scheme("content").authority(CANHAZ_AUTHORITY)
+//            .path(PONY_TABLE).build();
+//        // Our array of CPO's to be used with applyBatch
+//        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+//
+//        // Insert two ponies
+//        ContentValues pony1 = ponyValues("Flicka", "wayward", 4, true);
+//        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony1).build());
+//        ContentValues pony2 = ponyValues("Elise", "dastardly", 3, false);
+//        ops.add(ContentProviderOperation.newInsert(uri).withValues(pony2).build());
+//        // Apply the batch with one insert operation
+//        return mMockResolver.applyBatch(MockProvider.AUTHORITY, ops);
+//    }
 
     private Uri getPonyUri() {
         return new Uri.Builder().scheme("content").authority(CANHAZ_AUTHORITY)
             .path(PONY_TABLE).build();
     }
 
-    public void testInsertQueryandDelete() throws RemoteException, OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        ContentProviderResult[] results = setupPonies();
-        Uri uri = getPonyUri();
-
-        // Check the results
-        assertNotNull(results);
-        assertEquals(2, results.length);
-        // Make sure that we've created matcher entries for pony and pony/#
-        assertEquals(MockProvider.TABLE, MockProvider.sURIMatcher.match(MockProvider.uri(uri)));
-        assertEquals(MockProvider.RECORD,
-                MockProvider.sURIMatcher.match(MockProvider.uri(results[0].uri)));
-        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        assertEquals(2, c.getCount());
-        long eliseId = -1;
-        long flickaId = -1;
-        while (c.moveToNext()) {
-            String name = c.getString(PONY_NAME);
-            if ("Flicka".equals(name)) {
-                assertEquals("Flicka", c.getString(PONY_NAME));
-                assertEquals("wayward", c.getString(PONY_TYPE));
-                assertEquals(4, c.getInt(PONY_LEGS));
-                assertEquals(1, c.getInt(PONY_CAN_RIDE));
-                flickaId = c.getLong(PONY_ID);
-            } else if ("Elise".equals(name)) {
-                assertEquals("dastardly", c.getString(PONY_TYPE));
-                assertEquals(3, c.getInt(PONY_LEGS));
-                assertEquals(0, c.getInt(PONY_CAN_RIDE));
-                eliseId = c.getLong(PONY_ID);
-            } else {
-                fail("Wrong record: " + name);
-            }
-        }
-
-        // eliseId and flickaId should have been set
-        assertNotSame(-1, eliseId);
-        assertNotSame(-1, flickaId);
-        // Delete the elise record
-        assertEquals(1, mMockResolver.delete(ContentUris.withAppendedId(MockProvider.uri(uri),
-                eliseId), null, null));
-        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        // There should be one left (Flicka)
-        assertEquals(1, c.getCount());
-        assertTrue(c.moveToNext());
-        assertEquals("Flicka", c.getString(PONY_NAME));
-    }
-
-    public void testUpdate() throws RemoteException, OperationApplicationException {
-        // The Uri is content://com.android.canhaz/pony
-        Uri uri = getPonyUri();
-        setupPonies();
-        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        assertEquals(2, c.getCount());
-        // Give all the ponies 5 legs
-        ContentValues cv = new ContentValues();
-        cv.put(PONY_COLUMN_LEGS, 5);
-        assertEquals(2, mMockResolver.update(MockProvider.uri(uri), cv, null, null));
-        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
-        assertNotNull(c);
-        // We should still have two records, and each should have 5 legs, but otherwise be the same
-        assertEquals(2, c.getCount());
-        long eliseId = -1;
-        long flickaId = -1;
-        while (c.moveToNext()) {
-            String name = c.getString(PONY_NAME);
-            if ("Flicka".equals(name)) {
-                assertEquals("Flicka", c.getString(PONY_NAME));
-                assertEquals("wayward", c.getString(PONY_TYPE));
-                assertEquals(5, c.getInt(PONY_LEGS));
-                assertEquals(1, c.getInt(PONY_CAN_RIDE));
-                flickaId = c.getLong(PONY_ID);
-            } else if ("Elise".equals(name)) {
-                assertEquals("dastardly", c.getString(PONY_TYPE));
-                assertEquals(5, c.getInt(PONY_LEGS));
-                assertEquals(0, c.getInt(PONY_CAN_RIDE));
-                eliseId = c.getLong(PONY_ID);
-            } else {
-                fail("Wrong record: " + name);
-            }
-        }
-        // eliseId and flickaId should have been set
-        assertNotSame(-1, eliseId);
-        assertNotSame(-1, flickaId);
-    }
+//    public void testInsertQueryandDelete() throws RemoteException, OperationApplicationException {
+//        // The Uri is content://com.android.canhaz/pony
+//        ContentProviderResult[] results = setupPonies();
+//        Uri uri = getPonyUri();
+//
+//        // Check the results
+//        assertNotNull(results);
+//        assertEquals(2, results.length);
+//        // Make sure that we've created matcher entries for pony and pony/#
+//        assertEquals(MockProvider.TABLE, MockProvider.sURIMatcher.match(MockProvider.uri(uri)));
+//        assertEquals(MockProvider.RECORD,
+//                MockProvider.sURIMatcher.match(MockProvider.uri(results[0].uri)));
+//        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
+//        assertNotNull(c);
+//        assertEquals(2, c.getCount());
+//        long eliseId = -1;
+//        long flickaId = -1;
+//        while (c.moveToNext()) {
+//            String name = c.getString(PONY_NAME);
+//            if ("Flicka".equals(name)) {
+//                assertEquals("Flicka", c.getString(PONY_NAME));
+//                assertEquals("wayward", c.getString(PONY_TYPE));
+//                assertEquals(4, c.getInt(PONY_LEGS));
+//                assertEquals(1, c.getInt(PONY_CAN_RIDE));
+//                flickaId = c.getLong(PONY_ID);
+//            } else if ("Elise".equals(name)) {
+//                assertEquals("dastardly", c.getString(PONY_TYPE));
+//                assertEquals(3, c.getInt(PONY_LEGS));
+//                assertEquals(0, c.getInt(PONY_CAN_RIDE));
+//                eliseId = c.getLong(PONY_ID);
+//            } else {
+//                fail("Wrong record: " + name);
+//            }
+//        }
+//
+//        // eliseId and flickaId should have been set
+//        assertNotSame(-1, eliseId);
+//        assertNotSame(-1, flickaId);
+//        // Delete the elise record
+//        assertEquals(1, mMockResolver.delete(ContentUris.withAppendedId(MockProvider.uri(uri),
+//                eliseId), null, null));
+//        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
+//        assertNotNull(c);
+//        // There should be one left (Flicka)
+//        assertEquals(1, c.getCount());
+//        assertTrue(c.moveToNext());
+//        assertEquals("Flicka", c.getString(PONY_NAME));
+//    }
+//
+//    public void testUpdate() throws RemoteException, OperationApplicationException {
+//        // The Uri is content://com.android.canhaz/pony
+//        Uri uri = getPonyUri();
+//        setupPonies();
+//        Cursor c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
+//        assertNotNull(c);
+//        assertEquals(2, c.getCount());
+//        // Give all the ponies 5 legs
+//        ContentValues cv = new ContentValues();
+//        cv.put(PONY_COLUMN_LEGS, 5);
+//        assertEquals(2, mMockResolver.update(MockProvider.uri(uri), cv, null, null));
+//        c = mMockResolver.query(MockProvider.uri(uri), PONY_PROJECTION, null, null, null);
+//        assertNotNull(c);
+//        // We should still have two records, and each should have 5 legs, but otherwise be the same
+//        assertEquals(2, c.getCount());
+//        long eliseId = -1;
+//        long flickaId = -1;
+//        while (c.moveToNext()) {
+//            String name = c.getString(PONY_NAME);
+//            if ("Flicka".equals(name)) {
+//                assertEquals("Flicka", c.getString(PONY_NAME));
+//                assertEquals("wayward", c.getString(PONY_TYPE));
+//                assertEquals(5, c.getInt(PONY_LEGS));
+//                assertEquals(1, c.getInt(PONY_CAN_RIDE));
+//                flickaId = c.getLong(PONY_ID);
+//            } else if ("Elise".equals(name)) {
+//                assertEquals("dastardly", c.getString(PONY_TYPE));
+//                assertEquals(5, c.getInt(PONY_LEGS));
+//                assertEquals(0, c.getInt(PONY_CAN_RIDE));
+//                eliseId = c.getLong(PONY_ID);
+//            } else {
+//                fail("Wrong record: " + name);
+//            }
+//        }
+//        // eliseId and flickaId should have been set
+//        assertNotSame(-1, eliseId);
+//        assertNotSame(-1, flickaId);
+//    }
 }

diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
index 77820a5..fc9eb34 100644
--- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java

@@ -22,7 +22,6 @@
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Events;
 import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
 
 import com.android.emailcommon.mail.Address;
 import com.android.emailcommon.provider.Account;
@@ -36,6 +35,7 @@
 import com.android.exchange.adapter.Serializer;
 import com.android.exchange.adapter.SyncAdapterTestCase;
 import com.android.exchange.adapter.Tags;
+import com.android.mail.utils.LogUtils;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -880,10 +880,10 @@
                 nodst++;
             }
         }
-        Log.d("TimeZoneGeneration",
+        LogUtils.d("TimeZoneGeneration",
                 "Rule: " + rule + ", No DST: " + nodst + ", No rule: " + norule);
         for (String nr: norulelist) {
-            Log.d("TimeZoneGeneration", "No rule: " + nr);
+            LogUtils.d("TimeZoneGeneration", "No rule: " + nr);
         }
         // This is an empirical sanity test; we shouldn't have too many time zones with DST and
         // without a rule.
commit	f00b054bd43093b19925a6beda8585cc4b7a6144	[log] [tgz]
author	Paul Westbrook <pwestbro@google.com>	Thu Aug 15 14:40:44 2013 -0700
committer	Paul Westbrook <pwestbro@google.com>	Thu Aug 15 14:40:44 2013 -0700
tree	50fb00197ad190335af535aba04e4306119ece59
parent	ff7e02603bc8196f411c0c491d74a42e747b7dc5 [diff]
parent	a46072fa81fb2a4be3666b838256a5bd7bee7519 [diff]