keep history after reset to ub-mail-klp-mr2-release@1078484
diff --git a/Android.mk b/Android.mk
index cc5e4de..7a3de44 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,4 +47,4 @@
include $(BUILD_PACKAGE)
# additionally, build unit tests in a separate .apk
-# include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f9392c..a7c5bf4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.exchange"
- android:versionCode="500060" >
+ android:versionCode="500064" >
<uses-permission
android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -79,6 +79,17 @@
<receiver
android:name="com.android.emailsync.MailboxAlarmReceiver"/>
+ <service
+ android:name="com.android.exchange.service.EasService"
+ android:exported="true">
+<!-- TODO: Switch this from EmailSyncAdapterService
+ <intent-filter>
+ <action
+ android:name="com.android.email.EXCHANGE_INTENT" />
+ </intent-filter>
+-->
+ </service>
+
<!--Required stanza to register the EAS EmailSyncAdapterService with SyncManager -->
<service
android:name="com.android.exchange.service.EmailSyncAdapterService"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f2c0748..ec1fad8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Stawingsfout"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Raak om rekeninginstellings vir <xliff:g id="ACCOUNT">%s</xliff:g> te wysig"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 86d9563..019752f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"የማረጋገጥ ስህተት"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"የ<xliff:g id="ACCOUNT">%s</xliff:g> መለያ ቅንብሮችን አርትዕ ለማድረግ ይንኩ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 395fa1f..7c8f3a9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -27,28 +27,28 @@
<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="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_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_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_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_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_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>
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"خطأ في المصادقة"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"المس لتعديل إعدادات الحساب <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 72a5396..d2b18da 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -60,4 +60,8 @@
<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>
+ <!-- no translation found for auth_error_notification_title (8108639432449021675) -->
+ <skip />
+ <!-- no translation found for auth_error_notification_text (6813530336397532878) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index afe5d62..815f2fc 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Грешка при удостоверяването"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Докоснете, за да редактирате настройките за профила <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9763ac6..c61247d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -27,10 +27,10 @@
<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="notification_exchange_calendar_added" msgid="6823659622379350159">"S\'ha afegit un 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="exception_cancel" msgid="6160117429428313805">"Aquest esdeveniment s\'ha cancel·lat al dia <xliff:g id="DATE">%s</xliff:g>"</string>
+ <string name="exception_updated" msgid="3397583105901142050">"Els detalls d\'aquest esdeveniment han canviat al dia <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>
@@ -51,7 +51,7 @@
<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_manual_sync_roaming" msgid="6637416341015662148">"Permet només sincr. manual en itinerància"</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>
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Error d\'autenticació"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Toca per editar la configuració del compte <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 93b712f..2b59bf3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Chyba ověření"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Klepnutím upravíte nastavení účtu <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7a4425b..a6b2c60 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Godkendelsesfejl"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Tryk for at redigere kontoindstillingerne for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3c0ea8d..74cafea 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Authentifizierungsfehler"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Zum Bearbeiten der Kontoeinstellungen für <xliff:g id="ACCOUNT">%s</xliff:g> tippen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 79b27cf..e0371c0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Σφάλμα ελέγχου ταυτότητας"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Αγγίξτε για να επεξεργαστείτε τις ρυθμίσεις λογαριασμού για <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a4725d9..4c15402 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Authentication error"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Touch to edit account settings for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..4c15402
--- /dev/null
+++ b/res/values-en-rIN/strings.xml
@@ -0,0 +1,65 @@
+<?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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Authentication error"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Touch to edit account settings for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5753aba..ed2e9d9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Error de autenticación"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Toca para modificar la configuración de la cuenta <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1e7f3fe..e9d518a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Error de autenticación"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Toca para editar la configuración de la cuenta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..5b92fa0
--- /dev/null
+++ b/res/values-et-rEE/strings.xml
@@ -0,0 +1,65 @@
+<?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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Autentimise viga"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Puudutage konto <xliff:g id="ACCOUNT">%s</xliff:g> seadete muutmiseks"</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9edb1bc..8a7007d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -27,28 +27,28 @@
<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="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_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_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_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_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_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>
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"خطای احراز هویت"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"برای ویرایش تنظیمات حساب <xliff:g id="ACCOUNT">%s</xliff:g> لمس کنید"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3fbc7eb..fff2c36 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Todennusvirhe"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Muokkaa tilin <xliff:g id="ACCOUNT">%s</xliff:g> asetuksia koskettamalla"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..0660ac8
--- /dev/null
+++ b/res/values-fr-rCA/strings.xml
@@ -0,0 +1,65 @@
+<?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">"Événement annulé : <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 courriels 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 courriels 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 courriels texte selon taille"</string>
+ <string name="policy_html_truncation" msgid="102158408055486343">"Autoriser courriels 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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Erreur d\'authentification"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Touchez ici pour modifier les paramètres du compte <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6f89dc7..785c4bb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -59,5 +59,7 @@
<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>
+ <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Toujours"</string>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Erreur d\'authentification"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Appuyez ici pour modifier les paramètres du compte <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 15c7b80..af3b0cd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,8 +32,8 @@
<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_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>
@@ -44,8 +44,8 @@
<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_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>
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"प्रमाणीकरण त्रुटि"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"<xliff:g id="ACCOUNT">%s</xliff:g> खाते की सेटिंग संपादित करने के लिए स्पर्श करें"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6eab0f4..864a5a2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Pogreška autentifikacije"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Dodirnite da biste uredili postavke računa za <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0f20934..634674b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Azonosítási hiba"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Érintse meg a(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiók beállításainak szerkesztéséhez"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..21a0538
--- /dev/null
+++ b/res/values-hy-rAM/strings.xml
@@ -0,0 +1,65 @@
+<?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">"Փոխանակման օրացույցը ավելացված է"</string>
+ <string name="app_name" msgid="5316597712787122829">"Փոխանակման ծառայություններ"</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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Նույնականացման սխալ"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Հպեք՝ <xliff:g id="ACCOUNT">%s</xliff:g> հաշվի կարգավորումները փոփոխելու համար"</string>
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 61ba13e..b5e8517 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Kesalahan autentikasi"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Sentuh untuk mengedit setelan akun <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 406d1a0..55dc826 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Errore di autenticazione"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Tocca per modificare le impostazioni dell\'account <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index af25116..01cc60f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -27,28 +27,28 @@
<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="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_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_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_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_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_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>
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"שגיאת אימות"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"גע כדי לערוך את הגדרות החשבון עבור <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7cdfafe..ff4a933 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"認証エラー"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"タップして<xliff:g id="ACCOUNT">%s</xliff:g>のアカウント設定を編集します"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..7a7f9ce
--- /dev/null
+++ b/res/values-ka-rGE/strings.xml
@@ -0,0 +1,65 @@
+<?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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"ავტორიზაციის შეცდომა"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"შეეხეთ <xliff:g id="ACCOUNT">%s</xliff:g> ანგარიშისთვის პარამეტრების შესაცვლელად"</string>
+</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..715bec0
--- /dev/null
+++ b/res/values-km-rKH/strings.xml
@@ -0,0 +1,65 @@
+<?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">"ប្ដូរប្រតិទិនដែលបានបន្ថែម"</string>
+ <string name="app_name" msgid="5316597712787122829">"សេវាប្ដូរ"</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">"មិនអនុញ្ញាតវ៉ាយហ្វាយ"</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">"ទាមទារការដាក់លេខកូដកាតអេសឌី"</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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"កំហុសក្នុងការផ្ទៀងផ្ទាត់"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"ប៉ះកែសម្រួលការកំណត់គណនីសម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 516705f..dd3e89e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"인증 오류"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정 설정을 수정하려면 터치하세요."</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..55f3f55
--- /dev/null
+++ b/res/values-lo-rLA/strings.xml
@@ -0,0 +1,65 @@
+<?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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"ການພິສູດຢືນຢັນຜິດພາດ"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"ແຕະເພື່ອແກ້ໄຂການຕັ້ງຄ່າບັນຊີຂອງ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f5e37f5..33df2a4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Tapatybės nustatymo klaida"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Jei norite redaguoti paskyros <xliff:g id="ACCOUNT">%s</xliff:g> nustatymus, palieskite"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b615f28..c8ade3a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Autentifikācijas kļūda"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Pieskarieties, lai rediģētu konta <xliff:g id="ACCOUNT">%s</xliff:g> iestatījumus."</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..faece6a
--- /dev/null
+++ b/res/values-mn-rMN/strings.xml
@@ -0,0 +1,65 @@
+<?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 Солигч АктивСинк"</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">"Солигч Үйлчилгээ"</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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Гэрчлэлийн алдаа"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"<xliff:g id="ACCOUNT">%s</xliff:g> акаунтын тохиргоог засахын тулд хүрнэ үү"</string>
+</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..a31d1e9
--- /dev/null
+++ b/res/values-ms-rMY/strings.xml
@@ -0,0 +1,65 @@
+<?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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Ralat pengesahan"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Sentuh untuk mengedit tetapan akaun bagi <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1affca5..f68d72a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -59,5 +59,7 @@
<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>
+ <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Siden tidenes morgen"</string>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Feil ved autentisering"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Trykk for å redigere kontoinnstillingene for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c211304..2b5669b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Verificatiefout"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Raak aan om accountinstellingen voor <xliff:g id="ACCOUNT">%s</xliff:g> te bewerken"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 33b2aff..55c1bb7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Błąd uwierzytelniania"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Kliknij, by edytować ustawienia konta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f9ad5e9..74c7317 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Erro de autenticação"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Toque para editar as definições da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2b98532..17a2e9f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Erro de autenticação"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Toque para editar as configurações de conta para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 13b3491..fdd38b3 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -87,4 +87,8 @@
<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 />
+ <!-- no translation found for auth_error_notification_title (8108639432449021675) -->
+ <skip />
+ <!-- no translation found for auth_error_notification_text (6813530336397532878) -->
+ <skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c5d8825..6810c6b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Eroare de autentificare"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Atingeți pentru a edita setările contului <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7bb86c2..40f36ee 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Ошибка аутентификации"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Нажмите, чтобы изменить настройки для аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0a907ea..2469e1f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Chyba overenia"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Dotykom upravíte nastavenia účtu <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 61bfbf9..b712081 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Napaka pri preverjanju pristnosti"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Dotaknite se, če želite urediti nastavitve računa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6abf45c..eee278c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Грешка при потврди аутентичности"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Додирните да бисте изменили подешавања налога за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 45d9454..f5ef1a3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Autentiseringsfel"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Tryck här om du vill redigera kontoinställningar för <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 103b471..991056d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Hitilafu ya uthibitishaji"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Gusa ili ubadilishe mipangilio ya akaunti ya <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ec0968b..3110b07 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"ข้อผิดพลาดในการตรวจสอบสิทธิ์"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"แตะเพื่อแก้ไขการตั้งค่าบัญชีสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b29e5c4..a25ecfc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Error sa pagpapatotoo"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Pindutin upang i-edit ang mga setting ng account para sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a3373db..611ae51 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Kimlik doğrulama hatası"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"<xliff:g id="ACCOUNT">%s</xliff:g> ile ilgili hesap ayarlarını düzenlemek için dokunun"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9980194..f5eb88e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Помилка автентифікації"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Торкніться, щоб редагувати налаштування облікового запису <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1a7866a..cda5a25 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Lỗi xác thực"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Chạm để chỉnh sửa cài đặt tài khoản cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1b324ce..8e4a284 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"身份验证出错"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"触摸即可修改“<xliff:g id="ACCOUNT">%s</xliff:g>”的帐户设置"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..9505773
--- /dev/null
+++ b/res/values-zh-rHK/strings.xml
@@ -0,0 +1,65 @@
+<?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">"兩星期"</string>
+ <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 個月"</string>
+ <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"認證錯誤"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"輕觸即可編輯 <xliff:g id="ACCOUNT">%s</xliff:g> 的帳戶設定"</string>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 66b47a8..824af97 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"驗證錯誤"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"輕觸即可編輯 <xliff:g id="ACCOUNT">%s</xliff:g> 的帳戶設定"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b6bc533..48b02ad 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -60,4 +60,6 @@
<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>
+ <string name="auth_error_notification_title" msgid="8108639432449021675">"Iphutha lokufakazela ubuqiniso"</string>
+ <string name="auth_error_notification_text" msgid="6813530336397532878">"Thinta ukuze uhlele izilungiselelo ze-akhawunti <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
</resources>
diff --git a/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
index 47142bb..3e0e400 100644
--- a/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java
@@ -43,7 +43,7 @@
public static boolean PARSER_LOG = false; // DO NOT CHECK IN WITH THIS SET TO TRUE
public static boolean FILE_LOG = false; // DO NOT CHECK IN WITH THIS SET TO TRUE
- public static final String CLIENT_VERSION = "EAS-1.3";
+ public static final String CLIENT_VERSION = "EAS-2.0";
public static final String ACCOUNT_MAILBOX_PREFIX = "__eas";
// Define our default protocol version as 2.5 (Exchange 2003)
diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index f6ba28c..dd9e3e8 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -33,12 +33,10 @@
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;
@@ -51,7 +49,7 @@
import com.android.emailsync.AbstractSyncService;
import com.android.emailsync.PartRequest;
import com.android.emailsync.SyncManager;
-import com.android.exchange.adapter.Search;
+import com.android.exchange.eas.EasSearch;
import com.android.exchange.utility.FileLogger;
import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.android.mail.utils.LogUtils;
@@ -118,11 +116,6 @@
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);
@@ -138,64 +131,9 @@
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 {
+ public void loadAttachment(final IEmailServiceCallback callback, final long accountId,
+ 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));
@@ -207,31 +145,6 @@
}
@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);
@@ -244,27 +157,6 @@
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
*
@@ -280,36 +172,20 @@
public int searchMessages(long accountId, SearchParams searchParams, long destMailboxId) {
SyncManager exchangeService = INSTANCE;
if (exchangeService == null) return 0;
- return Search.searchMessages(exchangeService, accountId, searchParams,
- destMailboxId);
+ EasSearch op = new EasSearch(exchangeService, accountId, searchParams, destMailboxId);
+ op.performOperation();
+ return op.getTotalResults();
}
@Override
- public void sendMail(long accountId) throws RemoteException {
- }
+ 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;
- }
- }
+ public void pushModify(long accountId) throws RemoteException {}
@Override
- public void serviceUpdated(String emailAddress) throws RemoteException {
- // Not required for EAS
- }
+ public void sync(final long accountId, final boolean updateFolderList,
+ final int mailboxType, final long[] folders) {}
};
/**
diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index 0c4b5b5..31fc562 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -21,9 +21,11 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.OperationApplicationException;
+import android.os.Bundle;
import android.os.RemoteException;
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.CommandStatusException;
@@ -66,6 +68,12 @@
init(adapter);
}
+ public AbstractSyncParser(final Parser p, final Context context, final ContentResolver resolver,
+ final Mailbox mailbox, final Account account) throws IOException {
+ super(p);
+ init(context, resolver, mailbox, account);
+ }
+
private void init(final AbstractSyncAdapter adapter) {
init(adapter.mContext, adapter.mContext.getContentResolver(), adapter.mMailbox,
adapter.mAccount);
@@ -158,8 +166,13 @@
// 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...
- // TODO: reloadFolderList simply sets all mailboxes to hold.
- //ExchangeService.reloadFolderList(mContext, mAccount.mId, true);
+ // TODO: Improve this -- probably best to do this synchronously and then
+ // immediately retry the current sync.
+ final Bundle extras = new Bundle(1);
+ extras.putBoolean(Mailbox.SYNC_EXTRA_ACCOUNT_ONLY, true);
+ ContentResolver.requestSync(new android.accounts.Account(
+ mAccount.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE),
+ EmailContent.AUTHORITY, extras);
// We don't have any provision for telling the user "wait a minute while
// we sync folders"...
throw new IOException();
diff --git a/src/com/android/exchange/adapter/CalendarSyncParser.java b/src/com/android/exchange/adapter/CalendarSyncParser.java
index f059c09..111b510 100644
--- a/src/com/android/exchange/adapter/CalendarSyncParser.java
+++ b/src/com/android/exchange/adapter/CalendarSyncParser.java
@@ -26,7 +26,7 @@
import com.android.emailcommon.utility.Utility;
import com.android.exchange.Eas;
import com.android.exchange.adapter.AbstractSyncAdapter.Operation;
-import com.android.exchange.service.EasCalendarSyncHandler;
+import com.android.exchange.eas.EasSyncCalendar;
import com.android.exchange.utility.CalendarUtilities;
import com.android.mail.utils.LogUtils;
import com.google.common.annotations.VisibleForTesting;
@@ -1357,7 +1357,7 @@
@Override
protected void wipe() {
LogUtils.w(TAG, "Wiping calendar for account %d", mAccount.mId);
- EasCalendarSyncHandler.wipeAccountFromContentProvider(mContext,
+ EasSyncCalendar.wipeAccountFromContentProvider(mContext,
mAccount.mEmailAddress);
}
}
diff --git a/src/com/android/exchange/adapter/ContactsSyncParser.java b/src/com/android/exchange/adapter/ContactsSyncParser.java
index c5b6068..3d74415 100644
--- a/src/com/android/exchange/adapter/ContactsSyncParser.java
+++ b/src/com/android/exchange/adapter/ContactsSyncParser.java
@@ -40,8 +40,8 @@
import com.android.emailcommon.provider.Mailbox;
import com.android.emailcommon.utility.Utility;
import com.android.exchange.Eas;
-import com.android.exchange.service.EasContactsSyncHandler;
-import com.android.exchange.service.EasSyncHandler;
+import com.android.exchange.eas.EasSyncCollectionTypeBase;
+import com.android.exchange.eas.EasSyncContacts;
import com.android.exchange.utility.CalendarUtilities;
import com.android.mail.utils.LogUtils;
@@ -799,7 +799,7 @@
private int mCount = 0;
private int mContactBackValue = mCount;
// Make an array big enough for the max possible window size.
- private final int[] mContactIndexArray = new int[EasSyncHandler.MAX_WINDOW_SIZE];
+ private final int[] mContactIndexArray = new int[EasSyncCollectionTypeBase.MAX_WINDOW_SIZE];
private int mContactIndexCount = 0;
private ContentProviderResult[] mResults = null;
@@ -1308,7 +1308,7 @@
@Override
protected void wipe() {
LogUtils.w(TAG, "Wiping contacts for account %d", mAccount.mId);
- EasContactsSyncHandler.wipeAccountFromContentProvider(mContext,
+ EasSyncContacts.wipeAccountFromContentProvider(mContext,
mAccount.mEmailAddress);
}
}
diff --git a/src/com/android/exchange/adapter/EmailSyncParser.java b/src/com/android/exchange/adapter/EmailSyncParser.java
index f566276..2d5272b 100644
--- a/src/com/android/exchange/adapter/EmailSyncParser.java
+++ b/src/com/android/exchange/adapter/EmailSyncParser.java
@@ -102,6 +102,23 @@
}
}
+ public EmailSyncParser(final Parser parser, final Context context,
+ final ContentResolver resolver, final Mailbox mailbox, final Account account)
+ throws IOException {
+ super(parser, context, resolver, mailbox, account);
+ mMailboxIdAsString = Long.toString(mMailbox.mId);
+ if (mAccount.mPolicyKey != 0) {
+ mPolicy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+ } else {
+ mPolicy = null;
+ }
+ }
+
+ public EmailSyncParser(final Context context, final InputStream in, final Mailbox mailbox,
+ final Account account) throws IOException {
+ this(context, context.getContentResolver(), in, mailbox, account);
+ }
+
public boolean fetchNeeded() {
return mFetchNeeded;
}
@@ -110,7 +127,7 @@
return mMessageUpdateStatus;
}
- public void addData (EmailContent.Message msg, int endingTag) throws IOException {
+ public void addData(EmailContent.Message msg, int endingTag) throws IOException {
ArrayList<EmailContent.Attachment> atts = new ArrayList<EmailContent.Attachment>();
boolean truncated = false;
diff --git a/src/com/android/exchange/adapter/FolderSyncParser.java b/src/com/android/exchange/adapter/FolderSyncParser.java
index 4805cdc..f6334c7 100644
--- a/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -40,8 +40,8 @@
import com.android.exchange.CommandStatusException;
import com.android.exchange.CommandStatusException.CommandStatus;
import com.android.exchange.Eas;
-import com.android.exchange.service.EasCalendarSyncHandler;
-import com.android.exchange.service.EasContactsSyncHandler;
+import com.android.exchange.eas.EasSyncContacts;
+import com.android.exchange.eas.EasSyncCalendar;
import com.android.mail.utils.LogUtils;
import com.google.common.annotations.VisibleForTesting;
@@ -759,9 +759,9 @@
@Override
protected void wipe() {
- EasCalendarSyncHandler.wipeAccountFromContentProvider(mContext,
+ EasSyncCalendar.wipeAccountFromContentProvider(mContext,
mAccount.mEmailAddress);
- EasContactsSyncHandler.wipeAccountFromContentProvider(mContext,
+ EasSyncContacts.wipeAccountFromContentProvider(mContext,
mAccount.mEmailAddress);
// Save away any mailbox sync information that is NOT default
diff --git a/src/com/android/exchange/adapter/ItemOperationsParser.java b/src/com/android/exchange/adapter/ItemOperationsParser.java
index b383993..deace34 100644
--- a/src/com/android/exchange/adapter/ItemOperationsParser.java
+++ b/src/com/android/exchange/adapter/ItemOperationsParser.java
@@ -15,7 +15,7 @@
package com.android.exchange.adapter;
-import com.android.exchange.service.EasAttachmentLoader.ProgressCallback;
+import com.android.exchange.eas.EasLoadAttachment.ProgressCallback;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/com/android/exchange/adapter/Search.java b/src/com/android/exchange/adapter/Search.java
deleted file mode 100644
index 7fd5452..0000000
--- a/src/com/android/exchange/adapter/Search.java
+++ /dev/null
@@ -1,268 +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.ContentProviderOperation;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.os.RemoteException;
-
-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.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.adapter.EmailSyncAdapter.EasEmailSyncParser;
-import com.android.mail.providers.UIProvider;
-import com.android.mail.utils.LogUtils;
-
-import org.apache.http.HttpStatus;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-/**
- * Implementation of server-side search for EAS using the EmailService API
- */
-public class Search {
- // The shortest search query we'll accept
- // TODO Check with UX whether this is correct
- private static final int MIN_QUERY_LENGTH = 3;
- // The largest number of results we'll ask for per server request
- private static final int MAX_SEARCH_RESULTS = 100;
-
- public static int searchMessages(Context context, long accountId, SearchParams searchParams,
- long destMailboxId) {
- // Sanity check for arguments
- final int offset = searchParams.mOffset;
- final int limit = searchParams.mLimit;
- final String filter = searchParams.mFilter;
- if (limit < 0 || limit > MAX_SEARCH_RESULTS || offset < 0) return 0;
- // TODO Should this be checked in UI? Are there guidelines for minimums?
- if (filter == null || filter.length() < MIN_QUERY_LENGTH) return 0;
-
- int res = 0;
- final Account account = Account.restoreAccountWithId(context, accountId);
- if (account == null) return res;
- final EasSyncService svc = EasSyncService.setupServiceForAccount(context, account);
- if (svc == null) return res;
- final Mailbox searchMailbox = Mailbox.restoreMailboxWithId(context, destMailboxId);
- // Sanity check; account might have been deleted?
- if (searchMailbox == null) return res;
- final ContentValues statusValues = new ContentValues(2);
- try {
- // Set the status of this mailbox to indicate query
- statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.LIVE_QUERY);
- searchMailbox.update(context, statusValues);
-
- svc.mMailbox = searchMailbox;
- svc.mAccount = account;
- final Serializer s = new Serializer();
- s.start(Tags.SEARCH_SEARCH).start(Tags.SEARCH_STORE);
- s.data(Tags.SEARCH_NAME, "Mailbox");
- s.start(Tags.SEARCH_QUERY).start(Tags.SEARCH_AND);
- s.data(Tags.SYNC_CLASS, "Email");
-
- // If this isn't an inbox search, then include the collection id
- final Mailbox inbox =
- Mailbox.restoreMailboxOfType(context, accountId, Mailbox.TYPE_INBOX);
- if (inbox == null) return 0;
- if (searchParams.mMailboxId != inbox.mId) {
- s.data(Tags.SYNC_COLLECTION_ID, inbox.mServerId);
- }
-
- s.data(Tags.SEARCH_FREE_TEXT, filter);
-
- // Add the date window if appropriate
- if (searchParams.mStartDate != null) {
- s.start(Tags.SEARCH_GREATER_THAN);
- s.tag(Tags.EMAIL_DATE_RECEIVED);
- s.data(Tags.SEARCH_VALUE, Eas.DATE_FORMAT.format(searchParams.mStartDate));
- s.end(); // SEARCH_GREATER_THAN
- }
- if (searchParams.mEndDate != null) {
- s.start(Tags.SEARCH_LESS_THAN);
- s.tag(Tags.EMAIL_DATE_RECEIVED);
- s.data(Tags.SEARCH_VALUE, Eas.DATE_FORMAT.format(searchParams.mEndDate));
- s.end(); // SEARCH_LESS_THAN
- }
- s.end().end(); // SEARCH_AND, SEARCH_QUERY
- s.start(Tags.SEARCH_OPTIONS);
- if (offset == 0) {
- s.tag(Tags.SEARCH_REBUILD_RESULTS);
- }
- if (searchParams.mIncludeChildren) {
- s.tag(Tags.SEARCH_DEEP_TRAVERSAL);
- }
- // Range is sent in the form first-last (e.g. 0-9)
- s.data(Tags.SEARCH_RANGE, offset + "-" + (offset + limit - 1));
- s.start(Tags.BASE_BODY_PREFERENCE);
- s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_HTML);
- s.data(Tags.BASE_TRUNCATION_SIZE, "20000");
- s.end(); // BASE_BODY_PREFERENCE
- s.end().end().end().done(); // SEARCH_OPTIONS, SEARCH_STORE, SEARCH_SEARCH
- final EasResponse resp = svc.sendHttpClientPost("Search", s.toByteArray());
- try {
- final int code = resp.getStatus();
- if (code == HttpStatus.SC_OK) {
- final InputStream is = resp.getInputStream();
- try {
- final SearchParser sp = new SearchParser(is, svc, filter);
- sp.parse();
- res = sp.getTotalResults();
- } finally {
- is.close();
- }
- } else {
- svc.userLog("Search returned " + code);
- }
- } finally {
- resp.close();
- }
- } catch (IOException e) {
- svc.userLog("Search exception " + e);
- } finally {
- // TODO: Handle error states
- // Set the status of this mailbox to indicate query over
- statusValues.put(Mailbox.SYNC_TIME, System.currentTimeMillis());
- statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.NO_SYNC);
- searchMailbox.update(context, statusValues);
- }
- // Return the total count
- return res;
- }
-
- /**
- * Parse the result of a Search command
- */
- static class SearchParser extends Parser {
- private final EasSyncService mService;
- private final String mQuery;
- private int mTotalResults;
-
- private SearchParser(InputStream in, EasSyncService service, String query)
- throws IOException {
- super(in);
- mService = service;
- mQuery = query;
- }
-
- protected int getTotalResults() {
- return mTotalResults;
- }
-
- @Override
- public boolean parse() throws IOException {
- boolean res = false;
- if (nextTag(START_DOCUMENT) != Tags.SEARCH_SEARCH) {
- throw new IOException();
- }
- while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
- if (tag == Tags.SEARCH_STATUS) {
- String status = getValue();
- if (Eas.USER_LOG) {
- LogUtils.d(Logging.LOG_TAG, "Search status: " + status);
- }
- } else if (tag == Tags.SEARCH_RESPONSE) {
- parseResponse();
- } else {
- skipTag();
- }
- }
- return res;
- }
-
- private boolean parseResponse() throws IOException {
- boolean res = false;
- while (nextTag(Tags.SEARCH_RESPONSE) != END) {
- if (tag == Tags.SEARCH_STORE) {
- parseStore();
- } else {
- skipTag();
- }
- }
- return res;
- }
-
- private boolean parseStore() throws IOException {
- EmailSyncAdapter adapter = new EmailSyncAdapter(mService);
- 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) {
- getValue();
- } else if (tag == Tags.SEARCH_TOTAL) {
- mTotalResults = getValueInt();
- } else if (tag == Tags.SEARCH_RESULT) {
- parseResult(parser, ops);
- } else {
- skipTag();
- }
- }
-
- try {
- adapter.mContentResolver.applyBatch(EmailContent.AUTHORITY, ops);
- if (Eas.USER_LOG) {
- mService.userLog("Saved " + ops.size() + " search results");
- }
- } catch (RemoteException e) {
- LogUtils.d(Logging.LOG_TAG, "RemoteException while saving search results.");
- } catch (OperationApplicationException e) {
- }
-
- return res;
- }
-
- private boolean parseResult(EasEmailSyncParser parser,
- ArrayList<ContentProviderOperation> ops) throws IOException {
- // Get an email sync parser for our incoming message data
- boolean res = false;
- Message msg = new Message();
- while (nextTag(Tags.SEARCH_RESULT) != END) {
- if (tag == Tags.SYNC_CLASS) {
- getValue();
- } else if (tag == Tags.SYNC_COLLECTION_ID) {
- getValue();
- } else if (tag == Tags.SEARCH_LONG_ID) {
- msg.mProtocolSearchInfo = getValue();
- } else if (tag == Tags.SEARCH_PROPERTIES) {
- msg.mAccountKey = mService.mAccount.mId;
- msg.mMailboxKey = mService.mMailbox.mId;
- msg.mFlagLoaded = Message.FLAG_LOADED_COMPLETE;
- parser.pushTag(tag);
- parser.addData(msg, tag);
- if (msg.mHtml != null) {
- msg.mHtml = TextUtilities.highlightTermsInHtml(msg.mHtml, mQuery);
- }
- msg.addSaveOps(ops);
- } else {
- skipTag();
- }
- }
- return res;
- }
- }
-}
diff --git a/src/com/android/exchange/adapter/SearchParser.java b/src/com/android/exchange/adapter/SearchParser.java
new file mode 100644
index 0000000..7a65370
--- /dev/null
+++ b/src/com/android/exchange/adapter/SearchParser.java
@@ -0,0 +1,143 @@
+package com.android.exchange.adapter;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+
+import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.utility.TextUtilities;
+import com.android.exchange.Eas;
+import com.android.mail.utils.LogUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+/**
+ * Parse the result of a Search command
+ */
+public class SearchParser extends Parser {
+ private static final String LOG_TAG = Logging.LOG_TAG;
+ private final Context mContext;
+ private final ContentResolver mContentResolver;
+ private final Mailbox mMailbox;
+ private final Account mAccount;
+ private final String mQuery;
+ private int mTotalResults;
+
+ public SearchParser(final Context context, final ContentResolver resolver,
+ final InputStream in, final Mailbox mailbox, final Account account,
+ String query)
+ throws IOException {
+ super(in);
+ mContext = context;
+ mContentResolver = resolver;
+ mMailbox = mailbox;
+ mAccount = account;
+ mQuery = query;
+ }
+
+ public int getTotalResults() {
+ return mTotalResults;
+ }
+
+ @Override
+ public boolean parse() throws IOException {
+ boolean res = false;
+ if (nextTag(START_DOCUMENT) != Tags.SEARCH_SEARCH) {
+ throw new IOException();
+ }
+ while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
+ if (tag == Tags.SEARCH_STATUS) {
+ String status = getValue();
+ if (Eas.USER_LOG) {
+ LogUtils.d(Logging.LOG_TAG, "Search status: " + status);
+ }
+ } else if (tag == Tags.SEARCH_RESPONSE) {
+ parseResponse();
+ } else {
+ skipTag();
+ }
+ }
+ return res;
+ }
+
+ private boolean parseResponse() throws IOException {
+ boolean res = false;
+ while (nextTag(Tags.SEARCH_RESPONSE) != END) {
+ if (tag == Tags.SEARCH_STORE) {
+ parseStore();
+ } else {
+ skipTag();
+ }
+ }
+ return res;
+ }
+
+ private boolean parseStore() throws IOException {
+ EmailSyncParser parser = new EmailSyncParser(this, mContext, mContentResolver,
+ mMailbox, mAccount);
+ ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+ boolean res = false;
+
+ while (nextTag(Tags.SEARCH_STORE) != END) {
+ if (tag == Tags.SEARCH_STATUS) {
+ getValue();
+ } else if (tag == Tags.SEARCH_TOTAL) {
+ mTotalResults = getValueInt();
+ } else if (tag == Tags.SEARCH_RESULT) {
+ parseResult(parser, ops);
+ } else {
+ skipTag();
+ }
+ }
+
+ try {
+ // FLAG: In EmailSyncParser.commit(), we have complicated logic to constrain the size
+ // of the batch, and fall back to one op at a time if that fails. We don't have any
+ // such logic here, but we probably should.
+ mContentResolver.applyBatch(EmailContent.AUTHORITY, ops);
+ LogUtils.d(Logging.LOG_TAG, "Saved %s search results", ops.size());
+ } catch (RemoteException e) {
+ LogUtils.d(Logging.LOG_TAG, "RemoteException while saving search results.");
+ } catch (OperationApplicationException e) {
+ }
+
+ return res;
+ }
+
+ private boolean parseResult(EmailSyncParser parser,
+ ArrayList<ContentProviderOperation> ops) throws IOException {
+ // Get an email sync parser for our incoming message data
+ boolean res = false;
+ Message msg = new Message();
+ while (nextTag(Tags.SEARCH_RESULT) != END) {
+ if (tag == Tags.SYNC_CLASS) {
+ getValue();
+ } else if (tag == Tags.SYNC_COLLECTION_ID) {
+ getValue();
+ } else if (tag == Tags.SEARCH_LONG_ID) {
+ msg.mProtocolSearchInfo = getValue();
+ } else if (tag == Tags.SEARCH_PROPERTIES) {
+ msg.mAccountKey = mAccount.mId;
+ msg.mMailboxKey = mMailbox.mId;
+ msg.mFlagLoaded = Message.FLAG_LOADED_COMPLETE;
+ parser.pushTag(tag);
+ parser.addData(msg, tag);
+ if (msg.mHtml != null) {
+ msg.mHtml = TextUtilities.highlightTermsInHtml(msg.mHtml, mQuery);
+ }
+ msg.addSaveOps(ops);
+ } else {
+ skipTag();
+ }
+ }
+ return res;
+ }
+}
diff --git a/src/com/android/exchange/adapter/SendMailParser.java b/src/com/android/exchange/adapter/SendMailParser.java
new file mode 100644
index 0000000..b205e09
--- /dev/null
+++ b/src/com/android/exchange/adapter/SendMailParser.java
@@ -0,0 +1,36 @@
+package com.android.exchange.adapter;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public 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;
+ }
+}
diff --git a/src/com/android/exchange/adapter/Serializer.java b/src/com/android/exchange/adapter/Serializer.java
index 3511c88..4cd187e 100644
--- a/src/com/android/exchange/adapter/Serializer.java
+++ b/src/com/android/exchange/adapter/Serializer.java
@@ -82,7 +82,7 @@
if (cr > 0) {
str = str.substring(0, cr);
}
- LogUtils.v(TAG, str);
+ LogUtils.v(TAG, "%s", str);
if (Eas.FILE_LOG) {
FileLogger.log(TAG, str);
}
diff --git a/src/com/android/exchange/eas/EasFolderSync.java b/src/com/android/exchange/eas/EasFolderSync.java
index 1be9fe7..34da843 100644
--- a/src/com/android/exchange/eas/EasFolderSync.java
+++ b/src/com/android/exchange/eas/EasFolderSync.java
@@ -17,7 +17,6 @@
package com.android.exchange.eas;
import android.content.Context;
-import android.content.SyncResult;
import android.os.Bundle;
import com.android.emailcommon.mail.MessagingException;
@@ -30,6 +29,7 @@
import com.android.exchange.adapter.FolderSyncParser;
import com.android.exchange.adapter.Serializer;
import com.android.exchange.adapter.Tags;
+import com.android.exchange.service.EasService;
import com.android.mail.utils.LogUtils;
import org.apache.http.HttpEntity;
@@ -55,15 +55,26 @@
*/
public static final int RESULT_WRONG_OPERATION = 2;
- // TODO: Eliminate the need for mAccount (requires FolderSyncParser changes).
- private final Account mAccount;
-
/** Indicates whether this object is for validation rather than sync. */
private final boolean mStatusOnly;
/** During validation, this holds the policy we must enforce. */
private Policy mPolicy;
+ /** During validation, this holds the result. */
+ private Bundle mValidationResult;
+
+ /**
+ * Constructor for use with {@link EasService} when performing an actual sync.
+ * @param context
+ * @param accountId
+ */
+ public EasFolderSync(final Context context, final long accountId) {
+ super(context, accountId);
+ mStatusOnly = false;
+ mPolicy = null;
+ }
+
/**
* Constructor for actually doing folder sync.
* @param context
@@ -71,7 +82,6 @@
*/
public EasFolderSync(final Context context, final Account account) {
super(context, account);
- mAccount = account;
mStatusOnly = false;
mPolicy = null;
}
@@ -82,61 +92,93 @@
* @param hostAuth
*/
public EasFolderSync(final Context context, final HostAuth hostAuth) {
- this(context, new Account(), hostAuth);
+ super(context, -1);
+ setDummyAccount(hostAuth);
+ mStatusOnly = true;
}
- private EasFolderSync(final Context context, final Account account, final HostAuth hostAuth) {
- super(context, account, hostAuth);
- mAccount = account;
- mAccount.mEmailAddress = hostAuth.mLogin;
- mStatusOnly = true;
+ @Override
+ public int performOperation() {
+ if (mStatusOnly) {
+ return validate();
+ } else {
+ LogUtils.d(LOG_TAG, "Performing FolderSync for account %d", getAccountId());
+ return super.performOperation();
+ }
+ }
+
+ /**
+ * Returns the validation results after this operation has been performed.
+ * @return The validation results.
+ */
+ public Bundle getValidationResult() {
+ return mValidationResult;
}
/**
* Perform a folder sync.
- * @param syncResult The {@link SyncResult} object for this sync operation.
+ * TODO: Remove this function when transition to EasService is complete.
* @return A result code, either from above or from the base class.
*/
- public int doFolderSync(final SyncResult syncResult) {
+ public int doFolderSync() {
if (mStatusOnly) {
return RESULT_WRONG_OPERATION;
}
- LogUtils.d(LOG_TAG, "Performing sync for account %d", mAccount.mId);
- return performOperation(syncResult);
+ LogUtils.d(LOG_TAG, "Performing sync for account %d", getAccountId());
+ // This intentionally calls super.performOperation -- calling our performOperation
+ // will simply end up calling super.performOperation anyway. This is part of the transition
+ // to EasService and will go away when this function is deleted.
+ return super.performOperation();
}
/**
- * Perform account validation.
- * @return The response {@link Bundle} expected by the RPC.
+ * Helper function for {@link #performOperation} -- do some initial checks and, if they pass,
+ * perform a folder sync to verify that we can. This sets {@link #mValidationResult} as a side
+ * effect which holds the result details needed by the UI.
+ * @return A result code, either from above or from the base class.
*/
- public Bundle validate() {
- final Bundle bundle = new Bundle(3);
+ private int validate() {
+ mValidationResult = new Bundle(3);
if (!mStatusOnly) {
- writeResultCode(bundle, RESULT_OTHER_FAILURE);
- return bundle;
+ writeResultCode(mValidationResult, RESULT_OTHER_FAILURE);
+ return RESULT_OTHER_FAILURE;
}
LogUtils.d(LOG_TAG, "Performing validation");
if (!registerClientCert()) {
- bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
+ mValidationResult.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
MessagingException.CLIENT_CERTIFICATE_ERROR);
- return bundle;
+ return RESULT_CLIENT_CERTIFICATE_REQUIRED;
}
if (shouldGetProtocolVersion()) {
final EasOptions options = new EasOptions(this);
- final int result = options.getProtocolVersionFromServer(null);
+ final int result = options.getProtocolVersionFromServer();
if (result != EasOptions.RESULT_OK) {
- writeResultCode(bundle, result);
- return bundle;
+ writeResultCode(mValidationResult, result);
+ return result;
}
final String protocolVersion = options.getProtocolVersionString();
setProtocolVersion(protocolVersion);
- bundle.putString(EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION, protocolVersion);
+ mValidationResult.putString(EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION,
+ protocolVersion);
}
- writeResultCode(bundle, performOperation(null));
- return bundle;
+ // This is intentionally a call to super.performOperation. This is a helper function for
+ // our version of perfomOperation so calling that function would infinite loop.
+ final int result = super.performOperation();
+ writeResultCode(mValidationResult, result);
+ return result;
+ }
+
+ /**
+ * Perform account validation.
+ * TODO: Remove this function when transition to EasService is complete.
+ * @return The response {@link Bundle} expected by the RPC.
+ */
+ public Bundle doValidate() {
+ validate();
+ return mValidationResult;
}
@Override
@@ -154,7 +196,7 @@
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
+ protected int handleResponse(final EasResponse response)
throws IOException, CommandStatusException {
if (!response.isEmpty()) {
new FolderSyncParser(mContext, mContext.getContentResolver(),
@@ -169,7 +211,7 @@
}
@Override
- protected boolean handleProvisionError(final SyncResult syncResult, final long accountId) {
+ protected boolean handleProvisionError() {
if (mStatusOnly) {
final EasProvision provisionOperation = new EasProvision(this);
mPolicy = provisionOperation.test();
@@ -177,7 +219,7 @@
// no need to re-run the operation.
return false;
}
- return super.handleProvisionError(syncResult, accountId);
+ return super.handleProvisionError();
}
/**
diff --git a/src/com/android/exchange/eas/EasLoadAttachment.java b/src/com/android/exchange/eas/EasLoadAttachment.java
new file mode 100644
index 0000000..71e524f
--- /dev/null
+++ b/src/com/android/exchange/eas/EasLoadAttachment.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2014 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 android.os.RemoteException;
+
+import com.android.emailcommon.provider.EmailContent;
+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.service.EasService;
+import com.android.exchange.utility.UriCodec;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpEntity;
+
+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;
+
+/**
+ * This class performs the heavy lifting of loading attachments from the Exchange server to the
+ * device in a local file.
+ * TODO: Add ability to call back to UI when this failed, and generally better handle error cases.
+ */
+public final class EasLoadAttachment extends EasOperation {
+
+ public static final int RESULT_SUCCESS = 0;
+
+ /** Attachment Loading Errors **/
+ public static final int RESULT_LOAD_ATTACHMENT_INFO_ERROR = -100;
+ public static final int RESULT_ATTACHMENT_NO_LOCATION_ERROR = -101;
+ public static final int RESULT_ATTACHMENT_LOAD_MESSAGE_ERROR = -102;
+ public static final int RESULT_ATTACHMENT_INTERNAL_HANDLING_ERROR = -103;
+ public static final int RESULT_ATTACHMENT_RESPONSE_PARSING_ERROR = -104;
+
+ private final IEmailServiceCallback mCallback;
+ private final long mAttachmentId;
+
+ // These members are set in a future point in time outside of the constructor.
+ private Attachment mAttachment;
+
+ /**
+ * Constructor for use with {@link EasService} when performing an actual sync.
+ * @param context Our {@link Context}.
+ * @param accountId The id of the account in question (i.e. its id in the database).
+ * @param attachmentId The local id of the attachment (i.e. its id in the database).
+ * @param callback The callback for any status updates.
+ */
+ public EasLoadAttachment(final Context context, final long accountId, final long attachmentId,
+ final IEmailServiceCallback callback) {
+ // The account is loaded before performOperation but it is not guaranteed to be available
+ // before then.
+ super(context, accountId);
+ mCallback = callback;
+ mAttachmentId = attachmentId;
+ }
+
+ /**
+ * Helper function that makes a callback for us within our implementation.
+ */
+ private static void doStatusCallback(final IEmailServiceCallback callback,
+ final long messageKey, final long attachmentId, final int status, final int progress) {
+ if (callback != null) {
+ try {
+ // loadAttachmentStatus is mart of IEmailService interface.
+ callback.loadAttachmentStatus(messageKey, attachmentId, status, progress);
+ } catch (final RemoteException e) {
+ LogUtils.e(LOG_TAG, "RemoteException in loadAttachment: %s", e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Helper class that is passed to other objects to perform callbacks for us.
+ */
+ public static class ProgressCallback {
+ private final IEmailServiceCallback mCallback;
+ private final EmailContent.Attachment mAttachment;
+
+ public ProgressCallback(final IEmailServiceCallback callback,
+ final EmailContent.Attachment attachment) {
+ mCallback = callback;
+ mAttachment = attachment;
+ }
+
+ public void doCallback(final int progress) {
+ doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachment.mId,
+ EmailServiceStatus.IN_PROGRESS, progress);
+ }
+ }
+
+ /**
+ * 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();
+ }
+
+ /**
+ * Finish encoding attachment names for Exchange 2003.
+ * @return A {@link EmailServiceStatus} code that indicates the result of the operation.
+ */
+ @Override
+ public int performOperation() {
+ mAttachment = EmailContent.Attachment.restoreAttachmentWithId(mContext, mAttachmentId);
+ if (mAttachment == null) {
+ LogUtils.e(LOG_TAG, "Could not load attachment %d", mAttachmentId);
+ doStatusCallback(mCallback, -1, mAttachmentId, EmailServiceStatus.ATTACHMENT_NOT_FOUND,
+ 0);
+ return RESULT_LOAD_ATTACHMENT_INFO_ERROR;
+ }
+ if (mAttachment.mLocation == null) {
+ LogUtils.e(LOG_TAG, "Attachment %d lacks a location", mAttachmentId);
+ doStatusCallback(mCallback, -1, mAttachmentId, EmailServiceStatus.ATTACHMENT_NOT_FOUND,
+ 0);
+ return RESULT_ATTACHMENT_NO_LOCATION_ERROR;
+ }
+ final EmailContent.Message message = EmailContent.Message
+ .restoreMessageWithId(mContext, mAttachment.mMessageKey);
+ if (message == null) {
+ LogUtils.e(LOG_TAG, "Could not load message %d", mAttachment.mMessageKey);
+ doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachmentId,
+ EmailServiceStatus.MESSAGE_NOT_FOUND, 0);
+ return RESULT_ATTACHMENT_LOAD_MESSAGE_ERROR;
+ }
+
+ // First callback to let the client know that we have started the attachment load.
+ doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachmentId,
+ EmailServiceStatus.IN_PROGRESS, 0);
+
+ final int result = super.performOperation();
+
+ // Last callback to report results.
+ if (result < 0) {
+ // We had an error processing an attachment, let's report a {@link EmailServiceStatus}
+ // connection error in this case
+ LogUtils.d(LOG_TAG, "Invoking callback for attachmentId: %d with CONNECTION_ERROR",
+ mAttachmentId);
+ doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachmentId,
+ EmailServiceStatus.CONNECTION_ERROR, 0);
+ } else {
+ LogUtils.d(LOG_TAG, "Invoking callback for attachmentId: %d with SUCCESS",
+ mAttachmentId);
+ doStatusCallback(mCallback, mAttachment.mMessageKey, mAttachmentId,
+ EmailServiceStatus.SUCCESS, 0);
+ }
+ return result;
+ }
+
+ @Override
+ protected String getCommand() {
+ if (mAttachment == null) {
+ LogUtils.wtf(LOG_TAG, "Error, mAttachment is null");
+ }
+
+ final String cmd;
+ if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+ // The operation is different in EAS 14.0 than in earlier versions
+ cmd = "ItemOperations";
+ } 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(mAttachment.mLocation);
+ } else {
+ location = mAttachment.mLocation;
+ }
+ cmd = "GetAttachment&AttachmentName=" + location;
+ }
+ return cmd;
+ }
+
+ @Override
+ protected HttpEntity getRequestEntity() throws IOException {
+ if (mAttachment == null) {
+ LogUtils.wtf(LOG_TAG, "Error, mAttachment is null");
+ }
+
+ final HttpEntity entity;
+ final Serializer s = new Serializer();
+ if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+ 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
+ entity = makeEntity(s);
+ } else {
+ // Older versions of the protocol have the attachment location in the command.
+ entity = null;
+ }
+ return entity;
+ }
+
+ /**
+ * Close, ignoring errors (as during cleanup)
+ * @param c a Closeable
+ */
+ private static void close(final Closeable c) {
+ try {
+ c.close();
+ } catch (IOException e) {
+ LogUtils.e(LOG_TAG, "IOException while cleaning up attachment: %s", e.getMessage());
+ }
+ }
+
+ /**
+ * Save away the contentUri for this Attachment and notify listeners
+ */
+ private boolean finishLoadAttachment(final EmailContent.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(LOG_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 response The (successful) {@link EasResponse} containing the attachment data.
+ * @return A status code, 0 is a success, anything negative is an error outlined by constants
+ * in this class or its base class.
+ */
+ @Override
+ protected int handleResponse(final EasResponse response) {
+ // Some very basic error checking on the response object first.
+ // Our base class should be responsible for checking these errors but if the error
+ // checking is done in the override functions, we can be more specific about
+ // the errors that are being returned to the caller of performOperation().
+ if (response.isEmpty()) {
+ LogUtils.e(LOG_TAG, "Error, empty response.");
+ return RESULT_REQUEST_FAILURE;
+ }
+
+ // This is a 2 step process.
+ // 1. Grab what came over the wire and write it to a temp file on disk.
+ // 2. Move the attachment to its final location.
+ final File tmpFile;
+ try {
+ tmpFile = File.createTempFile("eas_", "tmp", mContext.getCacheDir());
+ } catch (final IOException e) {
+ LogUtils.e(LOG_TAG, "Could not open temp file: %s", e.getMessage());
+ return RESULT_REQUEST_FAILURE;
+ }
+
+ try {
+ final OutputStream os;
+ try {
+ os = new FileOutputStream(tmpFile);
+ } catch (final FileNotFoundException e) {
+ LogUtils.e(LOG_TAG, "Temp file not found: %s", e.getMessage());
+ return RESULT_ATTACHMENT_INTERNAL_HANDLING_ERROR;
+ }
+ try {
+ final InputStream is = response.getInputStream();
+ try {
+ // TODO: Right now we are explictly loading this from a class
+ // that will be deprecated when we move over to EasService. When we start using
+ // our internal class instead, there will be rippling side effect changes that
+ // need to be made when this time comes.
+ final ProgressCallback callback = new ProgressCallback(mCallback, mAttachment);
+ final boolean success;
+ if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+ final ItemOperationsParser parser = new ItemOperationsParser(is, os,
+ mAttachment.mSize, callback);
+ parser.parse();
+ success = (parser.getStatusCode() == 1);
+ } else {
+ final int length = response.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) ? mAttachment.mSize : length, callback);
+ }
+ success = true;
+ }
+ // Check that we successfully grabbed what came over the wire...
+ if (!success) {
+ LogUtils.e(LOG_TAG, "Error parsing server response");
+ return RESULT_ATTACHMENT_RESPONSE_PARSING_ERROR;
+ }
+ // Now finish the process and save to the final destination.
+ final boolean loadResult = finishLoadAttachment(mAttachment, tmpFile);
+ if (!loadResult) {
+ LogUtils.e(LOG_TAG, "Error post processing attachment file.");
+ return RESULT_ATTACHMENT_INTERNAL_HANDLING_ERROR;
+ }
+ } catch (final IOException e) {
+ LogUtils.e(LOG_TAG, "Error handling attachment: %s", e.getMessage());
+ return RESULT_ATTACHMENT_INTERNAL_HANDLING_ERROR;
+ } finally {
+ close(is);
+ }
+ } finally {
+ close(os);
+ }
+ } finally {
+ tmpFile.delete();
+ }
+ return RESULT_SUCCESS;
+ }
+}
diff --git a/src/com/android/exchange/eas/EasMoveItems.java b/src/com/android/exchange/eas/EasMoveItems.java
index 97ce18c..a57b95d 100644
--- a/src/com/android/exchange/eas/EasMoveItems.java
+++ b/src/com/android/exchange/eas/EasMoveItems.java
@@ -4,7 +4,6 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.content.SyncResult;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
@@ -52,27 +51,39 @@
}
// TODO: Allow multiple messages in one request. Requires parser changes.
- public int upsyncMovedMessages(final SyncResult syncResult) {
- final List<MessageMove> moves = MessageMove.getMoves(mContext, mAccountId);
+ public int upsyncMovedMessages() {
+ final List<MessageMove> moves = MessageMove.getMoves(mContext, getAccountId());
if (moves == null) {
return RESULT_NO_MESSAGES;
}
final long[][] messageIds = new long[3][moves.size()];
final int[] counts = new int[3];
+ int result = RESULT_NO_MESSAGES;
for (final MessageMove move : moves) {
mMove = move;
- final int result = performOperation(syncResult);
+ if (result >= 0) {
+ // If our previous time through the loop succeeded, keep making server requests.
+ // Otherwise, we carry through the loop for all messages with the last error
+ // response, which will stop trying this iteration and force the rest of the
+ // messages into the retry state.
+ result = performOperation();
+ }
final int status;
- if (result == RESULT_OK) {
- processResponse(mMove, mResponse);
- status = mResponse.moveStatus;
+ if (result >= 0) {
+ if (result == RESULT_OK) {
+ processResponse(mMove, mResponse);
+ status = mResponse.moveStatus;
+ } else {
+ // TODO: Should this really be a retry?
+ // We got a 200 response with an empty payload. It's not clear we ought to
+ // retry, but this is how our implementation has worked in the past.
+ status = MoveItemsParser.STATUS_CODE_RETRY;
+ }
} else {
- // TODO: Perhaps not all errors should be retried?
- // Notably, if the server returns 200 with an empty response, we retry. This is
- // how the previous version worked, and I can't find documentation about what this
- // response state really means.
+ // performOperation returned a negative status code, indicating a failure before the
+ // server actually was able to tell us yea or nay, so we must retry.
status = MoveItemsParser.STATUS_CODE_RETRY;
}
final int index;
@@ -91,7 +102,10 @@
MessageMove.upsyncFail(cr, messageIds[1], counts[1]);
MessageMove.upsyncRetry(cr, messageIds[2], counts[2]);
- return RESULT_OK;
+ if (result >= 0) {
+ return RESULT_OK;
+ }
+ return result;
}
@Override
@@ -113,8 +127,7 @@
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
- throws IOException {
+ protected int handleResponse(final EasResponse response) throws IOException {
if (!response.isEmpty()) {
final MoveItemsParser parser = new MoveItemsParser(response.getInputStream());
parser.parse();
diff --git a/src/com/android/exchange/eas/EasOperation.java b/src/com/android/exchange/eas/EasOperation.java
index ca577bb..d335992 100644
--- a/src/com/android/exchange/eas/EasOperation.java
+++ b/src/com/android/exchange/eas/EasOperation.java
@@ -39,6 +39,7 @@
import com.android.exchange.adapter.Serializer;
import com.android.exchange.adapter.Tags;
import com.android.exchange.service.EasServerConnection;
+import com.android.mail.providers.UIProvider;
import com.android.mail.utils.LogUtils;
import org.apache.http.HttpEntity;
@@ -56,15 +57,45 @@
* 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.)
+ * {@link #performOperation} calls various abstract functions to create the request and parse the
+ * response. For the most part subclasses can implement just these bits of functionality and rely
+ * on {@link #performOperation} to do all the boilerplate etc.
+ *
+ * There are also a set of functions that a subclass may override if it's substantially
+ * different from the "normal" operation (e.g. autodiscover deviates from the standard URI since
+ * it's not account-specific so it needs to override {@link #getRequestUri()}), but the default
+ * implementations of these functions should suffice for most operations.
+ *
+ * Some subclasses may need to override {@link #performOperation} to add validation and results
+ * processing around a call to super.performOperation. Subclasses should avoid doing too much more
+ * than wrapping some handling around the chained call; if you find that's happening, it's likely
+ * a sign that the base class needs to be enhanced.
+ *
+ * One notable reason this wrapping happens is for operations that need to return a result directly
+ * to their callers (as opposed to simply writing the results to the provider, as is common with
+ * sync operations). This happens for example in
+ * {@link com.android.emailcommon.service.IEmailService} message handlers. In such cases, due to
+ * how {@link com.android.exchange.service.EasService} uses this class, the subclass needs to
+ * store the result as a member variable and then provide an accessor to read the result. Since
+ * different operations have different results (or none at all), there is no function in the base
+ * class for this.
+ *
+ * Note that it is not practical to avoid the race between when an operation loads its account data
+ * and when it uses it, as that would require some form of locking in the provider. There are three
+ * interesting situations where this might happen, and that this class must handle:
+ *
+ * 1) Deleted from provider: Any subsequent provider access should return an error. Operations
+ * must detect this and terminate with an error.
+ * 2) Account sync settings change: Generally only affects Ping. We interrupt the operation and
+ * load the new settings before proceeding.
+ * 3) Sync suspended due to hold: A special case of the previous, and affects all operations, but
+ * fortunately doesn't need special handling here. Correct provider functionality must generate
+ * write failures, so the handling for #1 should cover this case as well.
+ *
+ * This class attempts to defer loading of account data as long as possible -- ideally we load
+ * immediately before the network request -- but does not proactively check for changes after that.
+ * This approach is a a practical balance between minimizing the race without adding too much
+ * complexity beyond what's required.
*/
public abstract class EasOperation {
public static final String LOG_TAG = Eas.LOG_TAG;
@@ -75,6 +106,13 @@
/** Message MIME type for EAS version 14 and later. */
private static final String EAS_14_MIME_TYPE = "application/vnd.ms-sync.wbxml";
+ /**
+ * EasOperation error codes below. All subclasses should try to create error codes
+ * that do not overlap these codes or the codes of other subclasses. The error
+ * code values for each subclass should start in a different 100 range (i.e. -100,
+ * -200, etc...).
+ */
+
/** Error code indicating the operation was cancelled via {@link #abort}. */
public static final int RESULT_ABORT = -1;
/** Error code indicating the operation was cancelled via {@link #restart}. */
@@ -93,42 +131,111 @@
public static final int RESULT_CLIENT_CERTIFICATE_REQUIRED = -8;
/** Error code indicating we don't have a protocol version in common with the server. */
public static final int RESULT_PROTOCOL_VERSION_UNSUPPORTED = -9;
+ /** Error code indicating a hard error when initializing the operation. */
+ public static final int RESULT_INITIALIZATION_FAILURE = -10;
+ /** Error code indicating a hard data layer error. */
+ public static final int RESULT_HARD_DATA_FAILURE = -11;
+ /** Error code indicating that this operation failed, but we should not abort the sync */
+ /** TODO: This is currently only used in EasOutboxSync, no other place handles it correctly */
+ public static final int RESULT_NON_FATAL_ERROR = -12;
/** Error code indicating some other failure. */
- public static final int RESULT_OTHER_FAILURE = -10;
+ public static final int RESULT_OTHER_FAILURE = -99;
+ /** Constant to delimit where op specific error codes begin. */
+ public static final int RESULT_OP_SPECIFIC_ERROR_RESULT = -100;
protected final Context mContext;
- /**
- * The account id for this operation.
- * NOTE: You will be tempted to add a reference to the {@link Account} here. Resist.
- * It's too easy for that to lead to creep and stale data.
- */
- protected final long mAccountId;
- private final EasServerConnection mConnection;
+ /** The provider id for the account this operation is on. */
+ private final long mAccountId;
- // TODO: Make this private again when EasSyncHandler is converted to be a subclass.
- protected EasOperation(final Context context, final long accountId,
- final EasServerConnection connection) {
+ /** The cached {@link Account} state; can be null if it hasn't been loaded yet. */
+ protected Account mAccount;
+
+ /** The connection to use for this operation. This is created when {@link #mAccount} is set. */
+ private EasServerConnection mConnection;
+
+ public class MessageInvalidException extends Exception {
+ public MessageInvalidException(final String message) {
+ super(message);
+ }
+ }
+
+ /**
+ * Constructor which defers loading of account and connection info.
+ * @param context
+ * @param accountId
+ */
+ protected EasOperation(final Context context, final long accountId) {
mContext = context;
mAccountId = accountId;
+ }
+
+ protected EasOperation(final Context context, final Account account,
+ final EasServerConnection connection) {
+ this(context, account.mId);
+ mAccount = account;
mConnection = connection;
}
protected EasOperation(final Context context, final Account account, final HostAuth hostAuth) {
- this(context, account.mId, new EasServerConnection(context, account, hostAuth));
+ this(context, account, new EasServerConnection(context, account, hostAuth));
}
protected EasOperation(final Context context, final Account account) {
- this(context, account, HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv));
+ this(context, account, account.getOrCreateHostAuthRecv(context));
}
/**
* This constructor is for use by operations that are created by other operations, e.g.
- * {@link EasProvision}.
+ * {@link EasProvision}. It reuses the account and connection of its parent.
* @param parentOperation The {@link EasOperation} that is creating us.
*/
protected EasOperation(final EasOperation parentOperation) {
- this(parentOperation.mContext, parentOperation.mAccountId, parentOperation.mConnection);
+ mContext = parentOperation.mContext;
+ mAccountId = parentOperation.mAccountId;
+ mAccount = parentOperation.mAccount;
+ mConnection = parentOperation.mConnection;
+ }
+
+ /**
+ * Some operations happen before the account exists (e.g. account validation).
+ * These operations cannot use {@link #init}, so instead we make a dummy account and
+ * supply a temporary {@link HostAuth}.
+ * @param hostAuth
+ */
+ protected final void setDummyAccount(final HostAuth hostAuth) {
+ mAccount = new Account();
+ mAccount.mEmailAddress = hostAuth.mLogin;
+ mConnection = new EasServerConnection(mContext, mAccount, hostAuth);
+ }
+
+ /**
+ * Loads (or reloads) the {@link Account} for this operation, and sets up our connection to the
+ * server. This can be overridden to add additional functionality, but child implementations
+ * should always call super().
+ * @param allowReload If false, do not perform a load if we already have an {@link Account}
+ * (i.e. just keep the existing one); otherwise allow replacement of the
+ * account. Note that this can result in a valid Account being replaced with
+ * null if the account no longer exists.
+ * @return Whether we now have a valid {@link Account} object.
+ */
+ public boolean init(final boolean allowReload) {
+ if (mAccount == null || allowReload) {
+ mAccount = Account.restoreAccountWithId(mContext, getAccountId());
+ if (mAccount != null) {
+ mConnection = new EasServerConnection(mContext, mAccount,
+ mAccount.getOrCreateHostAuthRecv(mContext));
+ }
+ }
+ return (mAccount != null);
+ }
+
+ public final long getAccountId() {
+ return mAccountId;
+ }
+
+ public final Account getAccount() {
+ return mAccount;
}
/**
@@ -165,11 +272,16 @@
* negative result code, which will be handled the same as if it had been indicated in the HTTP
* response code.
*
- * @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, as described above.
*/
- protected final int performOperation(final SyncResult syncResult) {
+ public int performOperation() {
+ // Make sure the account is loaded if it hasn't already been.
+ if (!init(false)) {
+ LogUtils.i(LOG_TAG, "Failed to initialize %d before sending request for operation %s",
+ getAccountId(), getCommand());
+ return RESULT_INITIALIZATION_FAILURE;
+ }
+
// We handle server redirects by looping, but we need to protect against too much looping.
int redirectCount = 0;
@@ -177,7 +289,11 @@
// Perform the HTTP request and handle exceptions.
final EasResponse response;
try {
- response = mConnection.executeHttpUriRequest(makeRequest(), getTimeout());
+ try {
+ response = mConnection.executeHttpUriRequest(makeRequest(), getTimeout());
+ } finally {
+ onRequestMade();
+ }
} catch (final IOException e) {
// If we were stopped, return the appropriate result code.
switch (mConnection.getStoppedReason()) {
@@ -194,26 +310,19 @@
message = "(no message)";
}
LogUtils.i(LOG_TAG, "IOException while sending request: %s", message);
- if (syncResult != null) {
- ++syncResult.stats.numIoExceptions;
- }
return RESULT_REQUEST_FAILURE;
} catch (final CertificateException e) {
LogUtils.i(LOG_TAG, "CertificateException while sending request: %s",
e.getMessage());
- if (syncResult != null) {
- // TODO: Is this the best stat to increment?
- ++syncResult.stats.numAuthExceptions;
- }
return RESULT_CLIENT_CERTIFICATE_REQUIRED;
+ } catch (final MessageInvalidException e) {
+ LogUtils.d(LOG_TAG, "Exception sending request %s", e.getMessage());
+ return RESULT_NON_FATAL_ERROR;
} catch (final IllegalStateException e) {
// Subclasses use ISE to signal a hard error when building the request.
// TODO: Switch away from ISEs.
LogUtils.e(LOG_TAG, e, "Exception while sending request");
- if (syncResult != null) {
- syncResult.databaseError = true;
- }
- return RESULT_OTHER_FAILURE;
+ return RESULT_HARD_DATA_FAILURE;
}
// The POST completed, so process the response.
@@ -223,12 +332,9 @@
if (response.isSuccess()) {
int responseResult;
try {
- responseResult = handleResponse(response, syncResult);
+ responseResult = handleResponse(response);
} catch (final IOException e) {
LogUtils.e(LOG_TAG, e, "Exception while handling response");
- if (syncResult != null) {
- ++syncResult.stats.numIoExceptions;
- }
return RESULT_REQUEST_FAILURE;
} catch (final CommandStatusException e) {
// For some operations (notably Sync & FolderSync), errors are signaled in
@@ -248,7 +354,7 @@
}
result = responseResult;
} else {
- result = RESULT_OTHER_FAILURE;
+ result = handleHttpError(response.getStatus());
}
// Non-negative results indicate success. Return immediately and bypass the error
@@ -260,36 +366,24 @@
// If this operation has distinct handling for 403 errors, do that.
if (result == RESULT_FORBIDDEN || (response.isForbidden() && handleForbidden())) {
LogUtils.e(LOG_TAG, "Forbidden response");
- if (syncResult != null) {
- // TODO: Is this the best stat to increment?
- ++syncResult.stats.numAuthExceptions;
- }
return RESULT_FORBIDDEN;
}
// Handle provisioning errors.
if (result == RESULT_PROVISIONING_ERROR || response.isProvisionError()) {
- if (handleProvisionError(syncResult, mAccountId)) {
+ if (handleProvisionError()) {
// The provisioning error has been taken care of, so we should re-do this
// request.
LogUtils.d(LOG_TAG, "Provisioning error handled during %s, retrying",
getCommand());
continue;
}
- if (syncResult != null) {
- LogUtils.e(LOG_TAG, "Issue with provisioning");
- // TODO: Is this the best stat to increment?
- ++syncResult.stats.numAuthExceptions;
- }
return RESULT_PROVISIONING_ERROR;
}
// Handle authentication errors.
if (response.isAuthError()) {
LogUtils.e(LOG_TAG, "Authentication error");
- if (syncResult != null) {
- ++syncResult.stats.numAuthExceptions;
- }
if (response.isMissingCertificate()) {
return RESULT_CLIENT_CERTIFICATE_REQUIRED;
}
@@ -305,10 +399,7 @@
// All other errors.
LogUtils.e(LOG_TAG, "Generic error for operation %s: status %d, result %d",
getCommand(), response.getStatus(), result);
- if (syncResult != null) {
- // TODO: Is this the best stat to increment?
- ++syncResult.stats.numIoExceptions;
- }
+ // TODO: This probably should return result.
return RESULT_OTHER_FAILURE;
}
} finally {
@@ -319,20 +410,29 @@
// Non-redirects return immediately after handling, 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;
}
+ protected void onRequestMade() {
+ // This can be overridden to do any cleanup that must happen after the request has
+ // been sent. It will always be called, regardless of the status of the request.
+ }
+
+ protected int handleHttpError(final int httpStatus) {
+ // This function can be overriden if the child class needs to change the result code
+ // based on the http response status.
+ return RESULT_OTHER_FAILURE;
+ }
+
/**
* Reset the protocol version to use for this connection. If it's changed, and our account is
* persisted, also write back the changes to the DB.
* @param protocolVersion The new protocol version to use, as a string.
*/
protected final void setProtocolVersion(final String protocolVersion) {
- if (mConnection.setProtocolVersion(protocolVersion) && mAccountId != Account.NOT_SAVED) {
- final Uri uri = ContentUris.withAppendedId(Account.CONTENT_URI, mAccountId);
+ final long accountId = getAccountId();
+ if (mConnection.setProtocolVersion(protocolVersion) && accountId != Account.NOT_SAVED) {
+ final Uri uri = ContentUris.withAppendedId(Account.CONTENT_URI, accountId);
final ContentValues cv = new ContentValues(2);
if (getProtocolVersion() >= 12.0) {
final int oldFlags = Utility.getFirstRowInt(mContext, uri,
@@ -355,7 +455,7 @@
* @return An {@link HttpUriRequest}.
* @throws IOException
*/
- private final HttpUriRequest makeRequest() throws IOException {
+ private final HttpUriRequest makeRequest() throws IOException, MessageInvalidException {
final String requestUri = getRequestUri();
if (requestUri == null) {
return mConnection.makeOptions();
@@ -385,20 +485,18 @@
* @return The {@link HttpEntity} to pass to {@link EasServerConnection#makePost}.
* @throws IOException
*/
- protected abstract HttpEntity getRequestEntity() throws IOException;
+ protected abstract HttpEntity getRequestEntity() throws IOException, MessageInvalidException;
/**
* 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. Non-negative values are returned directly to the caller; negative
* values
*
* that is returned to the caller of {@link #performOperation}.
* @throws IOException
*/
- protected abstract int handleResponse(final EasResponse response, final SyncResult syncResult)
+ protected abstract int handleResponse(final EasResponse response)
throws IOException, CommandStatusException;
/**
@@ -448,13 +546,11 @@
/**
* Handle a provisioning error. Subclasses may override this to do something different, e.g.
* to validate rather than actually do the provisioning.
- * @param syncResult
- * @param accountId
* @return
*/
- protected boolean handleProvisionError(final SyncResult syncResult, final long accountId) {
+ protected boolean handleProvisionError() {
final EasProvision provisionOperation = new EasProvision(this);
- return provisionOperation.provision(syncResult, accountId);
+ return provisionOperation.provision();
}
/**
@@ -502,14 +598,16 @@
/**
* Add the device information to the current request.
* @param s The {@link Serializer} for our current request.
- * @throws IOException
+ * @param context The {@link Context} for current device.
+ * @param userAgent The user agent string that our connection use.
*/
- protected final void addDeviceInformationToSerlializer(final Serializer s) throws IOException {
- final TelephonyManager tm = (TelephonyManager)mContext.getSystemService(
- Context.TELEPHONY_SERVICE);
+ protected static void expandedAddDeviceInformationToSerializer(final Serializer s,
+ final Context context, final String userAgent) throws IOException {
final String deviceId;
final String phoneNumber;
final String operator;
+ final TelephonyManager tm = (TelephonyManager)context.getSystemService(
+ Context.TELEPHONY_SERVICE);
if (tm != null) {
deviceId = tm.getDeviceId();
phoneNumber = tm.getLine1Number();
@@ -541,10 +639,10 @@
}
// Set the device friendly name, if we have one.
// TODO: Longer term, this should be done without a provider call.
- final Bundle bundle = mContext.getContentResolver().call(
+ final Bundle deviceName = context.getContentResolver().call(
EmailContent.CONTENT_URI, EmailContent.DEVICE_FRIENDLY_NAME, null, null);
- if (bundle != null) {
- final String friendlyName = bundle.getString(EmailContent.DEVICE_FRIENDLY_NAME);
+ if (deviceName != null) {
+ final String friendlyName = deviceName.getString(EmailContent.DEVICE_FRIENDLY_NAME);
if (!TextUtils.isEmpty(friendlyName)) {
s.data(Tags.SETTINGS_FRIENDLY_NAME, friendlyName);
}
@@ -558,7 +656,7 @@
// idea of the language will be wrong. Since we're not sure what this is used for,
// right now we're leaving it out.
//s.data(Tags.SETTINGS_OS_LANGUAGE, Locale.getDefault().getDisplayLanguage());
- s.data(Tags.SETTINGS_USER_AGENT, getUserAgent());
+ s.data(Tags.SETTINGS_USER_AGENT, userAgent);
if (operator != null) {
s.data(Tags.SETTINGS_MOBILE_OPERATOR, operator);
}
@@ -566,6 +664,16 @@
}
/**
+ * Add the device information to the current request.
+ * @param s The {@link Serializer} that contains the payload for this request.
+ */
+ protected final void addDeviceInformationToSerializer(final Serializer s)
+ throws IOException {
+ final String userAgent = getUserAgent();
+ expandedAddDeviceInformationToSerializer(s, mContext, userAgent);
+ }
+
+ /**
* 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
@@ -603,6 +711,15 @@
protected static void requestSyncForMailboxes(final android.accounts.Account amAccount,
final ArrayList<Long> mailboxIds) {
final Bundle extras = Mailbox.createSyncBundle(mailboxIds);
+ /**
+ * Please note that it is very possible that we are trying to send a request to the
+ * email sync adapter even though email push is turned off (i.e. this account might only
+ * be syncing calendar or contacts). In this situation we need to make sure that
+ * this request is marked as manual as to ensure that the sync manager does not drop it
+ * on the floor. Right now, this function is only called by EasPing, if it is every called
+ * by another caller, then we should reconsider if manual=true is the right thing to do.
+ */
+ extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
ContentResolver.requestSync(amAccount, EmailContent.AUTHORITY, extras);
LogUtils.i(LOG_TAG, "requestSync EasOperation requestSyncForMailboxes %s, %s",
amAccount.toString(), extras.toString());
@@ -625,4 +742,63 @@
LogUtils.d(LOG_TAG, "requestSync EasOperation requestNoOpSync %s, %s",
amAccount.toString(), extras.toString());
}
+
+ /**
+ * Interpret a result code from an {@link EasOperation} and, if it's an error, write it to
+ * the appropriate field in {@link SyncResult}.
+ * @param result
+ * @param syncResult
+ * @return Whether an error code was written to syncResult.
+ */
+ public static boolean writeResultToSyncResult(final int result, final SyncResult syncResult) {
+ switch (result) {
+ case RESULT_TOO_MANY_REDIRECTS:
+ syncResult.tooManyRetries = true;
+ return true;
+ case RESULT_REQUEST_FAILURE:
+ syncResult.stats.numIoExceptions = 1;
+ return true;
+ case RESULT_FORBIDDEN:
+ case RESULT_PROVISIONING_ERROR:
+ case RESULT_AUTHENTICATION_ERROR:
+ case RESULT_CLIENT_CERTIFICATE_REQUIRED:
+ syncResult.stats.numAuthExceptions = 1;
+ return true;
+ case RESULT_PROTOCOL_VERSION_UNSUPPORTED:
+ // Only used in validate, so there's never a syncResult to write to here.
+ break;
+ case RESULT_INITIALIZATION_FAILURE:
+ case RESULT_HARD_DATA_FAILURE:
+ syncResult.databaseError = true;
+ return true;
+ case RESULT_OTHER_FAILURE:
+ // TODO: Is this correct?
+ syncResult.stats.numIoExceptions = 1;
+ return true;
+ }
+ return false;
+ }
+
+ public static int translateSyncResultToUiResult(final int result) {
+ switch (result) {
+ case RESULT_TOO_MANY_REDIRECTS:
+ return UIProvider.LastSyncResult.INTERNAL_ERROR;
+ case RESULT_REQUEST_FAILURE:
+ return UIProvider.LastSyncResult.CONNECTION_ERROR;
+ case RESULT_FORBIDDEN:
+ case RESULT_PROVISIONING_ERROR:
+ case RESULT_AUTHENTICATION_ERROR:
+ case RESULT_CLIENT_CERTIFICATE_REQUIRED:
+ return UIProvider.LastSyncResult.AUTH_ERROR;
+ case RESULT_PROTOCOL_VERSION_UNSUPPORTED:
+ // Only used in validate, so there's never a syncResult to write to here.
+ break;
+ case RESULT_INITIALIZATION_FAILURE:
+ case RESULT_HARD_DATA_FAILURE:
+ return UIProvider.LastSyncResult.INTERNAL_ERROR;
+ case RESULT_OTHER_FAILURE:
+ return UIProvider.LastSyncResult.INTERNAL_ERROR;
+ }
+ return UIProvider.LastSyncResult.SUCCESS;
+ }
}
diff --git a/src/com/android/exchange/eas/EasOptions.java b/src/com/android/exchange/eas/EasOptions.java
index 32d2c75..131c391 100644
--- a/src/com/android/exchange/eas/EasOptions.java
+++ b/src/com/android/exchange/eas/EasOptions.java
@@ -16,8 +16,6 @@
package com.android.exchange.eas;
-import android.content.SyncResult;
-
import com.android.exchange.Eas;
import com.android.exchange.EasResponse;
import com.android.mail.utils.LogUtils;
@@ -53,11 +51,10 @@
/**
* Perform the server request. If successful, callers should use
* {@link #getProtocolVersionString} to get the actual protocol version value.
- * @param syncResult The {@link SyncResult} to use for this operation.
* @return A result code; {@link #RESULT_OK} is the only value that indicates success.
*/
- public int getProtocolVersionFromServer(final SyncResult syncResult) {
- return performOperation(syncResult);
+ public int getProtocolVersionFromServer() {
+ return performOperation();
}
/**
@@ -82,7 +79,7 @@
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult) {
+ protected int handleResponse(final EasResponse response) {
final Header commands = response.getHeader("MS-ASProtocolCommands");
final Header versions = response.getHeader("ms-asprotocolversions");
final boolean hasProtocolVersion;
diff --git a/src/com/android/exchange/service/EasOutboxSyncHandler.java b/src/com/android/exchange/eas/EasOutboxSync.java
similarity index 61%
rename from src/com/android/exchange/service/EasOutboxSyncHandler.java
rename to src/com/android/exchange/eas/EasOutboxSync.java
index c2bff15..f8b428c 100644
--- a/src/com/android/exchange/service/EasOutboxSyncHandler.java
+++ b/src/com/android/exchange/eas/EasOutboxSync.java
@@ -1,16 +1,15 @@
-package com.android.exchange.service;
+package com.android.exchange.eas;
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 android.util.Log;
-import com.android.emailcommon.TrafficFlags;
+import com.android.emailcommon.internet.MimeUtility;
import com.android.emailcommon.internet.Rfc822Output;
import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Body;
import com.android.emailcommon.provider.EmailContent.BodyColumns;
@@ -18,15 +17,15 @@
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.CommandStatusException;
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.CommandStatusException.CommandStatus;
+import com.android.exchange.adapter.SendMailParser;
import com.android.exchange.adapter.Serializer;
import com.android.exchange.adapter.Tags;
+import com.android.exchange.adapter.Parser.EmptyStreamException;
import com.android.mail.utils.LogUtils;
import org.apache.http.HttpEntity;
@@ -39,70 +38,211 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
-import java.security.cert.CertificateException;
import java.util.ArrayList;
-/**
- * Performs an Exchange Outbox sync, i.e. sends all mail from the Outbox.
- */
-public class EasOutboxSyncHandler extends EasServerConnection {
+public class EasOutboxSync extends EasOperation {
+
// 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 static final int RESULT_OK = 1;
+ public static final int RESULT_IO_ERROR = -100;
+ public static final int RESULT_ITEM_NOT_FOUND = -101;
+ public static final int RESULT_SEND_FAILED = -102;
- public EasOutboxSyncHandler(final Context context, final Account account,
- final Mailbox mailbox) {
+ private final Message mMessage;
+ private final boolean mIsEas14;
+ private final File mCacheDir;
+ private final SmartSendInfo mSmartSendInfo;
+ private final int mModeTag;
+ private File mTmpFile;
+ private FileInputStream mFileStream;
+
+ public EasOutboxSync(final Context context, final Account account, final Message message,
+ final boolean useSmartSend) {
super(context, account);
- mMailbox = mailbox;
+ mMessage = message;
+ mIsEas14 = (Double.parseDouble(mAccount.mProtocolVersion) >=
+ Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE);
mCacheDir = context.getCacheDir();
+ if (useSmartSend) {
+ mSmartSendInfo = SmartSendInfo.getSmartSendInfo(mContext, mAccount, mMessage);
+ } else {
+ mSmartSendInfo = null;
+ }
+ mModeTag = getModeTag(mSmartSendInfo);
}
- 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;
- }
+ @Override
+ protected String getCommand() {
+ String cmd = "SendMail";
+ if (mSmartSendInfo != null) {
+ // In EAS 14, we don't send itemId and collectionId in the command
+ if (mIsEas14) {
+ cmd = mSmartSendInfo.isForward() ? "SmartForward" : "SmartReply";
+ } else {
+ cmd = mSmartSendInfo.generateSmartSendCmd();
}
- } finally {
- // TODO: Some sort of sendMessageStatus() is needed here.
- c.close();
}
+ // If we're not EAS 14, add our save-in-sent setting here
+ if (!mIsEas14) {
+ cmd += "&SaveInSent=T";
+ }
+ return cmd;
+ }
+
+ @Override
+ protected HttpEntity getRequestEntity() throws IOException, MessageInvalidException {
+ try {
+ mTmpFile = File.createTempFile("eas_", "tmp", mCacheDir);
+ } catch (final IOException e) {
+ LogUtils.w(LOG_TAG, "IO error creating temp file");
+ throw new IllegalStateException("Failure creating temp file");
+ }
+
+ if (!writeMessageToTempFile(mTmpFile, mMessage, mSmartSendInfo)) {
+ // There are several reasons this could happen, possibly the message is corrupt (e.g.
+ // the To header is null) or the disk is too full to handle the temporary message.
+ // We can't send this message, but we don't want to abort the entire sync. Returning
+ // this error code will let the caller recognize that this operation failed, but we
+ // should continue on with the rest of the sync.
+ LogUtils.w(LOG_TAG, "IO error writing to temp file");
+ throw new MessageInvalidException("Failure writing to temp file");
+ }
+
+ try {
+ mFileStream = new FileInputStream(mTmpFile);
+ } catch (final FileNotFoundException e) {
+ LogUtils.w(LOG_TAG, "IO error creating fileInputStream");
+ throw new IllegalStateException("Failure creating fileInputStream");
+ }
+ final long fileLength = mTmpFile.length();
+ final HttpEntity entity;
+ if (mIsEas14) {
+ entity = new SendMailEntity(mFileStream, fileLength, mModeTag, mMessage,
+ mSmartSendInfo);
+ } else {
+ entity = new InputStreamEntity(mFileStream, fileLength);
+ }
+
+ return entity;
+ }
+
+ @Override
+ protected int handleHttpError(int httpStatus) {
+ if (httpStatus == HttpStatus.SC_INTERNAL_SERVER_ERROR && mSmartSendInfo != null) {
+ // Let's retry without "smart" commands.
+ return RESULT_ITEM_NOT_FOUND;
+ } else {
+ return RESULT_OTHER_FAILURE;
+ }
+ }
+
+ @Override
+ protected void onRequestMade() {
+ try {
+ mFileStream.close();
+ } catch (IOException e) {
+ LogUtils.w(LOG_TAG, "IOException closing fileStream %s", e);
+ }
+ if (mTmpFile != null && mTmpFile.exists()) {
+ mTmpFile.delete();
+ }
+ }
+
+ @Override
+ protected int handleResponse(EasResponse response) throws IOException, CommandStatusException {
+ if (mIsEas14) {
+ try {
+ // Try to parse the result
+ final SendMailParser p = new SendMailParser(response.getInputStream(), mModeTag);
+ // 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)) {
+ LogUtils.w(LOG_TAG, "Needs provisioning sending mail");
+ return RESULT_PROVISIONING_ERROR;
+ } else if (status == CommandStatus.ITEM_NOT_FOUND &&
+ mSmartSendInfo != null) {
+ // Let's retry without "smart" commands.
+ LogUtils.w(LOG_TAG, "Needs provisioning sending mail");
+ return RESULT_ITEM_NOT_FOUND;
+ }
+
+ // TODO: Set syncServerId = SEND_FAILED in DB?
+ LogUtils.d(LOG_TAG, "General failure sending mail");
+ return RESULT_SEND_FAILED;
+ } catch (final EmptyStreamException e) {
+ // This is actually fine; an empty stream means SendMail succeeded
+ LogUtils.d(LOG_TAG, "empty response sending mail");
+ // Don't return here, fall through so that we'll delete the sent message.
+ } catch (final IOException e) {
+ // Parsing failed in some other way.
+ LogUtils.w(LOG_TAG, "IOException sending mail");
+ return RESULT_IO_ERROR;
+ }
+ } else {
+ // FLAG: Do we need to parse results for earlier versions?
+ }
+ mContext.getContentResolver().delete(
+ ContentUris.withAppendedId(Message.CONTENT_URI, mMessage.mId), null, null);
+ return RESULT_OK;
+ }
+
+ /**
+ * 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);
+ Log.d(LogUtils.TAG, "created outputstream");
+ } catch (final FileNotFoundException e) {
+ Log.e(LogUtils.TAG, "Failed to create message file", 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) {
+ Log.e(LogUtils.TAG, "Failed to write message file", e);
+ return false;
+ } finally {
+ try {
+ fileStream.close();
+ } catch (final IOException e) {
+ // should not happen
+ Log.e(LogUtils.TAG, "Failed to close file - should not happen", e);
+ }
+ }
+ return true;
+ }
+
+ private int getModeTag(final SmartSendInfo smartSendInfo) {
+ if (mIsEas14) {
+ 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;
}
/**
@@ -118,8 +258,8 @@
final boolean mIsReply;
final ArrayList<Attachment> mRequiredAtts;
- private SmartSendInfo(final String itemId, final String collectionId, final boolean isReply,
- final ArrayList<Attachment> requiredAtts) {
+ private SmartSendInfo(final String itemId, final String collectionId,
+ final boolean isReply,ArrayList<Attachment> requiredAtts) {
mItemId = itemId;
mCollectionId = collectionId;
mIsReply = isReply;
@@ -252,6 +392,16 @@
}
}
+ @Override
+ public String getRequestContentType() {
+ // When using older protocols, we need to use a different MIME type for sending messages.
+ if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
+ return MimeUtility.MIME_TYPE_RFC822;
+ } else {
+ return super.getRequestContentType();
+ }
+ }
+
/**
* 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
@@ -354,221 +504,4 @@
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;
- } catch (final CertificateException e) {
- return false;
- }
-
- } 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()) {
- LogUtils.d(LogUtils.TAG, "Got auth error from server during outbox sync");
- return false; // TODO: Handle SyncStatus.FAILURE_LOGIN;
- } else if (resp.isProvisionError()) {
- LogUtils.d(LogUtils.TAG, "Got provision error from server during outbox sync.");
- return false; // TODO: Handle SyncStatus.FAILURE_SECURITY;
- } else {
- // TODO: Handle some other error
- LogUtils.d(LogUtils.TAG,
- "Got other HTTP error from server during outbox sync: %d", code);
- return false;
- }
- }
- } 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) {
- Log.e(LogUtils.TAG, "Failed to create message file", 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) {
- Log.e(LogUtils.TAG, "Failed to write message file", e);
- return false;
- } finally {
- try {
- fileStream.close();
- } catch (final IOException e) {
- // should not happen
- Log.e(LogUtils.TAG, "Failed to close file - should not happen", e);
- }
- }
- 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/eas/EasPing.java b/src/com/android/exchange/eas/EasPing.java
index 507ca0c..2ca4420 100644
--- a/src/com/android/exchange/eas/EasPing.java
+++ b/src/com/android/exchange/eas/EasPing.java
@@ -19,12 +19,9 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.content.SyncResult;
import android.database.Cursor;
import android.os.Bundle;
import android.os.SystemClock;
-import android.provider.CalendarContract;
-import android.provider.ContactsContract;
import android.text.format.DateUtils;
import com.android.emailcommon.provider.Account;
@@ -44,9 +41,7 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Set;
/**
* Performs an Exchange Ping, which is the command for receiving push notifications.
@@ -58,7 +53,6 @@
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;
private long mPingDuration;
@@ -97,18 +91,17 @@
public EasPing(final Context context, final Account account,
final android.accounts.Account amAccount) {
super(context, account);
- mAccountId = account.mId;
mAmAccount = amAccount;
mPingDuration = account.mPingDuration;
if (mPingDuration == 0) {
mPingDuration = DEFAULT_PING_HEARTBEAT;
}
- LogUtils.d(TAG, "initial ping duration " + mPingDuration + " account " + mAccountId);
+ LogUtils.d(TAG, "initial ping duration " + mPingDuration + " account " + getAccountId());
}
public final int doPing() {
final long startTime = SystemClock.elapsedRealtime();
- final int result = performOperation(null);
+ final int result = performOperation();
if (result == RESULT_RESTART) {
return PingParser.STATUS_EXPIRED;
} else if (result == RESULT_REQUEST_FAILURE) {
@@ -123,7 +116,7 @@
mPingDuration = Math.max(MINIMUM_PING_HEARTBEAT,
mPingDuration - MAXIMUM_HEARTBEAT_INCREMENT);
LogUtils.d(TAG, "decreasePingDuration adjusting by " + MAXIMUM_HEARTBEAT_INCREMENT +
- " new duration " + mPingDuration + " account " + mAccountId);
+ " new duration " + mPingDuration + " account " + getAccountId());
storePingDuration();
}
@@ -131,18 +124,14 @@
mPingDuration = Math.min(MAXIMUM_PING_HEARTBEAT,
mPingDuration + MAXIMUM_HEARTBEAT_INCREMENT);
LogUtils.d(TAG, "increasePingDuration adjusting by " + MAXIMUM_HEARTBEAT_INCREMENT +
- " new duration " + mPingDuration + " account " + mAccountId);
+ " new duration " + mPingDuration + " account " + getAccountId());
storePingDuration();
}
private void storePingDuration() {
final ContentValues values = new ContentValues(1);
values.put(AccountColumns.PING_DURATION, mPingDuration);
- Account.update(mContext, Account.CONTENT_URI, mAccountId, values);
- }
-
- public final long getAccountId() {
- return mAccountId;
+ Account.update(mContext, Account.CONTENT_URI, getAccountId(), values);
}
public final android.accounts.Account getAmAccount() {
@@ -158,7 +147,7 @@
protected HttpEntity getRequestEntity() throws IOException {
// Get the mailboxes that need push notifications.
final Cursor c = Mailbox.getMailboxesForPush(mContext.getContentResolver(),
- mAccountId);
+ getAccountId());
if (c == null) {
throw new IllegalStateException("Could not read mailboxes");
}
@@ -186,8 +175,7 @@
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
- throws IOException {
+ protected int handleResponse(final EasResponse response) throws IOException {
if (response.isEmpty()) {
// TODO this should probably not be an IOException, maybe something more descriptive?
throw new IOException("Empty ping response");
@@ -201,14 +189,15 @@
// 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.
+ final long accountId = getAccountId();
switch (pingStatus) {
case PingParser.STATUS_EXPIRED:
- LogUtils.i(TAG, "Ping expired for account %d", mAccountId);
+ LogUtils.i(TAG, "Ping expired for account %d", accountId);
// On successful expiration, we can increase our ping duration
increasePingDuration();
break;
case PingParser.STATUS_CHANGES_FOUND:
- LogUtils.i(TAG, "Ping found changed folders for account %d", mAccountId);
+ LogUtils.i(TAG, "Ping found changed folders for account %d", accountId);
requestSyncForSyncList(pp.getSyncList());
break;
case PingParser.STATUS_REQUEST_INCOMPLETE:
@@ -216,28 +205,28 @@
// 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);
+ LogUtils.e(TAG, "Bad ping request for account %d", accountId);
break;
case PingParser.STATUS_REQUEST_HEARTBEAT_OUT_OF_BOUNDS:
long newDuration = pp.getHeartbeatInterval();
LogUtils.i(TAG, "Heartbeat out of bounds for account %d, " +
- "old duration %d new duration %d", mAccountId, mPingDuration, newDuration);
+ "old duration %d new duration %d", accountId, mPingDuration, newDuration);
mPingDuration = newDuration;
storePingDuration();
break;
case PingParser.STATUS_REQUEST_TOO_MANY_FOLDERS:
- LogUtils.i(TAG, "Too many folders for account %d", mAccountId);
+ LogUtils.i(TAG, "Too many folders for account %d", accountId);
break;
case PingParser.STATUS_FOLDER_REFRESH_NEEDED:
- LogUtils.i(TAG, "FolderSync needed for account %d", mAccountId);
+ LogUtils.i(TAG, "FolderSync needed for account %d", accountId);
requestFolderSync();
break;
case PingParser.STATUS_SERVER_ERROR:
- LogUtils.i(TAG, "Server error for account %d", mAccountId);
+ LogUtils.i(TAG, "Server error for account %d", accountId);
break;
case CommandStatus.SERVER_ERROR_RETRY:
// Try again later.
- LogUtils.i(TAG, "Retryable server error for account %d", mAccountId);
+ LogUtils.i(TAG, "Retryable server error for account %d", accountId);
return RESULT_RESTART;
// These errors should not happen.
@@ -328,7 +317,7 @@
*/
private void requestSyncForSyncList(final ArrayList<String> syncList) {
final String[] bindArguments = new String[2];
- bindArguments[0] = Long.toString(mAccountId);
+ bindArguments[0] = Long.toString(getAccountId());
final ArrayList<Long> mailboxIds = new ArrayList<Long>();
final HashSet<Integer> contentTypes = new HashSet<Integer>();
@@ -423,9 +412,17 @@
mAmAccount.toString(), extras.toString());
}
+ /**
+ * Request a ping-only sync via the SyncManager. This is used in error paths, which is also why
+ * we don't just create and start a new ping task immediately: in the case where we have loss
+ * of network, we want to take advantage of the SyncManager to schedule this when we expect it
+ * to be able to work.
+ * @param amAccount Account that needs to ping.
+ */
public static void requestPing(final android.accounts.Account amAccount) {
- final Bundle extras = new Bundle(1);
+ final Bundle extras = new Bundle(2);
extras.putBoolean(Mailbox.SYNC_EXTRA_PUSH_ONLY, true);
+ extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
ContentResolver.requestSync(amAccount, EmailContent.AUTHORITY, extras);
LogUtils.i(LOG_TAG, "requestPing EasOperation %s, %s",
amAccount.toString(), extras.toString());
diff --git a/src/com/android/exchange/eas/EasProvision.java b/src/com/android/exchange/eas/EasProvision.java
index ce87da2..3fcbcf7 100644
--- a/src/com/android/exchange/eas/EasProvision.java
+++ b/src/com/android/exchange/eas/EasProvision.java
@@ -16,9 +16,11 @@
package com.android.exchange.eas;
+import android.content.ContentValues;
import android.content.Context;
-import android.content.SyncResult;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.Policy;
import com.android.emailcommon.service.PolicyServiceProxy;
import com.android.exchange.Eas;
@@ -56,16 +58,16 @@
public static final String EAS_12_POLICY_TYPE = "MS-EAS-Provisioning-WBXML";
/** The EAS protocol Provision status for "we implement all of the policies" */
- private static final String PROVISION_STATUS_OK = "1";
+ 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";
+ static final String PROVISION_STATUS_PARTIAL = "2";
/** Value for {@link #mPhase} indicating we're performing the initial request. */
- private static final int PHASE_INITIAL = 0;
+ static final int PHASE_INITIAL = 0;
/** Value for {@link #mPhase} indicating we're performing the acknowledgement request. */
- private static final int PHASE_ACKNOWLEDGE = 1;
+ static final int PHASE_ACKNOWLEDGE = 1;
/** Value for {@link #mPhase} indicating we're performing the acknowledgement for a wipe. */
- private static final int PHASE_WIPE = 2;
+ static final int PHASE_WIPE = 2;
/**
* This operation doesn't use public result codes because ultimately the operation answers
@@ -91,10 +93,9 @@
*/
private int mPhase;
- // TODO: Temporary until EasSyncHandler converts to EasOperation.
- public EasProvision(final Context context, final long accountId,
+ public EasProvision(final Context context, final Account account,
final EasServerConnection connection) {
- super(context, accountId, connection);
+ super(context, account, connection);
mPolicy = null;
mPolicyKey = null;
mStatus = null;
@@ -109,20 +110,20 @@
mPhase = 0;
}
- private int performInitialRequest(final SyncResult syncResult) {
+ private int performInitialRequest() {
mPhase = PHASE_INITIAL;
- return performOperation(syncResult);
+ return performOperation();
}
- private void performAckRequestForWipe(final SyncResult syncResult) {
+ private void performAckRequestForWipe() {
mPhase = PHASE_WIPE;
- performOperation(syncResult);
+ performOperation();
}
- private int performAckRequest(final SyncResult syncResult, final boolean isPartial) {
+ private int performAckRequest(final boolean isPartial) {
mPhase = PHASE_ACKNOWLEDGE;
mStatus = isPartial ? PROVISION_STATUS_PARTIAL : PROVISION_STATUS_OK;
- return performOperation(syncResult);
+ return performOperation();
}
/**
@@ -130,10 +131,10 @@
* @return The {@link Policy} if we support it, or null otherwise.
*/
public final Policy test() {
- int result = performInitialRequest(null);
+ int result = performInitialRequest();
if (result == RESULT_POLICY_UNSUPPORTED) {
// Check if the server will permit partial policies.
- result = performAckRequest(null, true);
+ result = performAckRequest(true);
}
if (result == RESULT_POLICY_SUPPORTED) {
// The server is ok with us not supporting everything, so clear the unsupported ones.
@@ -144,25 +145,40 @@
}
/**
+ * Write the max attachment size that came out of the policy to the Account table in the db.
+ * Once this value is written, the mapping to Account.Settings.MAX_ATTACHMENT_SIZE was
+ * added to point to this column in this table.
+ * @param maxAttachmentSize The max attachment size value that we want to write to the db.
+ */
+ private void storeMaxAttachmentSize(final int maxAttachmentSize) {
+ final ContentValues values = new ContentValues(1);
+ values.put(EmailContent.AccountColumns.MAX_ATTACHMENT_SIZE, maxAttachmentSize);
+ Account.update(mContext, Account.CONTENT_URI, getAccountId(), values);
+ }
+
+ /**
* Get the required policy from the server and enforce it.
- * @param syncResult The {@link SyncResult}, if anym for this operation.
- * @param accountId The id for the account for this request.
* @return Whether we succeeded in provisioning this account.
*/
- public final boolean provision(final SyncResult syncResult, final long accountId) {
- final int result = performInitialRequest(syncResult);
+ public final boolean provision() {
+ final int result = performInitialRequest();
+ final long accountId = getAccountId();
if (result < 0) {
return false;
}
if (result == RESULT_REMOTE_WIPE) {
- performAckRequestForWipe(syncResult);
+ performAckRequestForWipe();
LogUtils.i(LOG_TAG, "Executing remote wipe");
PolicyServiceProxy.remoteWipe(mContext);
return false;
}
+ // Even before the policy is accepted, we can honor this setting since it has nothing
+ // to do with the device policy manager and is requested by the Exchange server.
+ storeMaxAttachmentSize(mPolicy.mMaxAttachmentSize);
+
// Apply the policies (that we support) with the temporary key.
mPolicy.mProtocolPoliciesUnsupported = null;
PolicyServiceProxy.setAccountPolicy(mContext, accountId, mPolicy, null);
@@ -171,8 +187,7 @@
}
// Acknowledge to the server and make sure all's well.
- if (performAckRequest(syncResult, result == RESULT_POLICY_UNSUPPORTED) ==
- RESULT_POLICY_UNSUPPORTED) {
+ if (performAckRequest(result == RESULT_POLICY_UNSUPPORTED) == RESULT_POLICY_UNSUPPORTED) {
return false;
}
@@ -186,7 +201,7 @@
if (version == Eas.SUPPORTED_PROTOCOL_EX2007_SP1_DOUBLE
|| version == Eas.SUPPORTED_PROTOCOL_EX2010_DOUBLE) {
final EasSettings settingsOperation = new EasSettings(this);
- if (!settingsOperation.sendDeviceInformation(syncResult)) {
+ if (!settingsOperation.sendDeviceInformation()) {
// TODO: Do something more useful when the settings command fails.
// The consequence here is that the server will not have device info.
// However, this is NOT a provisioning failure.
@@ -201,38 +216,68 @@
return "Provision";
}
- @Override
- protected HttpEntity getRequestEntity() throws IOException {
+ /**
+ * Add the device information to the current request.
+ * @param context The {@link Context} for the current device.
+ * @param userAgent The user agent string that our connection uses.
+ * @param policyKey EAS specific tag for Provision requests.
+ * @param policyType EAS specific tag for Provision requests.
+ * @param status The status value that we are sending to the server in our request.
+ * @param phase The phase of the provisioning process this requests is built for.
+ * @param protocolVersion The version of the EAS protocol that we should speak.
+ * @return The {@link Serializer} containing the payload for this request.
+ */
+ protected static Serializer generateRequestEntitySerializer(
+ final Context context, final String userAgent, final String policyKey,
+ final String policyType, final String status, final int phase,
+ final double protocolVersion) throws IOException {
final Serializer s = new Serializer();
s.start(Tags.PROVISION_PROVISION);
// When requesting the policy in 14.1, we also need to send device information.
- if (mPhase == PHASE_INITIAL &&
- getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2010_SP1_DOUBLE) {
- addDeviceInformationToSerlializer(s);
+ if (phase == PHASE_INITIAL &&
+ protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2010_SP1_DOUBLE) {
+ // The "inner" version of this function is being used because it is
+ // re-entrant and can be unit tested easier. Until we are unit testing
+ // everything, the other version of this function still lives so that
+ // we are disrupting as little code as possible for now.
+ expandedAddDeviceInformationToSerializer(s, context, userAgent);
}
- s.start(Tags.PROVISION_POLICIES);
- s.start(Tags.PROVISION_POLICY);
- s.data(Tags.PROVISION_POLICY_TYPE, getPolicyType());
-
- // When acknowledging a policy, we tell the server whether we applied the policy.
- if (mPhase == PHASE_ACKNOWLEDGE) {
- s.data(Tags.PROVISION_POLICY_KEY, mPolicyKey);
- s.data(Tags.PROVISION_STATUS, mStatus);
- }
- if (mPhase == PHASE_WIPE) {
+ if (phase == PHASE_WIPE) {
s.start(Tags.PROVISION_REMOTE_WIPE);
s.data(Tags.PROVISION_STATUS, PROVISION_STATUS_OK);
- s.end();
+ s.end(); // PROVISION_REMOTE_WIPE
+ } else {
+ s.start(Tags.PROVISION_POLICIES);
+ s.start(Tags.PROVISION_POLICY);
+ s.data(Tags.PROVISION_POLICY_TYPE, policyType);
+ // When acknowledging a policy, we tell the server whether we applied the policy.
+ if (phase == PHASE_ACKNOWLEDGE) {
+ s.data(Tags.PROVISION_POLICY_KEY, policyKey);
+ s.data(Tags.PROVISION_STATUS, status);
+ }
+ s.end().end(); // PROVISION_POLICY, PROVISION_POLICIES,
}
- s.end().end().end().done(); // PROVISION_POLICY, PROVISION_POLICIES, PROVISION_PROVISION
+ s.end().done(); // PROVISION_PROVISION
+ return s;
+ }
+ /**
+ * Generates a request entity based on the type of request and our current context.
+ * @return The {@link HttpEntity} that was generated for this request.
+ */
+ @Override
+ protected HttpEntity getRequestEntity() throws IOException {
+ final String policyType = getPolicyType();
+ final String userAgent = getUserAgent();
+ final double protocolVersion = getProtocolVersion();
+ final Serializer s = generateRequestEntitySerializer(mContext, userAgent, mPolicyKey,
+ policyType, mStatus, mPhase, protocolVersion);
return makeEntity(s);
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
- throws IOException {
+ protected int handleResponse(final EasResponse response) throws IOException {
final ProvisionParser pp = new ProvisionParser(mContext, response.getInputStream());
// If this is the response for a remote wipe ack, it doesn't have anything useful in it.
// Just go ahead and return now.
@@ -267,7 +312,7 @@
}
@Override
- protected boolean handleProvisionError(final SyncResult syncResult, final long accountId) {
+ protected boolean handleProvisionError() {
// If we get a provisioning error while doing provisioning, we should not recurse.
return false;
}
diff --git a/src/com/android/exchange/eas/EasSearch.java b/src/com/android/exchange/eas/EasSearch.java
new file mode 100644
index 0000000..34869bb
--- /dev/null
+++ b/src/com/android/exchange/eas/EasSearch.java
@@ -0,0 +1,165 @@
+package com.android.exchange.eas;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SyncResult;
+
+import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.service.SearchParams;
+import com.android.exchange.CommandStatusException;
+import com.android.exchange.Eas;
+import com.android.exchange.EasResponse;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.adapter.Tags;
+import com.android.exchange.adapter.SearchParser;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.ByteArrayEntity;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class EasSearch extends EasOperation {
+
+ public final static int RESULT_NO_MESSAGES = 0;
+ public final static int RESULT_OK = 1;
+ public final static int RESULT_EMPTY_RESPONSE = 2;
+
+ // The shortest search query we'll accept
+ // TODO Check with UX whether this is correct
+ private static final int MIN_QUERY_LENGTH = 3;
+ // The largest number of results we'll ask for per server request
+ private static final int MAX_SEARCH_RESULTS = 100;
+
+ final SearchParams mSearchParams;
+ final long mDestMailboxId;
+ int mTotalResults;
+
+ public EasSearch(final Context context, final long accountId, final SearchParams searchParams,
+ final long destMailboxId) {
+ super(context, accountId);
+ mSearchParams = searchParams;
+ mDestMailboxId = destMailboxId;
+ }
+
+ public int getTotalResults() {
+ return mTotalResults;
+ }
+
+ @Override
+ protected String getCommand() {
+ return "Search";
+ }
+
+ @Override
+ protected HttpEntity getRequestEntity() throws IOException {
+ // Sanity check for arguments
+ final int offset = mSearchParams.mOffset;
+ final int limit = mSearchParams.mLimit;
+ final String filter = mSearchParams.mFilter;
+ if (limit < 0 || limit > MAX_SEARCH_RESULTS || offset < 0) {
+ return null;
+ }
+ // TODO Should this be checked in UI? Are there guidelines for minimums?
+ if (filter == null || filter.length() < MIN_QUERY_LENGTH) {
+ LogUtils.w(LOG_TAG, "filter too short");
+ return null;
+ }
+
+ int res = 0;
+ final Mailbox searchMailbox = Mailbox.restoreMailboxWithId(mContext, mDestMailboxId);
+ // Sanity check; account might have been deleted?
+ if (searchMailbox == null) {
+ LogUtils.i(LOG_TAG, "search mailbox ceased to exist");
+ return null;
+ }
+ final ContentValues statusValues = new ContentValues(2);
+ try {
+ // Set the status of this mailbox to indicate query
+ statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.LIVE_QUERY);
+ searchMailbox.update(mContext, statusValues);
+
+ final Serializer s = new Serializer();
+ s.start(Tags.SEARCH_SEARCH).start(Tags.SEARCH_STORE);
+ s.data(Tags.SEARCH_NAME, "Mailbox");
+ s.start(Tags.SEARCH_QUERY).start(Tags.SEARCH_AND);
+ s.data(Tags.SYNC_CLASS, "Email");
+
+ // If this isn't an inbox search, then include the collection id
+ final Mailbox inbox =
+ Mailbox.restoreMailboxOfType(mContext, mAccount.mId, Mailbox.TYPE_INBOX);
+ if (inbox == null) {
+ LogUtils.i(LOG_TAG, "Inbox ceased to exist");
+ return null;
+ }
+ if (mSearchParams.mMailboxId != inbox.mId) {
+ s.data(Tags.SYNC_COLLECTION_ID, inbox.mServerId);
+ }
+ s.data(Tags.SEARCH_FREE_TEXT, filter);
+
+ // Add the date window if appropriate
+ if (mSearchParams.mStartDate != null) {
+ s.start(Tags.SEARCH_GREATER_THAN);
+ s.tag(Tags.EMAIL_DATE_RECEIVED);
+ s.data(Tags.SEARCH_VALUE, Eas.DATE_FORMAT.format(mSearchParams.mStartDate));
+ s.end(); // SEARCH_GREATER_THAN
+ }
+ if (mSearchParams.mEndDate != null) {
+ s.start(Tags.SEARCH_LESS_THAN);
+ s.tag(Tags.EMAIL_DATE_RECEIVED);
+ s.data(Tags.SEARCH_VALUE, Eas.DATE_FORMAT.format(mSearchParams.mEndDate));
+ s.end(); // SEARCH_LESS_THAN
+ }
+ s.end().end(); // SEARCH_AND, SEARCH_QUERY
+ s.start(Tags.SEARCH_OPTIONS);
+ if (offset == 0) {
+ s.tag(Tags.SEARCH_REBUILD_RESULTS);
+ }
+ if (mSearchParams.mIncludeChildren) {
+ s.tag(Tags.SEARCH_DEEP_TRAVERSAL);
+ }
+ // Range is sent in the form first-last (e.g. 0-9)
+ s.data(Tags.SEARCH_RANGE, offset + "-" + (offset + limit - 1));
+ s.start(Tags.BASE_BODY_PREFERENCE);
+ s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_HTML);
+ s.data(Tags.BASE_TRUNCATION_SIZE, "20000");
+ s.end(); // BASE_BODY_PREFERENCE
+ s.end().end().end().done(); // SEARCH_OPTIONS, SEARCH_STORE, SEARCH_SEARCH
+ return makeEntity(s);
+ } catch (IOException e) {
+ LogUtils.d(LOG_TAG, e, "Search exception");
+ } finally {
+ // TODO: Handle error states
+ // Set the status of this mailbox to indicate query over
+ statusValues.put(Mailbox.SYNC_TIME, System.currentTimeMillis());
+ statusValues.put(Mailbox.UI_SYNC_STATUS, UIProvider.SyncStatus.NO_SYNC);
+ searchMailbox.update(mContext, statusValues);
+ }
+ LogUtils.i(LOG_TAG, "end returning null");
+ return null;
+ }
+
+ @Override
+ protected int handleResponse(final EasResponse response)
+ throws IOException, CommandStatusException {
+ if (response.isEmpty()) {
+ return RESULT_EMPTY_RESPONSE;
+ }
+ final InputStream is = response.getInputStream();
+ try {
+ final Mailbox searchMailbox = Mailbox.restoreMailboxWithId(mContext, mDestMailboxId);
+ final SearchParser sp = new SearchParser(mContext, mContext.getContentResolver(),
+ is, searchMailbox, mAccount, mSearchParams.mFilter);
+ sp.parse();
+ mTotalResults = sp.getTotalResults();
+ } finally {
+ is.close();
+ }
+ return RESULT_OK;
+ }
+}
diff --git a/src/com/android/exchange/eas/EasSettings.java b/src/com/android/exchange/eas/EasSettings.java
index 09169c1..41df356 100644
--- a/src/com/android/exchange/eas/EasSettings.java
+++ b/src/com/android/exchange/eas/EasSettings.java
@@ -16,8 +16,6 @@
package com.android.exchange.eas;
-import android.content.SyncResult;
-
import com.android.exchange.EasResponse;
import com.android.exchange.adapter.Serializer;
import com.android.exchange.adapter.SettingsParser;
@@ -49,8 +47,8 @@
super(parentOperation);
}
- public boolean sendDeviceInformation(final SyncResult syncResult) {
- return performOperation(syncResult) == RESULT_OK;
+ public boolean sendDeviceInformation() {
+ return performOperation() == RESULT_OK;
}
@Override
@@ -62,14 +60,13 @@
protected HttpEntity getRequestEntity() throws IOException {
final Serializer s = new Serializer();
s.start(Tags.SETTINGS_SETTINGS);
- addDeviceInformationToSerlializer(s);
+ addDeviceInformationToSerializer(s);
s.end().done();
return makeEntity(s);
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
- throws IOException {
+ protected int handleResponse(final EasResponse response) throws IOException {
return new SettingsParser(response.getInputStream()).parse()
? RESULT_OK : RESULT_OTHER_FAILURE;
}
diff --git a/src/com/android/exchange/eas/EasSync.java b/src/com/android/exchange/eas/EasSync.java
index 6395092..39f38be 100644
--- a/src/com/android/exchange/eas/EasSync.java
+++ b/src/com/android/exchange/eas/EasSync.java
@@ -19,7 +19,6 @@
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
-import android.content.SyncResult;
import android.database.Cursor;
import android.support.v4.util.LongSparseArray;
import android.text.TextUtils;
@@ -55,6 +54,10 @@
*/
public class EasSync extends EasOperation {
+ /** Result code indicating that the mailbox for an upsync is no longer present. */
+ public final static int RESULT_NO_MAILBOX = 0;
+ public final static int RESULT_OK = 1;
+
// TODO: When we handle downsync, this will become relevant.
private boolean mInitialSync;
@@ -100,12 +103,12 @@
}
/**
- * TODO: return value doesn't do what it claims.
- * @return Number of messages successfully synced, or -1 if we encountered an error.
+ * @return Number of messages successfully synced, or a negative response code from
+ * {@link EasOperation} if we encountered any errors.
*/
- public final int upsync(final SyncResult syncResult) {
- final List<MessageStateChange> changes = MessageStateChange.getChanges(mContext, mAccountId,
- getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE);
+ public final int upsync() {
+ final List<MessageStateChange> changes = MessageStateChange.getChanges(mContext,
+ getAccountId(), getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE);
if (changes == null) {
return 0;
}
@@ -117,43 +120,65 @@
final long[][] messageIds = new long[2][changes.size()];
final int[] counts = new int[2];
+ int result = 0;
for (int i = 0; i < allData.size(); ++i) {
mMailboxId = allData.keyAt(i);
mStateChanges = allData.valueAt(i);
- final Cursor mailboxCursor = mContext.getContentResolver().query(
- ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailboxId),
- Mailbox.ProjectionSyncData.PROJECTION, null, null, null);
- if (mailboxCursor != null) {
- try {
- if (mailboxCursor.moveToFirst()) {
- mMailboxServerId = mailboxCursor.getString(
- Mailbox.ProjectionSyncData.COLUMN_SERVER_ID);
- mMailboxSyncKey = mailboxCursor.getString(
- Mailbox.ProjectionSyncData.COLUMN_SYNC_KEY);
- final int result;
- if (TextUtils.isEmpty(mMailboxSyncKey) || mMailboxSyncKey.equals("0")) {
- // For some reason we can get here without a valid mailbox sync key
- // b/10797675
- // TODO: figure out why and clean this up
- LogUtils.d(LOG_TAG,
- "Tried to sync mailbox %d with invalid mailbox sync key",
- mMailboxId);
- result = -1;
- } else {
- result = performOperation(syncResult);
- }
- if (result == 0) {
- handleMessageUpdateStatus(mMessageUpdateStatus, messageIds, counts);
- } else {
- for (final MessageStateChange msc : mStateChanges) {
- messageIds[1][counts[1]] = msc.getMessageId();
- ++counts[1];
+ boolean retryMailbox = true;
+ // If we've already encountered a fatal error, don't even try to upsync subsequent
+ // mailboxes.
+ if (result >= 0) {
+ final Cursor mailboxCursor = mContext.getContentResolver().query(
+ ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailboxId),
+ Mailbox.ProjectionSyncData.PROJECTION, null, null, null);
+ if (mailboxCursor != null) {
+ try {
+ if (mailboxCursor.moveToFirst()) {
+ mMailboxServerId = mailboxCursor.getString(
+ Mailbox.ProjectionSyncData.COLUMN_SERVER_ID);
+ mMailboxSyncKey = mailboxCursor.getString(
+ Mailbox.ProjectionSyncData.COLUMN_SYNC_KEY);
+ if (TextUtils.isEmpty(mMailboxSyncKey) || mMailboxSyncKey.equals("0")) {
+ // For some reason we can get here without a valid mailbox sync key
+ // b/10797675
+ // TODO: figure out why and clean this up
+ LogUtils.d(LOG_TAG,
+ "Tried to sync mailbox %d with invalid mailbox sync key",
+ mMailboxId);
+ } else {
+ result = performOperation();
+ if (result >= 0) {
+ // Our request gave us back a legitimate answer; this is the
+ // only case in which we don't retry this mailbox.
+ retryMailbox = false;
+ if (result == RESULT_OK) {
+ handleMessageUpdateStatus(mMessageUpdateStatus, messageIds,
+ counts);
+ } else if (result == RESULT_NO_MAILBOX) {
+ // A retry here is pointless -- the message's mailbox (and
+ // therefore the message) is gone, so mark as success so
+ // that these entries get wiped from the change list.
+ for (final MessageStateChange msc : mStateChanges) {
+ messageIds[0][counts[0]] = msc.getMessageId();
+ ++counts[0];
+ }
+ } else {
+ LogUtils.wtf(LOG_TAG, "Unrecognized result code: %d",
+ result);
+ }
+ }
}
}
+ } finally {
+ mailboxCursor.close();
}
- } finally {
- mailboxCursor.close();
+ }
+ }
+ if (retryMailbox) {
+ for (final MessageStateChange msc : mStateChanges) {
+ messageIds[1][counts[1]] = msc.getMessageId();
+ ++counts[1];
}
}
}
@@ -162,7 +187,10 @@
MessageStateChange.upsyncSuccessful(cr, messageIds[0], counts[0]);
MessageStateChange.upsyncRetry(cr, messageIds[1], counts[1]);
- return 0;
+ if (result < 0) {
+ return result;
+ }
+ return counts[0];
}
@Override
@@ -182,26 +210,21 @@
}
@Override
- protected int handleResponse(final EasResponse response, final SyncResult syncResult)
+ protected int handleResponse(final EasResponse response)
throws IOException, CommandStatusException {
- final Account account = Account.restoreAccountWithId(mContext, mAccountId);
- if (account == null) {
- // TODO: Make this some other error type, since the account is just gone now.
- return RESULT_OTHER_FAILURE;
- }
final Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, mMailboxId);
if (mailbox == null) {
- return RESULT_OTHER_FAILURE;
+ return RESULT_NO_MAILBOX;
}
final EmailSyncParser parser = new EmailSyncParser(mContext, mContext.getContentResolver(),
- response.getInputStream(), mailbox, account);
+ response.getInputStream(), mailbox, mAccount);
try {
parser.parse();
mMessageUpdateStatus = parser.getMessageStatuses();
} catch (final Parser.EmptyStreamException e) {
// This indicates a compressed response which was empty, which is OK.
}
- return 0;
+ return RESULT_OK;
}
@Override
diff --git a/src/com/android/exchange/eas/EasSyncBase.java b/src/com/android/exchange/eas/EasSyncBase.java
new file mode 100644
index 0000000..e892518
--- /dev/null
+++ b/src/com/android/exchange/eas/EasSyncBase.java
@@ -0,0 +1,179 @@
+package com.android.exchange.eas;
+
+import android.content.Context;
+import android.net.TrafficStats;
+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.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.HttpEntity;
+
+import java.io.IOException;
+
+/**
+ * Performs an EAS sync operation for one folder (excluding mail upsync).
+ * TODO: Merge with {@link EasSync}, which currently handles mail upsync.
+ */
+public class EasSyncBase extends EasOperation {
+
+ private static final String TAG = Eas.LOG_TAG;
+
+ public static final int RESULT_DONE = 0;
+ public static final int RESULT_MORE_AVAILABLE = 1;
+
+ private boolean mInitialSync;
+ private final Mailbox mMailbox;
+ private EasSyncCollectionTypeBase mCollectionTypeHandler;
+
+ private int mNumWindows;
+
+ // TODO: Convert to accountId when ready to convert to EasService.
+ public EasSyncBase(final Context context, final Account account, final Mailbox mailbox) {
+ super(context, account);
+ mMailbox = mailbox;
+ }
+
+ /**
+ * 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 String getSyncKey() {
+ if (mMailbox == null) {
+ return null;
+ }
+ if (mMailbox.mSyncKey == null) {
+ mMailbox.mSyncKey = "0";
+ }
+ return mMailbox.mSyncKey;
+ }
+
+ @Override
+ protected String getCommand() {
+ return "Sync";
+ }
+
+ @Override
+ public boolean init(final boolean allowReload) {
+ final boolean result = super.init(allowReload);
+ if (result) {
+ mCollectionTypeHandler = getCollectionTypeHandler(mMailbox.mType);
+ if (mCollectionTypeHandler == null) {
+ return false;
+ }
+ // Set up traffic stats bookkeeping.
+ final int trafficFlags = TrafficFlags.getSyncFlags(mContext, mAccount);
+ TrafficStats.setThreadStatsTag(trafficFlags | mCollectionTypeHandler.getTrafficFlag());
+ }
+ return result;
+ }
+
+ @Override
+ protected HttpEntity getRequestEntity() throws IOException {
+ final String className = Eas.getFolderClass(mMailbox.mType);
+ final String syncKey = getSyncKey();
+ LogUtils.d(TAG, "Syncing account %d mailbox %d (class %s) with syncKey %s", mAccount.mId,
+ mMailbox.mId, className, syncKey);
+ mInitialSync = EmailContent.isInitialSyncKey(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);
+ mCollectionTypeHandler.setSyncOptions(mContext, s, getProtocolVersion(), mAccount, mMailbox,
+ mInitialSync, mNumWindows);
+ s.end().end().end().done();
+
+ return makeEntity(s);
+ }
+
+ @Override
+ protected int handleResponse(final EasResponse response)
+ throws IOException, CommandStatusException {
+ try {
+ final AbstractSyncParser parser = mCollectionTypeHandler.getParser(mContext, mAccount,
+ mMailbox, response.getInputStream());
+ final boolean moreAvailable = parser.parse();
+ if (moreAvailable) {
+ return RESULT_MORE_AVAILABLE;
+ }
+ } catch (final Parser.EmptyStreamException e) {
+ // This indicates a compressed response which was empty, which is OK.
+ }
+ return RESULT_DONE;
+ }
+
+ @Override
+ public int performOperation() {
+ int result = RESULT_MORE_AVAILABLE;
+ mNumWindows = 1;
+ final String key = getSyncKey();
+ while (result == RESULT_MORE_AVAILABLE) {
+ result = super.performOperation();
+ if (result == RESULT_MORE_AVAILABLE || result == RESULT_DONE) {
+ mCollectionTypeHandler.cleanup(mContext, mAccount);
+ }
+ // TODO: Clear pending request queue.
+ final String newKey = getSyncKey();
+ if (result == RESULT_MORE_AVAILABLE && key.equals(newKey)) {
+ LogUtils.e(TAG,
+ "Server has more data but we have the same key: %s numWindows: %d",
+ key, mNumWindows);
+ mNumWindows++;
+ } else {
+ mNumWindows = 1;
+ }
+ }
+ return result;
+ }
+
+ @Override
+ protected long getTimeout() {
+ if (mInitialSync) {
+ return 120 * DateUtils.SECOND_IN_MILLIS;
+ }
+ return super.getTimeout();
+ }
+
+ /**
+ * Get an instance of the correct {@link EasSyncCollectionTypeBase} for a specific collection
+ * type.
+ * @param type The type of the {@link Mailbox} that we're trying to sync.
+ * @return An {@link EasSyncCollectionTypeBase} appropriate for this type.
+ */
+ private EasSyncCollectionTypeBase getCollectionTypeHandler(final int type) {
+ switch (type) {
+ case Mailbox.TYPE_MAIL:
+ case Mailbox.TYPE_INBOX:
+ case Mailbox.TYPE_DRAFTS:
+ case Mailbox.TYPE_SENT:
+ case Mailbox.TYPE_TRASH:
+ case Mailbox.TYPE_JUNK:
+ return new EasSyncMail();
+ case Mailbox.TYPE_CALENDAR: {
+ return new EasSyncCalendar(mContext, mAccount, mMailbox);
+ }
+ case Mailbox.TYPE_CONTACTS:
+ return new EasSyncContacts(mAccount.mEmailAddress);
+ default:
+ LogUtils.e(LOG_TAG, "unexpected collectiontype %d", type);
+ return null;
+ }
+ }
+}
diff --git a/src/com/android/exchange/service/EasCalendarSyncHandler.java b/src/com/android/exchange/eas/EasSyncCalendar.java
similarity index 81%
rename from src/com/android/exchange/service/EasCalendarSyncHandler.java
rename to src/com/android/exchange/eas/EasSyncCalendar.java
index 38526b9..18e3cec 100644
--- a/src/com/android/exchange/service/EasCalendarSyncHandler.java
+++ b/src/com/android/exchange/eas/EasSyncCalendar.java
@@ -1,4 +1,4 @@
-package com.android.exchange.service;
+package com.android.exchange.eas;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -6,7 +6,6 @@
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;
@@ -25,6 +24,7 @@
import com.android.calendarcommon2.Duration;
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.Mailbox;
import com.android.emailcommon.utility.Utility;
@@ -49,12 +49,14 @@
/**
* Performs an Exchange Sync for a Calendar collection.
*/
-public class EasCalendarSyncHandler extends EasSyncHandler {
+public class EasSyncCalendar extends EasSyncCollectionTypeBase {
private static final String TAG = Eas.LOG_TAG;
// 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.
+ private static final int PIM_WINDOW_SIZE_CALENDAR = 10;
+
/** Projection for getting a calendar id. */
private static final String[] CALENDAR_ID_PROJECTION = { Calendars._ID };
private static final int CALENDAR_ID_COLUMN = 0;
@@ -112,7 +114,7 @@
private static final String EXTENDED_PROPERTY_ATTENDEES = "attendees";
private static final String EXTENDED_PROPERTY_CATEGORIES = "categories";
- private final android.accounts.Account mAccountManagerAccount;
+ private final android.accounts.Account mAndroidAccount;
private final long mCalendarId;
// The following lists are populated as part of upsync, and handled during cleanup.
@@ -123,15 +125,16 @@
/** 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,
+ public EasSyncCalendar(final Context context, final Account account,
+ final Mailbox mailbox) {
+ super();
+ mAndroidAccount = new android.accounts.Account(account.mEmailAddress,
+ Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+ final ContentResolver cr = context.getContentResolver();
+ final Cursor c = cr.query(Calendars.CONTENT_URI, CALENDAR_ID_PROJECTION,
CALENDAR_SELECTION_ACCOUNT_AND_SYNC_ID,
new String[] {
- mAccount.mEmailAddress,
+ account.mEmailAddress,
Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE,
mailbox.mServerId,
}, null);
@@ -146,11 +149,11 @@
// Check if we have a calendar for this account with no server Id. If so, it was
// synced with an older version of the sync adapter before serverId's were
// supported.
- final Cursor c1 = mContentResolver.query(Calendars.CONTENT_URI,
+ final Cursor c1 = cr.query(Calendars.CONTENT_URI,
CALENDAR_ID_PROJECTION,
CALENDAR_SELECTION_ACCOUNT_AND_NO_SYNC,
new String[] {
- mAccount.mEmailAddress,
+ account.mEmailAddress,
Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE,
}, null);
if (c1 != null) {
@@ -158,10 +161,10 @@
if (c1.moveToFirst()) {
id = c1.getLong(CALENDAR_ID_COLUMN);
final ContentValues values = new ContentValues();
- values.put(Calendars._SYNC_ID, mMailbox.mServerId);
- mContentResolver.update(
+ values.put(Calendars._SYNC_ID, mailbox.mServerId);
+ cr.update(
ContentUris.withAppendedId(
- asSyncAdapter(Calendars.CONTENT_URI), id),
+ asSyncAdapter(Calendars.CONTENT_URI, account), id),
values,
null, /* where */
null /* selectionArgs */);
@@ -174,8 +177,8 @@
if (id >= 0) {
mCalendarId = id;
} else {
- mCalendarId = CalendarUtilities.createCalendar(mContext, mContentResolver,
- mAccount, mMailbox);
+ mCalendarId = CalendarUtilities.createCalendar(context, cr, account,
+ mailbox);
}
}
} finally {
@@ -185,7 +188,27 @@
}
@Override
- protected int getTrafficFlag() {
+ public void setSyncOptions(final Context context, final Serializer s,
+ final double protocolVersion, final Account account, final Mailbox mailbox,
+ final boolean isInitialSync, final int numWindows) throws IOException {
+ if (isInitialSync) {
+ setInitialSyncOptions(s);
+ } else {
+ setNonInitialSyncOptions(s, numWindows, protocolVersion);
+ setUpsyncCommands(context, account, protocolVersion, s);
+ }
+ }
+
+
+ @Override
+ public AbstractSyncParser getParser(final Context context, final Account account,
+ final Mailbox mailbox, final InputStream is) throws IOException {
+ return new CalendarSyncParser(context, context.getContentResolver(), is, mailbox, account,
+ mAndroidAccount, mCalendarId);
+ }
+
+ @Override
+ public int getTrafficFlag() {
return TrafficFlags.DATA_CALENDAR;
}
@@ -205,34 +228,25 @@
/**
* Convenience wrapper to {@link #asSyncAdapter(android.net.Uri, String)}.
*/
- private Uri asSyncAdapter(final Uri uri) {
- return asSyncAdapter(uri, mAccount.mEmailAddress);
+ private Uri asSyncAdapter(final Uri uri, final Account account) {
+ return asSyncAdapter(uri, account.mEmailAddress);
}
- @Override
protected String getFolderClassName() {
return "Calendar";
}
-
- @Override
- protected AbstractSyncParser getParser(final InputStream is) throws IOException {
- return new CalendarSyncParser(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, int numWindows) throws IOException {
+ protected void setNonInitialSyncOptions(final Serializer s, final int numWindows,
+ final double protocolVersion) throws IOException {
final int windowSize = numWindows * PIM_WINDOW_SIZE_CALENDAR;
if (windowSize > MAX_WINDOW_SIZE + PIM_WINDOW_SIZE_CALENDAR) {
throw new IOException("Max window size reached and still no data");
}
- setPimSyncOptions(s, Eas.FILTER_2_WEEKS,
+ setPimSyncOptions(s, Eas.FILTER_2_WEEKS, protocolVersion,
windowSize < MAX_WINDOW_SIZE ? windowSize : MAX_WINDOW_SIZE);
}
@@ -242,12 +256,13 @@
* @param calendarIdString {@link #mCalendarId}, as a String.
* @param calendarIdArgument calendarIdString, in a String array.
*/
- private void markParentsOfDirtyEvents(final String calendarIdString,
- final String[] calendarIdArgument) {
+ private void markParentsOfDirtyEvents(final Context context, final Account account,
+ final String calendarIdString, final String[] calendarIdArgument) {
+ final ContentResolver cr = context.getContentResolver();
// 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,
+ final Cursor c = cr.query(Events.CONTENT_URI,
ORIGINAL_EVENT_PROJECTION, DIRTY_EXCEPTION_IN_CALENDAR, calendarIdArgument, null);
if (c != null) {
try {
@@ -258,7 +273,7 @@
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,
+ final int cnt = cr.update(asSyncAdapter(Events.CONTENT_URI, account), cv,
EVENT_ID_AND_CALENDAR_ID,
new String[] { Long.toString(parentId), calendarIdString });
// Keep track of any orphaned exceptions
@@ -274,8 +289,8 @@
// Delete any orphaned exceptions
for (final long orphan : orphanedExceptions) {
LogUtils.d(TAG, "Deleted orphaned exception: %d", orphan);
- mContentResolver.delete(asSyncAdapter(
- ContentUris.withAppendedId(Events.CONTENT_URI, orphan)), null, null);
+ cr.delete(asSyncAdapter(
+ ContentUris.withAppendedId(Events.CONTENT_URI, orphan), account), null, null);
}
}
@@ -306,10 +321,11 @@
* @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) {
+ private void sendDeclinedEmail(final Context context, final Account account,
+ final Entity entity, final String clientId) {
final Message msg =
- CalendarUtilities.createMessageForEntity(mContext, entity,
- Message.FLAG_OUTGOING_MEETING_DECLINE, clientId, mAccount);
+ CalendarUtilities.createMessageForEntity(context, entity,
+ Message.FLAG_OUTGOING_MEETING_DECLINE, clientId, account);
if (msg != null) {
LogUtils.d(TAG, "Queueing declined response to %s", msg.mTo);
mOutgoingMailList.add(msg);
@@ -363,13 +379,15 @@
* @throws IOException
* TODO: This can probably be refactored/cleaned up more.
*/
- private void sendEvent(final Entity entity, final String clientId, final Serializer s)
+ private void sendEvent(final Context context, final Account account, final Entity entity,
+ final String clientId, final double protocolVersion, 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 ContentResolver cr = context.getContentResolver();
final ContentValues entityValues = entity.getEntityValues();
final boolean isException = (clientId == null);
boolean hasAttendees = false;
@@ -396,8 +414,8 @@
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)),
+ cr.update(asSyncAdapter(
+ ContentUris.withAppendedId(Events.CONTENT_URI, eventId), account),
cv, null, null);
}
} else {
@@ -468,7 +486,7 @@
String loc = entityValues.getAsString(Events.EVENT_LOCATION);
if (!TextUtils.isEmpty(loc)) {
- if (getProtocolVersion() < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+ if (protocolVersion < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
// EAS 2.5 doesn't like bare line feeds
loc = Utility.replaceBareLfWithCrlf(loc);
}
@@ -476,7 +494,7 @@
}
s.writeStringValue(entityValues, Events.TITLE, Tags.CALENDAR_SUBJECT);
- if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+ if (protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
s.start(Tags.BASE_BODY);
s.data(Tags.BASE_TYPE, "1");
s.writeStringValue(entityValues, Events.DESCRIPTION, Tags.BASE_DATA);
@@ -488,7 +506,7 @@
if (!isException) {
// For Exchange 2003, only upsync if the event is new
- if ((getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) {
+ if ((protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) {
s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);
}
@@ -580,7 +598,7 @@
}
s.data(Tags.CALENDAR_ATTENDEE_NAME, attendeeName);
s.data(Tags.CALENDAR_ATTENDEE_EMAIL, attendeeEmail);
- if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+ if (protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
s.data(Tags.CALENDAR_ATTENDEE_TYPE, "1"); // Required
}
s.end(); // Attendee
@@ -601,14 +619,14 @@
if (organizerEmail == null && entityValues.containsKey(Events.ORGANIZER)) {
organizerEmail = entityValues.getAsString(Events.ORGANIZER);
}
- if (mAccount.mEmailAddress.equalsIgnoreCase(organizerEmail)) {
+ if (account.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) &&
+ if (((protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) &&
organizerName != null) {
s.data(Tags.CALENDAR_ORGANIZER_NAME, organizerName);
}
@@ -635,12 +653,14 @@
* @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);
+ private void handleExceptionsToRecurrenceRules(final Serializer s, final Context context,
+ final Account account,final Entity entity, final ContentValues entityValues,
+ final String serverId, final String clientId, final String calendarIdString,
+ final boolean selfOrganizer, final double protocolVersion) throws IOException {
+ final ContentResolver cr = context.getContentResolver();
+ final EntityIterator exIterator = EventsEntity.newEntityIterator(cr.query(
+ asSyncAdapter(Events.CONTENT_URI, account), null, ORIGINAL_EVENT_AND_CALENDAR,
+ new String[] { serverId, calendarIdString }, null), cr);
boolean exFirst = true;
while (exIterator.hasNext()) {
final Entity exEntity = exIterator.next();
@@ -649,7 +669,7 @@
exFirst = false;
}
s.start(Tags.CALENDAR_EXCEPTION);
- sendEvent(exEntity, null, s);
+ sendEvent(context, account, exEntity, null, protocolVersion, 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
@@ -666,7 +686,7 @@
// to the user, we have to reset it first to the original
// organizer
exValues.put(Events.ORGANIZER, entityValues.getAsString(Events.ORGANIZER));
- sendDeclinedEmail(exEntity, clientId);
+ sendDeclinedEmail(context, account, exEntity, clientId);
}
} else {
flag = Message.FLAG_OUTGOING_MEETING_INVITE;
@@ -685,8 +705,8 @@
}
if (selfOrganizer) {
- final Message msg = CalendarUtilities.createMessageForEntity(mContext, exEntity,
- flag, clientId, mAccount);
+ final Message msg = CalendarUtilities.createMessageForEntity(context, exEntity,
+ flag, clientId, account);
if (msg != null) {
LogUtils.d(TAG, "Queueing exception update to %s", msg.mTo);
mOutgoingMailList.add(msg);
@@ -714,8 +734,8 @@
// Now send a cancellation email
final Message removedMessage =
- CalendarUtilities.createMessageForEntity(mContext, removedEntity,
- Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount);
+ CalendarUtilities.createMessageForEntity(context, removedEntity,
+ Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, account);
if (removedMessage != null) {
LogUtils.d(TAG, "Queueing cancellation for removed attendees");
mOutgoingMailList.add(removedMessage);
@@ -737,10 +757,12 @@
* @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) {
+ private void updateAttendeesAndSendMail(final Context context, final Account account,
+ 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
+ final ContentResolver cr = context.getContentResolver();
String attendeeString = null;
long attendeeStringId = -1;
String userAttendeeStatus = null;
@@ -764,8 +786,8 @@
// 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);
+ CalendarUtilities.createMessageForEventId(context, eventId,
+ Message.FLAG_OUTGOING_MEETING_INVITE, clientId, account);
if (msg != null) {
LogUtils.d(TAG, "Queueing invitation to %s", msg.mTo);
mOutgoingMailList.add(msg);
@@ -797,20 +819,21 @@
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);
+ cr.update(asSyncAdapter(ContentUris.withAppendedId(
+ ExtendedProperties.CONTENT_URI, attendeeStringId), account),
+ 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);
+ cr.insert(asSyncAdapter(ExtendedProperties.CONTENT_URI, account), 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,
+ final Message cancelMsg = CalendarUtilities.createMessageForEventId(context,
+ eventId, Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, account,
removedAttendee);
if (cancelMsg != null) {
// Just send it to the removed attendee
@@ -854,12 +877,12 @@
// 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)),
+ cr.update(asSyncAdapter(ContentUris.withAppendedId(
+ ExtendedProperties.CONTENT_URI, userAttendeeStatusId), account),
cv, null, null);
// Send mail to the organizer advising of the new status
- final Message msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
- messageFlag, clientId, mAccount);
+ final Message msg = CalendarUtilities.createMessageForEventId(context, eventId,
+ messageFlag, clientId, account);
if (msg != null) {
LogUtils.d(TAG, "Queueing invitation reply to %s", msg.mTo);
mOutgoingMailList.add(msg);
@@ -878,9 +901,11 @@
* @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 {
+ private boolean handleEntity(final Serializer s, final Context context, final Account account,
+ final Entity entity, final String calendarIdString, final boolean first,
+ final double protocolVersion) throws IOException {
// For each of these entities, create the change commands
+ final ContentResolver cr = context.getContentResolver();
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
@@ -913,7 +938,7 @@
LogUtils.d(TAG, "Sending Calendar changes to the server");
}
- final boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mAccount.mEmailAddress);
+ final boolean selfOrganizer = organizerEmail.equalsIgnoreCase(account.mEmailAddress);
// Find our uid in the entity; otherwise create one
String clientId = entityValues.getAsString(Events.SYNC_DATA2);
if (clientId == null) {
@@ -929,22 +954,22 @@
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)),
+ cr.update(
+ asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, eventId), account),
cv, null, null);
} else if (entityValues.getAsInteger(Events.DELETED) == 1) {
LogUtils.d(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);
+ final Message msg = CalendarUtilities.createMessageForEventId(context,
+ eventId, Message.FLAG_OUTGOING_MEETING_CANCEL, null, account);
if (msg != null) {
LogUtils.d(TAG, "Queueing cancellation to %s", msg.mTo);
mOutgoingMailList.add(msg);
}
} else {
- sendDeclinedEmail(entity, clientId);
+ sendDeclinedEmail(context, account, entity, clientId);
}
// For deletions, we don't need to add application data, so just bail here.
return true;
@@ -955,44 +980,46 @@
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);
+ cr.update( asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, eventId),
+ account), 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);
+ sendEvent(context, account, entity, clientId, protocolVersion, s);
// Now, the hard part; find exceptions for this event
if (serverId != null) {
- handleExceptionsToRecurrenceRules(s, entity, entityValues, serverId, clientId,
- calendarIdString, selfOrganizer);
+ handleExceptionsToRecurrenceRules(s, context, account, entity, entityValues, serverId,
+ clientId, calendarIdString, selfOrganizer, protocolVersion);
}
s.end().end(); // ApplicationData & Add/Change
mUploadedIdList.add(eventId);
- updateAttendeesAndSendMail(entity, entityValues, selfOrganizer, eventId, clientId);
+ updateAttendeesAndSendMail(context, account, entity, entityValues, selfOrganizer, eventId,
+ clientId);
return true;
}
- @Override
- protected void setUpsyncCommands(final Serializer s) throws IOException {
+ protected void setUpsyncCommands(Context context, final Account account,
+ final double protocolVersion, final Serializer s) throws IOException {
+ final ContentResolver cr = context.getContentResolver();
final String calendarIdString = Long.toString(mCalendarId);
final String[] calendarIdArgument = { calendarIdString };
- markParentsOfDirtyEvents(calendarIdString, calendarIdArgument);
+ markParentsOfDirtyEvents(context, account, 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);
+ cr.query(asSyncAdapter(Events.CONTENT_URI, account), null,
+ DIRTY_OR_MARKED_TOP_LEVEL_IN_CALENDAR, calendarIdArgument, null), cr);
try {
boolean first = true;
while (eventIterator.hasNext()) {
final boolean addedCommand =
- handleEntity(s, eventIterator.next(), calendarIdString, first);
+ handleEntity(s, context, account, eventIterator.next(), calendarIdString,
+ first, protocolVersion);
if (addedCommand) {
first = false;
}
@@ -1006,39 +1033,71 @@
}
@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);
+ public void cleanup(final Context context, final Account account) {
+ final ContentResolver cr = context.getContentResolver();
+ // 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) {
+ cr.update(asSyncAdapter(ContentUris.withAppendedId(
+ Events.CONTENT_URI, eventId), account), cv, null, null);
}
}
- // Clear our lists for the next Sync request, if necessary.
- if (syncResult != SYNC_RESULT_MORE_AVAILABLE) {
- mDeletedIdList.clear();
- mUploadedIdList.clear();
- mOutgoingMailList.clear();
+ // Delete events marked for deletion
+ if (!mDeletedIdList.isEmpty()) {
+ for (final long eventId : mDeletedIdList) {
+ cr.delete(asSyncAdapter(ContentUris.withAppendedId(
+ Events.CONTENT_URI, eventId), account), null, null);
+ }
}
+ // Send all messages that were created during this sync.
+ for (final Message msg : mOutgoingMailList) {
+ sendMessage(context, account, msg);
+ }
+
+ mDeletedIdList.clear();
+ mUploadedIdList.clear();
+ mOutgoingMailList.clear();
}
/**
+ * 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 Context context, final Account account,
+ final EmailContent.Message msg) {
+ long mailboxId = Mailbox.findMailboxOfType(context, 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(context, account.mId, Mailbox.TYPE_OUTBOX);
+ outbox.save(context);
+ mailboxId = outbox.mId;
+ }
+ msg.mMailboxKey = mailboxId;
+ msg.mAccountKey = account.mId;
+ msg.save(context);
+ requestSyncForMailbox(EmailContent.AUTHORITY, mailboxId);
+ }
+
+ /**
+ * Issue a {@link android.content.ContentResolver#requestSync} for a specific mailbox.
+ * @param authority The authority for the mailbox that needs to sync.
+ * @param mailboxId The id of the mailbox that needs to sync.
+ */
+ protected void requestSyncForMailbox(final String authority, final long mailboxId) {
+ final Bundle extras = Mailbox.createSyncBundle(mailboxId);
+ ContentResolver.requestSync(mAndroidAccount, authority, extras);
+ LogUtils.d(TAG, "requestSync EasServerConnection requestSyncForMailbox %s, %s",
+ mAndroidAccount.toString(), extras.toString());
+ }
+
+
+ /**
* Delete an account from the Calendar provider.
* @param context Our {@link Context}
* @param emailAddress The email address of the account we wish to delete
diff --git a/src/com/android/exchange/eas/EasSyncCollectionTypeBase.java b/src/com/android/exchange/eas/EasSyncCollectionTypeBase.java
new file mode 100644
index 0000000..555e535
--- /dev/null
+++ b/src/com/android/exchange/eas/EasSyncCollectionTypeBase.java
@@ -0,0 +1,101 @@
+package com.android.exchange.eas;
+
+import android.content.Context;
+
+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.Serializer;
+import com.android.exchange.adapter.Tags;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Abstract base class that handles the details of syncing a specific collection type.
+ * These details include:
+ * - Forming the request options. Contacts, Calendar, and Mail set this up differently.
+ * - Getting the appropriate parser for this collection type.
+ */
+public abstract class EasSyncCollectionTypeBase {
+
+ public static final int MAX_WINDOW_SIZE = 512;
+
+ /**
+ * Get the flag for traffic bookkeeping for this sync type.
+ * @return The appropriate value from {@link com.android.emailcommon.TrafficFlags} for this
+ * sync.
+ */
+ public abstract int getTrafficFlag();
+
+ /**
+ * Write the contents of a Collection node in an EAS sync request appropriate for our mailbox.
+ * See http://msdn.microsoft.com/en-us/library/gg650891(v=exchg.80).aspx for documentation on
+ * the contents of this sync request element.
+ * @param context
+ * @param s The {@link Serializer} for the current request. This should be within a
+ * {@link com.android.exchange.adapter.Tags#SYNC_COLLECTION} element.
+ * @param protocolVersion
+ * @param account
+ * @param mailbox
+ * @param isInitialSync
+ * @param numWindows
+ * @throws IOException
+ */
+ public abstract void setSyncOptions(final Context context, final Serializer s,
+ final double protocolVersion, final Account account, final Mailbox mailbox,
+ final boolean isInitialSync, final int numWindows) throws IOException;
+
+ /**
+ * Create a parser for the current response data, appropriate for this collection type.
+ * @param context
+ * @param account
+ * @param mailbox
+ * @param is The {@link InputStream} for the server response we're processing.
+ * @return An appropriate parser for this input.
+ * @throws IOException
+ */
+ public abstract AbstractSyncParser getParser(final Context context, final Account account,
+ final Mailbox mailbox, final InputStream is) throws IOException;
+
+ /**
+ * After every successful sync iteration, this function gets called to cleanup any state to
+ * match the sync result (e.g., to clean up an external ContentProvider for PIM data).
+ * @param context
+ * @param account
+ */
+ public void cleanup(final Context context, final Account account) {}
+
+ /**
+ * Shared non-initial sync options for PIM (contacts & calendar) objects.
+ *
+ * @param s The {@link com.android.exchange.adapter.Serializer} for this sync request.
+ * @param filter The lookback to use, or null if no lookback is desired.
+ * @param protocolVersion The EAS protocol version for this request, as a double.
+ * @param windowSize
+ * @throws IOException
+ */
+ protected static void setPimSyncOptions(final Serializer s, final String filter,
+ final double protocolVersion, int windowSize) throws IOException {
+ s.tag(Tags.SYNC_DELETES_AS_MOVES);
+ s.tag(Tags.SYNC_GET_CHANGES);
+ s.data(Tags.SYNC_WINDOW_SIZE, String.valueOf(windowSize));
+ 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 (protocolVersion >= 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();
+ }
+}
diff --git a/src/com/android/exchange/service/EasContactsSyncHandler.java b/src/com/android/exchange/eas/EasSyncContacts.java
similarity index 90%
rename from src/com/android/exchange/service/EasContactsSyncHandler.java
rename to src/com/android/exchange/eas/EasSyncContacts.java
index 8757b92..3a6ffc0 100644
--- a/src/com/android/exchange/service/EasContactsSyncHandler.java
+++ b/src/com/android/exchange/eas/EasSyncContacts.java
@@ -1,4 +1,4 @@
-package com.android.exchange.service;
+package com.android.exchange.eas;
import android.content.ContentProviderOperation;
import android.content.ContentResolver;
@@ -7,10 +7,8 @@
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.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
@@ -54,9 +52,11 @@
* 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 {
+public class EasSyncContacts extends EasSyncCollectionTypeBase {
private static final String TAG = Eas.LOG_TAG;
+ public static final int PIM_WINDOW_SIZE_CONTACTS = 10;
+
private static final String MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS =
ContactsContract.Data.MIMETYPE + "='" + GroupMembership.CONTENT_ITEM_TYPE + "' AND " +
GroupMembership.GROUP_ROW_ID + "=?";
@@ -152,34 +152,44 @@
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;
+ public EasSyncContacts(final String emailAddress) {
+ mAccountManagerAccount = new android.accounts.Account(emailAddress,
+ Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
}
@Override
- protected int getTrafficFlag() {
+ public int getTrafficFlag() {
return TrafficFlags.DATA_CONTACTS;
}
@Override
- protected String getFolderClassName() {
- return "Contacts";
+ public void setSyncOptions(final Context context, final Serializer s,
+ final double protocolVersion, final Account account, final Mailbox mailbox,
+ final boolean isInitialSync, final int numWindows) throws IOException {
+ if (isInitialSync) {
+ setInitialSyncOptions(s);
+ return;
+ }
+
+ final int windowSize = numWindows * PIM_WINDOW_SIZE_CONTACTS;
+ if (windowSize > MAX_WINDOW_SIZE + PIM_WINDOW_SIZE_CONTACTS) {
+ throw new IOException("Max window size reached and still no data");
+ }
+ setPimSyncOptions(s, null, protocolVersion,
+ windowSize < MAX_WINDOW_SIZE ? windowSize : MAX_WINDOW_SIZE);
+
+ setUpsyncCommands(s, context.getContentResolver(), account, mailbox, protocolVersion);
}
@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 ContactsSyncParser(mContext, mContentResolver, is,
- mMailbox, mAccount, mAccountManagerAccount);
+ public AbstractSyncParser getParser(final Context context, final Account account,
+ final Mailbox mailbox, final InputStream is) throws IOException {
+ mParser = new ContactsSyncParser(context, context.getContentResolver(), is, mailbox,
+ account, mAccountManagerAccount);
return mParser;
}
- @Override
- protected void setInitialSyncOptions(final Serializer s) throws IOException {
+ private 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);
@@ -243,15 +253,6 @@
s.end(); // SYNC_SUPPORTED
}
- @Override
- protected void setNonInitialSyncOptions(final Serializer s, int numWindows) throws IOException {
- final int windowSize = numWindows * PIM_WINDOW_SIZE_CONTACTS;
- if (windowSize > MAX_WINDOW_SIZE + PIM_WINDOW_SIZE_CONTACTS) {
- throw new IOException("Max window size reached and still no data");
- }
- setPimSyncOptions(s, null, windowSize < MAX_WINDOW_SIZE ? windowSize : MAX_WINDOW_SIZE);
- }
-
/**
* Add account info and the "caller is syncadapter" param to a URI.
* @param uri The {@link Uri} to add to.
@@ -281,10 +282,9 @@
/**
* 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),
+ private void dirtyContactsWithinDirtyGroups(final ContentResolver cr, final Account account) {
+ final String emailAddress = account.mEmailAddress;
+ final Cursor c = cr.query( uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
GROUPS_ID_PROJECTION, Groups.DIRTY + "=1", null, null);
if (c == null) {
return;
@@ -300,19 +300,17 @@
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,
+ cr.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),
+ 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);
- mContentResolver.update(uriWithAccountAndIsSyncAdapter(
- Groups.CONTENT_URI, emailAddress), updateValues, null,
- null);
+ cr.update(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI, emailAddress),
+ updateValues, null, null);
}
} finally {
c.close();
@@ -638,9 +636,11 @@
* 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.
+ * @param protocolVersion
* @throws IOException
*/
- private void sendNote(final Serializer s, final ContentValues cv) throws IOException {
+ private void sendNote(final Serializer s, final ContentValues cv, final double protocolVersion)
+ 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 = "";
@@ -649,7 +649,7 @@
note = cv.getAsString(Note.NOTE).replaceAll("\n", "\r\n");
}
// Format of upsync data depends on protocol version
- if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+ if (protocolVersion >= 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();
@@ -681,10 +681,11 @@
* @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.
+ * @param protocolVersion
* @throws IOException
*/
private void sendEmail(final Serializer s, final ContentValues cv, final int count,
- final String displayName) throws IOException {
+ final String displayName, final double protocolVersion) 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);
@@ -700,7 +701,7 @@
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) {
+ if (protocolVersion < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
value = addr;
} else {
value = '\"' + name + "\" <" + addr + '>';
@@ -711,19 +712,19 @@
}
}
- @Override
- protected void setUpsyncCommands(final Serializer s) throws IOException {
+ private void setUpsyncCommands(final Serializer s, final ContentResolver cr,
+ final Account account, final Mailbox mailbox, final double protocolVersion)
+ throws IOException {
// Find any groups of ours that are dirty and dirty those groups' members
- dirtyContactsWithinDirtyGroups();
+ dirtyContactsWithinDirtyGroups(cr, account);
// First, let's find Contacts that have changed.
final Uri uri = uriWithAccountAndIsSyncAdapter(
- ContactsContract.RawContactsEntity.CONTENT_URI, mAccount.mEmailAddress);
+ ContactsContract.RawContactsEntity.CONTENT_URI, account.mEmailAddress);
// Get them all atomically
final EntityIterator ei = ContactsContract.RawContacts.newEntityIterator(
- mContentResolver.query(uri, null, ContactsContract.RawContacts.DIRTY + "=1", null,
- null));
+ cr.query(uri, null, ContactsContract.RawContacts.DIRTY + "=1", null, null));
final ContentValues cidValues = new ContentValues();
try {
boolean first = true;
@@ -744,12 +745,12 @@
if (serverId == null) {
// This is a new contact; create a clientId
final String clientId =
- "new_" + mMailbox.mId + '_' + System.currentTimeMillis();
+ "new_" + mailbox.mId + '_' + System.currentTimeMillis();
LogUtils.d(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,
+ cr.update(ContentUris.withAppendedId(rawContactUri,
entityValues.getAsLong(ContactsContract.RawContacts._ID)),
cidValues, null, null);
} else {
@@ -811,7 +812,7 @@
// 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);
+ sendNote(s, cv, protocolVersion);
} else if (mimeType.equals(Photo.CONTENT_ITEM_TYPE)) {
sendPhoto(s, cv);
} else {
@@ -822,7 +823,7 @@
// 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);
+ sendEmail(s, cv, emailCount++, displayName, protocolVersion);
}
// Now, we'll send up groups, if any
@@ -830,9 +831,8 @@
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);
+ final Cursor c = cr.query(ContentUris.withAppendedId(Groups.CONTENT_URI,
+ id), GROUP_TITLE_PROJECTION, null, null, null);
try {
// Presumably, this should always succeed, but ...
if (c.moveToFirst()) {
@@ -863,10 +863,8 @@
}
@Override
- protected void cleanup(final int syncResult) {
- if (syncResult == SYNC_RESULT_FAILED) {
- return;
- }
+ public void cleanup(final Context context, final Account account) {
+ final ContentResolver cr = context.getContentResolver();
// Mark the changed contacts dirty = 0
// Permanently delete the user deletions
@@ -885,16 +883,15 @@
.appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").build())
.build());
}
- ops.execute(mContext);
+ ops.execute(context);
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},
+ account.mEmailAddress);
+ final Cursor c = cr.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);
@@ -902,8 +899,8 @@
while (c.moveToNext()) {
final String sourceId = c.getString(0);
values.put(Groups.TITLE, sourceId);
- mContentResolver.update(uriWithAccountAndIsSyncAdapter(groupsUri,
- mAccount.mEmailAddress), values, Groups.SOURCE_ID + "=?",
+ cr.update(uriWithAccountAndIsSyncAdapter(groupsUri,
+ account.mEmailAddress), values, Groups.SOURCE_ID + "=?",
new String[] {sourceId});
}
} finally {
diff --git a/src/com/android/exchange/service/EasMailboxSyncHandler.java b/src/com/android/exchange/eas/EasSyncMail.java
similarity index 60%
rename from src/com/android/exchange/service/EasMailboxSyncHandler.java
rename to src/com/android/exchange/eas/EasSyncMail.java
index 0384674..f5e0e15 100644
--- a/src/com/android/exchange/service/EasMailboxSyncHandler.java
+++ b/src/com/android/exchange/eas/EasSyncMail.java
@@ -1,10 +1,7 @@
-package com.android.exchange.service;
+package com.android.exchange.eas;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.SyncResult;
import android.database.Cursor;
-import android.os.Bundle;
import com.android.emailcommon.TrafficFlags;
import com.android.emailcommon.provider.Account;
@@ -24,9 +21,10 @@
import java.util.ArrayList;
/**
- * Performs an Exchange mailbox sync for "normal" mailboxes.
+ * Subclass to handle sync details for mail collections.
*/
-public class EasMailboxSyncHandler extends EasSyncHandler {
+public class EasSyncMail extends EasSyncCollectionTypeBase {
+
/**
* The projection used for building the fetch request list.
*/
@@ -35,94 +33,35 @@
private static final int EMAIL_WINDOW_SIZE = 10;
- /**
- * List of server ids for messages to fetch from the server.
- */
- private final ArrayList<String> mMessagesToFetch = new ArrayList<String>();
-
- 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() {
- final int syncLookback = mMailbox.mSyncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
- ? mAccount.mSyncLookback : mMailbox.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() {
+ public int getTrafficFlag() {
return TrafficFlags.DATA_EMAIL;
}
@Override
- protected String getFolderClassName() {
- return "Email";
- }
+ public void setSyncOptions(final Context context, final Serializer s,
+ final double protocolVersion, final Account account, final Mailbox mailbox,
+ final boolean isInitialSync, final int numWindows) throws IOException {
+ if (isInitialSync) {
+ // No special options to set for initial mailbox sync.
+ return;
+ }
- @Override
- protected AbstractSyncParser getParser(final InputStream is) throws IOException {
- return new EmailSyncParser(mContext, mContentResolver, is, mMailbox, mAccount);
- }
-
- @Override
- protected void setInitialSyncOptions(final Serializer s) {
- // No-op.
- }
-
- @Override
- protected void setNonInitialSyncOptions(final Serializer s, int numWindows) throws IOException {
// Check for messages that aren't fully loaded.
- addToFetchRequestList();
+ final ArrayList<String> messagesToFetch = addToFetchRequestList(context, mailbox);
// 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()) {
+ if (messagesToFetch.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) {
+ final boolean isTrashMailbox = mailbox.mType == Mailbox.TYPE_TRASH;
+ if (protocolVersion < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
if (!isTrashMailbox) {
s.tag(Tags.SYNC_DELETES_AS_MOVES);
}
@@ -139,9 +78,9 @@
String.valueOf(windowSize < MAX_WINDOW_SIZE ? windowSize : MAX_WINDOW_SIZE));
s.start(Tags.SYNC_OPTIONS);
// Set the lookback appropriately (EAS calls this a "filter")
- s.data(Tags.SYNC_FILTER_TYPE, getEmailFilter());
+ s.data(Tags.SYNC_FILTER_TYPE, getEmailFilter(account, mailbox));
// Set the truncation amount for all classes
- if (getProtocolVersion() >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
+ if (protocolVersion >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
s.start(Tags.BASE_BODY_PREFERENCE);
// HTML for email
s.data(Tags.BASE_TYPE, Eas.BODY_PREFERENCE_HTML);
@@ -161,20 +100,12 @@
s.data(Tags.SYNC_MIME_SUPPORT, Eas.MIME_BODY_PREFERENCE_TEXT);
s.data(Tags.SYNC_TRUNCATION, Eas.EAS2_5_TRUNCATION_SIZE);
s.end();
- }
- }
- /**
- * 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.
- * @throws IOException
- */
- private void addFetchCommands(final Serializer s) throws IOException {
- if (!mMessagesToFetch.isEmpty()) {
+ // 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).
s.start(Tags.SYNC_COMMANDS);
- for (final String serverId : mMessagesToFetch) {
+ for (final String serverId : messagesToFetch) {
s.start(Tags.SYNC_FETCH).data(Tags.SYNC_SERVER_ID, serverId).end();
}
s.end();
@@ -182,15 +113,60 @@
}
@Override
- protected void setUpsyncCommands(final Serializer s) throws IOException {
- addFetchCommands(s);
+ public AbstractSyncParser getParser(final Context context, final Account account,
+ final Mailbox mailbox, final InputStream is) throws IOException {
+ return new EmailSyncParser(context, is, mailbox, account);
}
- @Override
- protected void cleanup(final int syncResult) {
- if (syncResult == SYNC_RESULT_MORE_AVAILABLE) {
- // Prepare our member variables for another sync request.
- mMessagesToFetch.clear();
+ /**
+ * Query the provider for partially loaded messages.
+ * @return Server ids for partially loaded messages.
+ */
+ private ArrayList<String> addToFetchRequestList(final Context context, final Mailbox mailbox) {
+ final ArrayList<String> messagesToFetch = new ArrayList<String>();
+ final Cursor c = context.getContentResolver().query(Message.CONTENT_URI,
+ FETCH_REQUEST_PROJECTION, MessageColumns.FLAG_LOADED + "=" +
+ Message.FLAG_LOADED_PARTIAL + " AND " + MessageColumns.MAILBOX_KEY + "=?",
+ new String[] {Long.toString(mailbox.mId)}, null);
+ if (c != null) {
+ try {
+ while (c.moveToNext()) {
+ messagesToFetch.add(c.getString(FETCH_REQUEST_SERVER_ID));
+ }
+ } finally {
+ c.close();
+ }
+ }
+ return messagesToFetch;
+ }
+
+ /**
+ * Get the sync window for this collection and translate it to EAS's value for that (EAS refers
+ * to this as the "filter").
+ * @param account The {@link Account} for this sync; its sync window is used if the mailbox
+ * doesn't specify an override.
+ * @param mailbox The {@link Mailbox} for this sync.
+ * @return The EAS string value for the sync window specified for this mailbox.
+ */
+ private String getEmailFilter(final Account account, final Mailbox mailbox) {
+ final int syncLookback = mailbox.mSyncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
+ ? account.mSyncLookback : mailbox.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;
}
}
}
diff --git a/src/com/android/exchange/service/EasAttachmentLoader.java b/src/com/android/exchange/service/EasAttachmentLoader.java
deleted file mode 100644
index 0f3a923..0000000
--- a/src/com/android/exchange/service/EasAttachmentLoader.java
+++ /dev/null
@@ -1,306 +0,0 @@
-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;
-import java.security.cert.CertificateException;
-
-/**
- * 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 = Eas.LOG_TAG;
-
- 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;
- }
- if (attachment.mLocation == null) {
- LogUtils.e(TAG, "Attachment %d lacks a location", 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;
- } catch (final CertificateException e) {
- LogUtils.w(TAG, "CertificateException 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/EasServerConnection.java b/src/com/android/exchange/service/EasServerConnection.java
index 2fb4ebf..2a91c41 100644
--- a/src/com/android/exchange/service/EasServerConnection.java
+++ b/src/com/android/exchange/service/EasServerConnection.java
@@ -39,6 +39,7 @@
import com.android.exchange.EasResponse;
import com.android.exchange.eas.EasConnectionCache;
import com.android.exchange.utility.CurlLogger;
+import com.android.exchange.utility.WbxmlResponseLogger;
import com.android.mail.utils.LogUtils;
import org.apache.http.HttpEntity;
@@ -181,6 +182,7 @@
protected BasicHttpProcessor createHttpProcessor() {
final BasicHttpProcessor processor = super.createHttpProcessor();
processor.addRequestInterceptor(new CurlLogger());
+ processor.addResponseInterceptor(new WbxmlResponseLogger());
return processor;
}
};
@@ -286,7 +288,9 @@
post.setHeader("MS-ASProtocolVersion", String.valueOf(mProtocolVersion));
post.setHeader("User-Agent", getUserAgent());
post.setHeader("Accept-Encoding", "gzip");
- if (contentType != null) {
+ // If there is no entity, we should not be setting a content-type since this will
+ // result in a 400 from the server in the case of loading an attachment.
+ if (contentType != null && entity != null) {
post.setHeader("Content-Type", contentType);
}
if (usePolicyKey) {
@@ -337,6 +341,8 @@
final boolean isPingCommand = cmd.equals("Ping");
// Split the mail sending commands
+ // TODO: This logic should not be here, the command should be generated correctly
+ // in a subclass of EasOperation.
String extra = null;
boolean msg = false;
if (cmd.startsWith("SmartForward&") || cmd.startsWith("SmartReply&")) {
@@ -356,8 +362,7 @@
contentType = MimeUtility.MIME_TYPE_RFC822;
} else if (entity != null) {
contentType = EAS_14_MIME_TYPE;
- }
- else {
+ } else {
contentType = null;
}
final String uriString;
diff --git a/src/com/android/exchange/service/EasService.java b/src/com/android/exchange/service/EasService.java
new file mode 100644
index 0000000..0b221c8
--- /dev/null
+++ b/src/com/android/exchange/service/EasService.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2014 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.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.provider.CalendarContract;
+import android.provider.ContactsContract;
+import android.text.TextUtils;
+
+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.IEmailService;
+import com.android.emailcommon.service.IEmailServiceCallback;
+import com.android.emailcommon.service.SearchParams;
+import com.android.emailcommon.service.ServiceProxy;
+import com.android.exchange.Eas;
+import com.android.exchange.eas.EasFolderSync;
+import com.android.exchange.eas.EasLoadAttachment;
+import com.android.exchange.eas.EasOperation;
+import com.android.exchange.eas.EasSearch;
+import com.android.mail.utils.LogUtils;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Service to handle all communication with the EAS server. Note that this is completely decoupled
+ * from the sync adapters; sync adapters should make blocking calls on this service to actually
+ * perform any operations.
+ */
+public class EasService extends Service {
+
+ private static final String TAG = Eas.LOG_TAG;
+
+ /**
+ * The content authorities that can be synced for EAS accounts. Initialization must wait until
+ * after we have a chance to call {@link EmailContent#init} (and, for future content types,
+ * possibly other initializations) because that's how we can know what the email authority is.
+ */
+ private static String[] AUTHORITIES_TO_SYNC;
+
+ /** Bookkeeping for ping tasks & sync threads management. */
+ private final PingSyncSynchronizer mSynchronizer;
+
+ /**
+ * Implementation of the IEmailService interface.
+ * For the most part these calls should consist of creating the correct {@link EasOperation}
+ * class and calling {@link #doOperation} with it.
+ */
+ private final IEmailService.Stub mBinder = new IEmailService.Stub() {
+ @Override
+ public void sendMail(final long accountId) {
+ LogUtils.d(TAG, "IEmailService.sendMail: %d", accountId);
+ }
+
+ @Override
+ public void loadAttachment(final IEmailServiceCallback callback, final long accountId,
+ final long attachmentId, final boolean background) {
+ LogUtils.d(TAG, "IEmailService.loadAttachment: %d", attachmentId);
+ final EasLoadAttachment operation = new EasLoadAttachment(EasService.this, accountId,
+ attachmentId, callback);
+ doOperation(operation, "IEmailService.loadAttachment");
+ }
+
+ @Override
+ public void updateFolderList(final long accountId) {
+ final EasFolderSync operation = new EasFolderSync(EasService.this, accountId);
+ doOperation(operation, "IEmailService.updateFolderList");
+ }
+
+ @Override
+ public void sync(final long accountId, final boolean updateFolderList,
+ final int mailboxType, final long[] folders) {}
+
+ @Override
+ public void pushModify(final long accountId) {
+ LogUtils.d(TAG, "IEmailService.pushModify: %d", accountId);
+ final Account account = Account.restoreAccountWithId(EasService.this, accountId);
+ if (pingNeededForAccount(account)) {
+ mSynchronizer.pushModify(account);
+ } else {
+ mSynchronizer.pushStop(accountId);
+ }
+ }
+
+ @Override
+ public Bundle validate(final HostAuth hostAuth) {
+ final EasFolderSync operation = new EasFolderSync(EasService.this, hostAuth);
+ doOperation(operation, "IEmailService.validate");
+ return operation.getValidationResult();
+ }
+
+ @Override
+ public int searchMessages(final long accountId, final SearchParams searchParams,
+ final long destMailboxId) {
+ final EasSearch operation = new EasSearch(EasService.this, accountId, searchParams,
+ destMailboxId);
+ doOperation(operation, "IEmailService.searchMessages");
+ return operation.getTotalResults();
+ }
+
+ @Override
+ public void sendMeetingResponse(final long messageId, final int response) {
+ LogUtils.d(TAG, "IEmailService.sendMeetingResponse: %d, %d", messageId, response);
+ }
+
+ @Override
+ public Bundle autoDiscover(final String username, final String password) {
+ LogUtils.d(TAG, "IEmailService.autoDiscover");
+ return null;
+ }
+
+ @Override
+ public void setLogging(final int flags) {
+ LogUtils.d(TAG, "IEmailService.setLogging");
+ }
+
+ @Override
+ public void deleteAccountPIMData(final String emailAddress) {
+ LogUtils.d(TAG, "IEmailService.deleteAccountPIMData");
+ }
+ };
+
+ /**
+ * Content selection string for getting all accounts that are configured for push.
+ * TODO: Add protocol check so that we don't get e.g. IMAP accounts here.
+ * (Not currently necessary but eventually will be.)
+ */
+ private static final String PUSH_ACCOUNTS_SELECTION =
+ EmailContent.AccountColumns.SYNC_INTERVAL +
+ "=" + Integer.toString(Account.CHECK_INTERVAL_PUSH);
+
+ /** {@link AsyncTask} to restart pings for all accounts that need it. */
+ private class RestartPingsTask extends AsyncTask<Void, Void, Void> {
+ private boolean mHasRestartedPing = false;
+
+ @Override
+ protected Void doInBackground(Void... params) {
+ final Cursor c = EasService.this.getContentResolver().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);
+ if (EasService.this.pingNeededForAccount(account)) {
+ mHasRestartedPing = true;
+ EasService.this.mSynchronizer.pushModify(account);
+ }
+ }
+ } finally {
+ c.close();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void result) {
+ if (!mHasRestartedPing) {
+ LogUtils.d(TAG, "RestartPingsTask did not start any pings.");
+ EasService.this.mSynchronizer.stopServiceIfIdle();
+ }
+ }
+ }
+
+ public EasService() {
+ super();
+ mSynchronizer = new PingSyncSynchronizer(this);
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ EmailContent.init(this);
+ AUTHORITIES_TO_SYNC = new String[] {
+ EmailContent.AUTHORITY,
+ CalendarContract.AUTHORITY,
+ ContactsContract.AUTHORITY
+ };
+
+ // Restart push for all accounts that need it. Because this requires DB loads, we do it in
+ // an AsyncTask, and we startService to ensure that we stick around long enough for the
+ // task to complete. The task will stop the service if necessary after it's done.
+ startService(new Intent(this, EasService.class));
+ new RestartPingsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+
+ @Override
+ public void onDestroy() {
+ mSynchronizer.stopAllPings();
+ }
+
+ @Override
+ public IBinder onBind(final Intent intent) {
+ return mBinder;
+ }
+
+ @Override
+ public int onStartCommand(final Intent intent, final int flags, final int startId) {
+ if (intent != null &&
+ TextUtils.equals(Eas.EXCHANGE_SERVICE_INTENT_ACTION, intent.getAction())) {
+ if (intent.getBooleanExtra(ServiceProxy.EXTRA_FORCE_SHUTDOWN, false)) {
+ // We've been asked to forcibly shutdown. This happens if email accounts are
+ // deleted, otherwise we can get errors if services are still running for
+ // accounts that are now gone.
+ // TODO: This is kind of a hack, it would be nicer if we could handle it correctly
+ // if accounts disappear out from under us.
+ LogUtils.d(TAG, "Forced shutdown, killing process");
+ System.exit(-1);
+ }
+ }
+ return START_STICKY;
+ }
+
+ public int doOperation(final EasOperation operation, final String loggingName) {
+ final long accountId = operation.getAccountId();
+ final Account account = operation.getAccount();
+ LogUtils.d(TAG, "%s: %d", loggingName, accountId);
+ mSynchronizer.syncStart(accountId);
+ // TODO: Do we need a wakelock here? For RPC coming from sync adapters, no -- the SA
+ // already has one. But for others, maybe? Not sure what's guaranteed for AIDL calls.
+ // If we add a wakelock (or anything else for that matter) here, must remember to undo
+ // it in the finally block below.
+ // On the other hand, even for SAs, it doesn't hurt to get a wakelock here.
+ try {
+ return operation.performOperation();
+ } finally {
+ mSynchronizer.syncEnd(account);
+ }
+ }
+
+ /**
+ * Determine whether this account is configured with folders that are ready for push
+ * notifications.
+ * @param account The {@link Account} that we're interested in.
+ * @return Whether this account needs to ping.
+ */
+ public boolean pingNeededForAccount(final Account account) {
+ // Check account existence.
+ if (account == null || account.mId == Account.NO_ACCOUNT) {
+ LogUtils.d(TAG, "Do not ping: Account not found or not valid");
+ return false;
+ }
+
+ // Check if account is configured for a push sync interval.
+ if (account.mSyncInterval != Account.CHECK_INTERVAL_PUSH) {
+ LogUtils.d(TAG, "Do not ping: Account %d not configured for push", account.mId);
+ return false;
+ }
+
+ // Check security hold status of the account.
+ if ((account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0) {
+ LogUtils.d(TAG, "Do not ping: Account %d is on security hold", account.mId);
+ return false;
+ }
+
+ // Check if the account has performed at least one sync so far (accounts must perform
+ // the initial sync before push is possible).
+ if (EmailContent.isInitialSyncKey(account.mSyncKey)) {
+ LogUtils.d(TAG, "Do not ping: Account %d has not done initial sync", account.mId);
+ return false;
+ }
+
+ // Check that there's at least one mailbox that is both configured for push notifications,
+ // and whose content type is enabled for sync in the account manager.
+ final android.accounts.Account amAccount = new android.accounts.Account(
+ account.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+
+ final Set<String> authsToSync = getAuthoritiesToSync(amAccount, AUTHORITIES_TO_SYNC);
+ // If we have at least one sync-enabled content type, check for syncing mailboxes.
+ if (!authsToSync.isEmpty()) {
+ final Cursor c = Mailbox.getMailboxesForPush(getContentResolver(), account.mId);
+ if (c != null) {
+ try {
+ while (c.moveToNext()) {
+ final int mailboxType = c.getInt(Mailbox.CONTENT_TYPE_COLUMN);
+ if (authsToSync.contains(Mailbox.getAuthority(mailboxType))) {
+ return true;
+ }
+ }
+ } finally {
+ c.close();
+ }
+ }
+ }
+ LogUtils.d(TAG, "Do not ping: Account %d has no folders configured for push", account.mId);
+ return false;
+ }
+
+ /**
+ * Determine which content types are set to sync for an account.
+ * @param account The account whose sync settings we're looking for.
+ * @param authorities All possible authorities we could care about.
+ * @return The authorities for the content types we want to sync for account.
+ */
+ private static Set<String> getAuthoritiesToSync(final android.accounts.Account account,
+ final String[] authorities) {
+ final HashSet<String> authsToSync = new HashSet();
+ for (final String authority : authorities) {
+ if (ContentResolver.getSyncAutomatically(account, authority)) {
+ authsToSync.add(authority);
+ }
+ }
+ return authsToSync;
+ }
+}
diff --git a/src/com/android/exchange/service/EasSyncHandler.java b/src/com/android/exchange/service/EasSyncHandler.java
deleted file mode 100644
index f2c92c3..0000000
--- a/src/com/android/exchange/service/EasSyncHandler.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * 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.exchange.eas.EasProvision;
-import com.android.mail.utils.LogUtils;
-
-import org.apache.http.HttpStatus;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.cert.CertificateException;
-
-/**
- * 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 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 = Eas.LOG_TAG;
-
- public static final int MAX_WINDOW_SIZE = 512;
-
- /** Window sizes for PIM (contact & calendar) sync options. */
- public static final int PIM_WINDOW_SIZE_CONTACTS = 10;
- public static final int PIM_WINDOW_SIZE_CALENDAR = 10;
-
- // TODO: For each type of failure, provide info about why.
- protected static final int SYNC_RESULT_DENIED = -3;
- protected static final int SYNC_RESULT_PROVISIONING_ERROR = -2;
- 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;
-
- 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.
- LogUtils.e(TAG, "Invalid mailbox type %d", mailbox.mType);
- 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 String getSyncKey() {
- if (mMailbox == null) {
- return null;
- }
- if (mMailbox.mSyncKey == null) {
- mMailbox.mSyncKey = "0";
- }
- return mMailbox.mSyncKey;
- }
-
- /**
- * 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 com.android.exchange.adapter.Serializer} for this sync.
- * @param numWindows
- * @throws IOException
- */
- protected abstract void setNonInitialSyncOptions(final Serializer s, int numWindows)
- 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 com.android.exchange.adapter.Serializer} for this sync request.
- * @param filter The lookback to use, or null if no lookback is desired.
- * @param windowSize
- * @throws IOException
- */
- protected void setPimSyncOptions(final Serializer s, final String filter, int windowSize)
- throws IOException {
- s.tag(Tags.SYNC_DELETES_AS_MOVES);
- s.tag(Tags.SYNC_GET_CHANGES);
- s.data(Tags.SYNC_WINDOW_SIZE, String.valueOf(windowSize));
- 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.
- * @param numWindows
- * @return The {@link Serializer} for to use for this request.
- * @throws IOException
- */
- private Serializer buildEasRequest(
- final String syncKey, final boolean initialSync, int numWindows) throws IOException {
- final String className = getFolderClassName();
- LogUtils.d(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, numWindows);
- 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) {
- // TODO: This is basically copied from EasOperation, will go away when this merges.
- final int status = e.mStatus;
- LogUtils.e(TAG, "CommandStatusException: %d", status);
- if (CommandStatusException.CommandStatus.isNeedsProvisioning(status)) {
- return SYNC_RESULT_PROVISIONING_ERROR;
- }
- if (CommandStatusException.CommandStatus.isDeniedAccess(status)) {
- return SYNC_RESULT_DENIED;
- }
- 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.
- * @param syncResult
- * @param numWindows
- */
- private int performOneSync(SyncResult syncResult, int numWindows) {
- 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, numWindows);
- final long timeout = initialSync ? 120 * DateUtils.SECOND_IN_MILLIS : COMMAND_TIMEOUT;
- resp = sendHttpClientPost("Sync", s.toByteArray(), timeout);
- } catch (final IOException e) {
- LogUtils.e(TAG, e, "Sync error:");
- syncResult.stats.numIoExceptions++;
- return SYNC_RESULT_FAILED;
- } catch (final CertificateException e) {
- LogUtils.e(TAG, e, "Certificate error:");
- syncResult.stats.numAuthExceptions++;
- return SYNC_RESULT_FAILED;
- }
-
- final int result;
- try {
- final int responseResult;
- 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()) {
- responseResult = parse(resp);
- } else {
- responseResult = SYNC_RESULT_DONE;
- }
- } else {
- LogUtils.e(TAG, "Sync failed with Status: " + code);
- responseResult = SYNC_RESULT_FAILED;
- }
-
- if (responseResult == SYNC_RESULT_DONE
- || responseResult == SYNC_RESULT_MORE_AVAILABLE) {
- result = responseResult;
- } else if (resp.isProvisionError()
- || responseResult == SYNC_RESULT_PROVISIONING_ERROR) {
- final EasProvision provision = new EasProvision(mContext, mAccount.mId, this);
- if (provision.provision(syncResult, mAccount.mId)) {
- // We handled the provisioning error, so loop.
- LogUtils.d(TAG, "Provisioning error handled during sync, retrying");
- result = SYNC_RESULT_MORE_AVAILABLE;
- } else {
- syncResult.stats.numAuthExceptions++;
- result = SYNC_RESULT_FAILED;
- }
- } else if (resp.isAuthError() || responseResult == SYNC_RESULT_DENIED) {
- syncResult.stats.numAuthExceptions++;
- result = SYNC_RESULT_FAILED;
- } else {
- syncResult.stats.numParseExceptions++;
- result = SYNC_RESULT_FAILED;
- }
-
- } 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, 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.
- * @param syncResult
- */
- public final boolean performSync(SyncResult syncResult) {
- // 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 result = SYNC_RESULT_MORE_AVAILABLE;
- int numWindows = 1;
- String key = getSyncKey();
- while (result == SYNC_RESULT_MORE_AVAILABLE) {
- result = performOneSync(syncResult, numWindows);
- // TODO: Clear pending request queue.
- final String newKey = getSyncKey();
- if (result == SYNC_RESULT_MORE_AVAILABLE && key.equals(newKey)) {
- LogUtils.e(TAG,
- "Server has more data but we have the same key: %s numWindows: %d",
- key, numWindows);
- numWindows++;
- } else {
- numWindows = 1;
- }
- key = newKey;
- }
- return result == SYNC_RESULT_DONE;
- }
-}
diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index 8192df6..aedbba0 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -22,17 +22,20 @@
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.AbstractThreadedSyncAdapter;
+import android.content.ComponentName;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.ServiceConnection;
import android.content.SyncResult;
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.provider.CalendarContract;
import android.provider.ContactsContract;
@@ -40,11 +43,13 @@
import android.text.format.DateUtils;
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.AccountColumns;
+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.HostAuth;
import com.android.emailcommon.provider.Mailbox;
import com.android.emailcommon.service.EmailServiceStatus;
@@ -58,14 +63,18 @@
import com.android.exchange.R.drawable;
import com.android.exchange.R.string;
import com.android.exchange.adapter.PingParser;
-import com.android.exchange.adapter.Search;
+import com.android.exchange.eas.EasSyncContacts;
+import com.android.exchange.eas.EasSyncCalendar;
import com.android.exchange.eas.EasFolderSync;
+import com.android.exchange.eas.EasLoadAttachment;
import com.android.exchange.eas.EasMoveItems;
import com.android.exchange.eas.EasOperation;
+import com.android.exchange.eas.EasOutboxSync;
import com.android.exchange.eas.EasPing;
+import com.android.exchange.eas.EasSearch;
import com.android.exchange.eas.EasSync;
+import com.android.exchange.eas.EasSyncBase;
import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.android.mail.utils.LogUtils;
import java.util.HashMap;
@@ -82,6 +91,16 @@
private static final String TAG = Eas.LOG_TAG;
+ /**
+ * Temporary while converting to EasService. Do not check in set to true.
+ * When true, delegates various operations to {@link EasService}, for use while developing the
+ * new service.
+ * The two following fields are used to support what happens when this is true.
+ */
+ private static final boolean DELEGATE_TO_EAS_SERVICE = false;
+ private IEmailService mEasService;
+ private ServiceConnection mConnection;
+
private static final String EXTRA_START_PING = "START_PING";
private static final String EXTRA_PING_ACCOUNT = "PING_ACCOUNT";
private static final long SYNC_ERROR_BACKOFF_MILLIS = 5 * DateUtils.MINUTE_IN_MILLIS;
@@ -95,17 +114,18 @@
/** Controls whether we do a periodic "kick" to restart the ping. */
private static final boolean SCHEDULE_KICK = true;
- /**
- * 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 };
private static final Object sSyncAdapterLock = new Object();
private static AbstractThreadedSyncAdapter sSyncAdapter = null;
+ // Value for a message's server id when sending fails.
+ public static final int SEND_FAILED = 1;
+ 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 + ')';
+
/**
* 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
@@ -253,27 +273,16 @@
if (pingSyncHandler != null) {
pingSyncHandler.restart();
} else {
- // Start a new 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.
if (lastSyncHadError) {
// Schedule an alarm to set up the ping in 5 minutes
- final Intent intent = new Intent(service, EmailSyncAdapterService.class);
- intent.setAction(Eas.EXCHANGE_SERVICE_INTENT_ACTION);
- intent.putExtra(EXTRA_START_PING, true);
- intent.putExtra(EXTRA_PING_ACCOUNT, amAccount);
- final PendingIntent pi = PendingIntent.getService(
- EmailSyncAdapterService.this, 0, intent,
- PendingIntent.FLAG_ONE_SHOT);
- final AlarmManager am = (AlarmManager)getSystemService(
- Context.ALARM_SERVICE);
- final long atTime = SystemClock.elapsedRealtime() +
- SYNC_ERROR_BACKOFF_MILLIS;
- am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, atTime, pi);
+ scheduleDelayedPing(amAccount, SYNC_ERROR_BACKOFF_MILLIS);
} else {
+ // Start a new 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, amAccount,
this);
mPingHandlers.put(account.mId, pingHandler);
@@ -331,14 +340,19 @@
// TODO: if (pingStatus == PingParser.STATUS_FAILED), notify UI.
// TODO: if (pingStatus == PingParser.STATUS_REQUEST_TOO_MANY_FOLDERS), notify UI.
- // TODO: Should this just re-request ping if status < 0? This would do the wrong thing
- // for e.g. auth errors, though.
if (pingStatus == EasOperation.RESULT_REQUEST_FAILURE ||
pingStatus == EasOperation.RESULT_OTHER_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);
+ // TODO: Sticky problem here: we necessarily aren't in a sync, so it's impossible to
+ // signal the error to the SyncManager and take advantage of backoff there. Worse,
+ // the current mechanism for how we do this will just encourage spammy requests
+ // since the actual ping-only sync request ALWAYS succeeds.
+ // So for now, let's delay a bit before asking the SyncManager to perform the sync.
+ // Longer term, this should be incorporated into some form of backoff, either
+ // by integrating with the SyncManager more fully or by implementing a Ping-specific
+ // backoff mechanism (e.g. integrate this with the logic for ping duration).
+ LogUtils.e(TAG, "Ping for account %d completed with error %d, delaying next ping",
+ accountId, pingStatus);
+ scheduleDelayedPing(amAccount, SYNC_ERROR_BACKOFF_MILLIS);
} else {
stopServiceIfNoPings();
}
@@ -369,7 +383,14 @@
@Override
public Bundle validate(final HostAuth hostAuth) {
LogUtils.d(TAG, "IEmailService.validate");
- return new EasFolderSync(EmailSyncAdapterService.this, hostAuth).validate();
+ if (mEasService != null) {
+ try {
+ return mEasService.validate(hostAuth);
+ } catch (final RemoteException re) {
+ LogUtils.e(TAG, re, "While asking EasService to handle validate");
+ }
+ }
+ return new EasFolderSync(EmailSyncAdapterService.this, hostAuth).doValidate();
}
@Override
@@ -382,6 +403,14 @@
@Override
public void updateFolderList(final long accountId) {
LogUtils.d(TAG, "IEmailService.updateFolderList: %d", accountId);
+ if (mEasService != null) {
+ try {
+ mEasService.updateFolderList(accountId);
+ return;
+ } catch (final RemoteException re) {
+ LogUtils.e(TAG, re, "While asking EasService to updateFolderList");
+ }
+ }
final String emailAddress = getEmailAddressForAccount(accountId);
if (emailAddress != null) {
final Bundle extras = new Bundle(1);
@@ -402,12 +431,13 @@
}
@Override
- public void loadAttachment(final IEmailServiceCallback callback, final long attachmentId,
- final boolean background) {
+ public void loadAttachment(final IEmailServiceCallback callback, final long accountId,
+ 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);
+ final EasLoadAttachment operation = new EasLoadAttachment(EmailSyncAdapterService.this,
+ accountId, attachmentId, callback);
+ operation.performOperation();
}
@Override
@@ -427,8 +457,8 @@
LogUtils.d(TAG, "IEmailService.deleteAccountPIMData");
if (emailAddress != null) {
final Context context = EmailSyncAdapterService.this;
- EasContactsSyncHandler.wipeAccountFromContentProvider(context, emailAddress);
- EasCalendarSyncHandler.wipeAccountFromContentProvider(context, emailAddress);
+ EasSyncContacts.wipeAccountFromContentProvider(context, emailAddress);
+ EasSyncCalendar.wipeAccountFromContentProvider(context, emailAddress);
}
// TODO: Run account reconciler?
}
@@ -437,8 +467,10 @@
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);
+ final EasSearch operation = new EasSearch(EmailSyncAdapterService.this, accountId,
+ searchParams, destMailboxId);
+ operation.performOperation();
+ return operation.getTotalResults();
// TODO: may need an explicit callback to replace the one to IEmailServiceCallback.
}
@@ -446,77 +478,26 @@
public void sendMail(final long accountId) {}
@Override
- public int getCapabilities(final Account acct) {
- String easVersion = acct.mProtocolVersion;
- Double easVersionDouble = 2.5D;
- if (easVersion != null) {
+ public void pushModify(final long accountId) {
+ LogUtils.d(TAG, "IEmailService.pushModify");
+ if (mEasService != null) {
try {
- easVersionDouble = Double.parseDouble(easVersion);
- } catch (NumberFormatException e) {
- // Stick with 2.5
+ mEasService.pushModify(accountId);
+ return;
+ } catch (final RemoteException re) {
+ LogUtils.e(TAG, re, "While asking EasService to handle pushModify");
}
}
- if (easVersionDouble >= 12.0D) {
- return AccountCapabilities.SYNCABLE_FOLDERS |
- AccountCapabilities.SERVER_SEARCH |
- AccountCapabilities.FOLDER_SERVER_SEARCH |
- AccountCapabilities.SMART_REPLY |
- AccountCapabilities.UNDO |
- AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
- } else {
- return AccountCapabilities.SYNCABLE_FOLDERS |
- AccountCapabilities.SMART_REPLY |
- AccountCapabilities.UNDO |
- AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
+ final Account account = Account.restoreAccountWithId(EmailSyncAdapterService.this,
+ accountId);
+ if (account != null) {
+ mSyncHandlerMap.modifyPing(false, account);
}
}
@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 void sync(final long accountId, final boolean updateFolderList,
+ final int mailboxType, final long[] folders) {}
};
public EmailSyncAdapterService() {
@@ -578,6 +559,21 @@
// Restart push for all accounts that need it.
new RestartPingsTask(getContentResolver(), mSyncHandlerMap).executeOnExecutor(
AsyncTask.THREAD_POOL_EXECUTOR);
+ if (DELEGATE_TO_EAS_SERVICE) {
+ // TODO: This block is temporary to support the transition to EasService.
+ mConnection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder binder) {
+ mEasService = IEmailService.Stub.asInterface(binder);
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ mEasService = null;
+ }
+ };
+ bindService(new Intent(this, EasService.class), mConnection, Context.BIND_AUTO_CREATE);
+ }
}
@Override
@@ -589,6 +585,10 @@
task.stop();
}
}
+ if (DELEGATE_TO_EAS_SERVICE) {
+ // TODO: This block is temporary to support the transition to EasService.
+ unbindService(mConnection);
+ }
}
@Override
@@ -678,14 +678,6 @@
final long[] mailboxIds = Mailbox.getMailboxIdsFromBundle(extras);
final int mailboxType = extras.getInt(Mailbox.SYNC_EXTRA_MAILBOX_TYPE,
Mailbox.TYPE_NONE);
- final boolean hasCallbackMethod =
- extras.containsKey(EmailServiceStatus.SYNC_EXTRAS_CALLBACK_METHOD);
- if (hasCallbackMethod && mailboxIds != null) {
- for (long mailboxId : mailboxIds) {
- EmailServiceStatus.syncMailboxStatus(cr, extras, mailboxId,
- EmailServiceStatus.IN_PROGRESS, 0, UIProvider.LastSyncResult.SUCCESS);
- }
- }
// Push only means this sync request should only refresh the ping (either because
// settings changed, or we need to restart it for some reason).
@@ -702,66 +694,76 @@
// If we're just twiddling the push, we do the lightweight thing and bail early.
if (pushOnly && !isFolderSync) {
- mSyncHandlerMap.modifyPing(false, account);
LogUtils.d(TAG, "onPerformSync: mailbox push only");
+ if (mEasService != null) {
+ try {
+ mEasService.pushModify(account.mId);
+ return;
+ } catch (final RemoteException re) {
+ LogUtils.e(TAG, re, "While trying to pushModify within onPerformSync");
+ }
+ }
+ mSyncHandlerMap.modifyPing(false, account);
return;
}
// Do the bookkeeping for starting a sync, including stopping a ping if necessary.
mSyncHandlerMap.startSync(account.mId);
+ int operationResult = 0;
+ try {
+ // Perform a FolderSync if necessary.
+ // TODO: We permit FolderSync even during security hold, because it's necessary to
+ // resolve some holds. Ideally we would only do it for the holds that require it.
+ if (isFolderSync) {
+ final EasFolderSync folderSync = new EasFolderSync(context, account);
+ operationResult = folderSync.doFolderSync();
+ if (operationResult < 0) {
+ return;
+ }
+ }
- // Perform a FolderSync if necessary.
- // TODO: We permit FolderSync even during security hold, because it's necessary to
- // resolve some holds. Ideally we would only do it for the holds that require it.
- if (isFolderSync) {
- final EasFolderSync folderSync = new EasFolderSync(context, account);
- folderSync.doFolderSync(syncResult);
- }
+ // Do not permit further syncs if we're on security hold.
+ if ((account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0) {
+ return;
+ }
- boolean lastSyncHadError = false;
-
- if ((account.mFlags & Account.FLAGS_SECURITY_HOLD) == 0) {
// Perform email upsync for this account. Moves first, then state changes.
if (!isInitialSync) {
EasMoveItems move = new EasMoveItems(context, account);
- move.upsyncMovedMessages(syncResult);
+ operationResult = move.upsyncMovedMessages();
+ if (operationResult < 0) {
+ return;
+ }
+
// TODO: EasSync should eventually handle both up and down; for now, it's used
// purely for upsync.
EasSync upsync = new EasSync(context, account);
- upsync.upsync(syncResult);
+ operationResult = upsync.upsync();
+ if (operationResult < 0) {
+ return;
+ }
}
- // TODO: Should we refresh 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 (mailboxIds != null) {
- long numIoExceptions = 0;
- long numAuthExceptions = 0;
+ final boolean hasCallbackMethod =
+ extras.containsKey(EmailServiceStatus.SYNC_EXTRAS_CALLBACK_METHOD);
// Sync the mailbox that was explicitly requested.
for (final long mailboxId : mailboxIds) {
- final boolean success = syncMailbox(context, cr, acct, account, mailboxId,
- extras, syncResult, null, true);
- if (!success) {
- lastSyncHadError = true;
- }
if (hasCallbackMethod) {
- final int result;
- if (syncResult.hasError()) {
- if (syncResult.stats.numIoExceptions > numIoExceptions) {
- result = UIProvider.LastSyncResult.CONNECTION_ERROR;
- numIoExceptions = syncResult.stats.numIoExceptions;
- } else if (syncResult.stats.numAuthExceptions> numAuthExceptions) {
- result = UIProvider.LastSyncResult.AUTH_ERROR;
- numAuthExceptions= syncResult.stats.numAuthExceptions;
- } else {
- result = UIProvider.LastSyncResult.INTERNAL_ERROR;
- }
- } else {
- result = UIProvider.LastSyncResult.SUCCESS;
- }
- EmailServiceStatus.syncMailboxStatus(
- cr, extras, mailboxId,EmailServiceStatus.SUCCESS, 0, result);
+ EmailServiceStatus.syncMailboxStatus(cr, extras, mailboxId,
+ EmailServiceStatus.IN_PROGRESS, 0,
+ UIProvider.LastSyncResult.SUCCESS);
+ }
+ operationResult = syncMailbox(context, cr, acct, account, mailboxId,
+ extras, syncResult, null, true);
+ if (hasCallbackMethod) {
+ EmailServiceStatus.syncMailboxStatus(cr, extras,
+ mailboxId,EmailServiceStatus.SUCCESS, 0,
+ EasOperation.translateSyncResultToUiResult(operationResult));
+ }
+
+ if (operationResult < 0) {
+ break;
}
}
} else if (!accountOnly && !pushOnly) {
@@ -778,10 +780,10 @@
try {
final HashSet<String> authsToSync = getAuthsToSync(acct);
while (c.moveToNext()) {
- boolean success = syncMailbox(context, cr, acct, account,
+ operationResult = syncMailbox(context, cr, acct, account,
c.getLong(0), extras, syncResult, authsToSync, false);
- if (!success) {
- lastSyncHadError = true;
+ if (operationResult < 0) {
+ break;
}
}
} finally {
@@ -789,15 +791,23 @@
}
}
}
+ } finally {
+ // Clean up the bookkeeping, including restarting ping if necessary.
+ mSyncHandlerMap.syncComplete(syncResult.hasError(), account);
+
+ if (operationResult < 0) {
+ EasFolderSync.writeResultToSyncResult(operationResult, syncResult);
+ // If any operations had an auth error, notify the user.
+ // Note that provisioning errors should have already triggered the policy
+ // notification, so suppress those from showing the auth notification.
+ if (syncResult.stats.numAuthExceptions > 0 &&
+ operationResult != EasOperation.RESULT_PROVISIONING_ERROR) {
+ showAuthNotification(account.mId, account.mEmailAddress);
+ }
+ }
+
+ LogUtils.d(TAG, "onPerformSync: finished");
}
-
- // Clean up the bookkeeping, including restarting ping if necessary.
- mSyncHandlerMap.syncComplete(lastSyncHadError, 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.
- LogUtils.d(TAG, "onPerformSync: finished");
}
/**
@@ -817,24 +827,24 @@
mailbox.update(context, cv);
}
- private boolean syncMailbox(final Context context, final ContentResolver cr,
+ private int 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 HashSet<String> authsToSync,
final boolean isMailboxSync) {
final Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
if (mailbox == null) {
- return false;
+ return EasSyncBase.RESULT_HARD_DATA_FAILURE;
}
if (mailbox.mAccountKey != account.mId) {
LogUtils.e(TAG, "Mailbox does not match account: %s, %s", acct.toString(),
extras.toString());
- return false;
+ return EasSyncBase.RESULT_HARD_DATA_FAILURE;
}
if (authsToSync != null && !authsToSync.contains(Mailbox.getAuthority(mailbox.mType))) {
// We are asking for an account sync, but this mailbox type is not configured for
// sync. Do NOT treat this as a sync error for ping backoff purposes.
- return true;
+ return EasSyncBase.RESULT_DONE;
}
if (mailbox.mType == Mailbox.TYPE_DRAFTS) {
@@ -845,39 +855,73 @@
// that we won't sync even if the user attempts to force a sync from the UI.
// Do NOT treat as a sync error for ping backoff purposes.
LogUtils.d(TAG, "Skipping sync of DRAFTS folder");
- return true;
+ return EasSyncBase.RESULT_DONE;
}
- 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);
- if (syncHandler != null) {
- success = syncHandler.performSync(syncResult);
- } else {
- success = false;
+ if (mailbox.mType == Mailbox.TYPE_OUTBOX || mailbox.isSyncable()) {
+ final ContentValues cv = new ContentValues(2);
+ updateMailbox(context, mailbox, cv, isMailboxSync ?
+ EmailContent.SYNC_STATUS_USER : EmailContent.SYNC_STATUS_BACKGROUND);
+ try {
+ if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
+ return syncOutbox(context, cr, account, mailbox);
+ }
+ final EasSyncBase operation = new EasSyncBase(context, account, mailbox);
+ return operation.performOperation();
+ } finally {
+ updateMailbox(context, mailbox, cv, EmailContent.SYNC_STATUS_NONE);
}
- } else {
- success = false;
}
- updateMailbox(context, mailbox, cv, EmailContent.SYNC_STATUS_NONE);
- if (syncResult.stats.numAuthExceptions > 0) {
- showAuthNotification(account.mId, account.mEmailAddress);
- }
- return success;
+ return EasSyncBase.RESULT_DONE;
}
}
+
+ private int syncOutbox(Context context, ContentResolver cr, Account account, Mailbox mailbox) {
+ // Get a cursor to Outbox messages
+ final Cursor c = cr.query(Message.CONTENT_URI,
+ Message.CONTENT_PROJECTION, MAILBOX_KEY_AND_NOT_SEND_FAILED,
+ new String[] {Long.toString(mailbox.mId)}, null);
+ try {
+ // Loop through the messages, sending each one
+ while (c.moveToNext()) {
+ final Message message = new Message();
+ message.restore(c);
+ if (Utility.hasUnloadedAttachments(context, 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);
+
+ EasOperation op = new EasOutboxSync(context, account, message, true);
+ int result = op.performOperation();
+ if (result == EasOutboxSync.RESULT_ITEM_NOT_FOUND) {
+ // This can happen if we are using smartReply, and the message we are referring
+ // to has disappeared from the server. Try again with smartReply disabled.
+ op = new EasOutboxSync(context, account, message, false);
+ result = op.performOperation();
+ }
+ // If we got some connection error or other fatal error, terminate the sync.
+ if (result != EasOutboxSync.RESULT_OK &&
+ result != EasOutboxSync.RESULT_NON_FATAL_ERROR &&
+ result > EasOutboxSync.RESULT_OP_SPECIFIC_ERROR_RESULT) {
+ LogUtils.w(TAG, "Aborting outbox sync for error %d", result);
+ return result;
+ }
+ }
+ } finally {
+ // TODO: Some sort of sendMessageStatus() is needed here.
+ c.close();
+ }
+ return EasOutboxSync.RESULT_OK;
+ }
+
private void showAuthNotification(long accountId, String accountName) {
final PendingIntent pendingIntent = PendingIntent.getActivity(
this,
@@ -930,4 +974,26 @@
}
return authsToSync;
}
+
+ /**
+ * Schedule to have a ping start some time in the future. This is used when we encounter an
+ * error, and properly should be a more full featured back-off, but for the short run, just
+ * waiting a few minutes at least avoids burning battery.
+ * @param amAccount The account that needs to be pinged.
+ * @param delay The time in milliseconds to wait before requesting the ping-only sync. Note that
+ * it may take longer than this before the ping actually happens, since there's two
+ * layers of waiting ({@link AlarmManager} can choose to wait longer, as can the
+ * SyncManager).
+ */
+ private void scheduleDelayedPing(final android.accounts.Account amAccount, final long delay) {
+ final Intent intent = new Intent(this, EmailSyncAdapterService.class);
+ intent.setAction(Eas.EXCHANGE_SERVICE_INTENT_ACTION);
+ intent.putExtra(EXTRA_START_PING, true);
+ intent.putExtra(EXTRA_PING_ACCOUNT, amAccount);
+ final PendingIntent pi = PendingIntent.getService(this, 0, intent,
+ PendingIntent.FLAG_ONE_SHOT);
+ final AlarmManager am = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
+ final long atTime = SystemClock.elapsedRealtime() + delay;
+ am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, atTime, pi);
+ }
}
diff --git a/src/com/android/exchange/service/PingSyncSynchronizer.java b/src/com/android/exchange/service/PingSyncSynchronizer.java
new file mode 100644
index 0000000..f357881
--- /dev/null
+++ b/src/com/android/exchange/service/PingSyncSynchronizer.java
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2014 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.Context;
+import android.content.Intent;
+import android.support.v4.util.LongSparseArray;
+
+import com.android.emailcommon.provider.Account;
+import com.android.exchange.Eas;
+import com.android.exchange.eas.EasPing;
+import com.android.mail.utils.LogUtils;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Bookkeeping for handling synchronization between pings and other sync related operations.
+ * "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 extended to IMAP.
+ *
+ * Basic rules of how these interact (note that all rules are per account):
+ * - Only one operation (ping or other active sync operation) may run at a time.
+ * - For shorthand, this class uses "sync" to mean "non-ping operation"; most such operations are
+ * sync ops, but some may not be (e.g. EAS Settings).
+ * - Syncs can come from many sources concurrently; this class must serialize them.
+ *
+ * WHEN A SYNC STARTS:
+ * - If nothing is running, proceed.
+ * - If something is already running: wait until it's done.
+ * - If the running thing is a ping task: interrupt it.
+ *
+ * WHEN A SYNC ENDS:
+ * - If there are waiting syncs: signal one to proceed.
+ * - If there are no waiting syncs and this account is configured for push: start a ping.
+ * - Otherwise: This account is now idle.
+ *
+ * WHEN A PING TASK ENDS:
+ * - A ping task loops until either it's interrupted by a sync (in which case, there will be one or
+ * more waiting syncs when the ping terminates), or encounters an error.
+ * - If there are waiting syncs, and we were interrupted: signal one to proceed.
+ * - If there are waiting syncs, but the ping terminated with an error: TODO: How to handle?
+ * - If there are no waiting syncs and this account is configured for push: This means the ping task
+ * was terminated due to an error. Handle this by sending a sync request through the SyncManager
+ * that doesn't actually do any syncing, and whose only effect is to restart the ping.
+ * - Otherwise: This account is now idle.
+ *
+ * WHEN AN ACCOUNT WANTS TO START OR CHANGE ITS PUSH BEHAVIOR:
+ * - If nothing is running, start a new ping task.
+ * - If a ping task is currently running, restart it with the new settings.
+ * - If a sync is currently running, do nothing.
+ *
+ * WHEN AN ACCOUNT WANTS TO STOP GETTING PUSH:
+ * - If nothing is running, do nothing.
+ * - If a ping task is currently running, interrupt it.
+ */
+public class PingSyncSynchronizer {
+
+ private static final String TAG = Eas.LOG_TAG;
+
+ /**
+ * This class handles bookkeeping for a single account.
+ */
+ private static class AccountSyncState {
+ /** The currently running {@link PingTask}, or null if we aren't in the middle of a Ping. */
+ private PingTask mPingTask;
+
+ /**
+ * Tracks whether this account wants to get push notifications, based on calls to
+ * {@link #pushModify} and {@link #pushStop} (i.e. it tracks the last requested push state).
+ */
+ private boolean mPushEnabled;
+
+ /**
+ * The number of syncs that are blocked waiting for the current operation to complete.
+ * Unlike Pings, sync operations do not start their own tasks and are assumed to run in
+ * whatever thread calls into this class.
+ */
+ private int mSyncCount;
+
+ /** The condition on which to block syncs that need to wait. */
+ private Condition mCondition;
+
+ /**
+ *
+ * @param lock The lock from which to create our condition.
+ */
+ public AccountSyncState(final Lock lock) {
+ mPingTask = null;
+ mPushEnabled = false;
+ mSyncCount = 0;
+ mCondition = lock.newCondition();
+ }
+
+ /**
+ * Helper function that starts a ping task
+ * @param account The {@link Account} in question.
+ * @param synchronizer Parent {@link PingSyncSynchronizer} object.
+ */
+ private void startPingTask(final Account account, final PingSyncSynchronizer synchronizer) {
+ final android.accounts.Account amAccount =
+ new android.accounts.Account(account.mEmailAddress,
+ Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+ mPingTask = new PingTask(synchronizer.getContext(), account, amAccount,
+ synchronizer);
+ mPingTask.start();
+ }
+
+ /**
+ * Update bookkeeping for a new sync:
+ * - Stop the Ping if there is one.
+ * - Wait until there's nothing running for this account before proceeding.
+ */
+ public void syncStart() {
+ ++mSyncCount;
+ if (mPingTask != null) {
+ // Syncs are higher priority than Ping -- terminate the Ping.
+ LogUtils.d(TAG, "Sync is pre-empting a ping");
+ mPingTask.stop();
+ }
+ if (mPingTask != null || mSyncCount > 1) {
+ // There’s something we need to wait for before we can proceed.
+ try {
+ LogUtils.d(TAG, "Sync needs to wait: Ping: %s, Pending tasks: %d",
+ mPingTask != null ? "yes" : "no", mSyncCount);
+ mCondition.await();
+ } catch (final InterruptedException e) {
+ // TODO: Handle this properly. Not catching it might be the right answer.
+ }
+ }
+ }
+
+ /**
+ * Update bookkeeping when a sync completes. This includes signaling pending ops to
+ * go ahead, or starting the ping if appropriate and there are no waiting ops.
+ * @return Whether this account is now idle.
+ */
+ public boolean syncEnd(final Account account, final PingSyncSynchronizer synchronizer) {
+ --mSyncCount;
+ if (mSyncCount > 0) {
+ LogUtils.d(TAG, "Signalling a pending sync to proceed.");
+ mCondition.signal();
+ return false;
+ } else {
+ if (mPushEnabled) {
+ startPingTask(account, synchronizer);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Update bookkeeping when the ping task terminates, including signaling any waiting ops.
+ * @return Whether this account is now idle.
+ */
+ public boolean pingEnd(final android.accounts.Account amAccount) {
+ mPingTask = null;
+ if (mSyncCount > 0) {
+ mCondition.signal();
+ return false;
+ } else {
+ if (mPushEnabled) {
+ /**
+ * This situation only arises if we encountered some sort of error that
+ * stopped our ping but not due to a sync interruption. In this scenario
+ * we'll leverage the SyncManager to request a push only sync that will
+ * restart the ping when the time is right. */
+ EasPing.requestPing(amAccount);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Modifies or starts a ping for this account if no syncs are running.
+ */
+ public void pushModify(final Account account, final PingSyncSynchronizer synchronizer) {
+ mPushEnabled = true;
+ if (mSyncCount == 0) {
+ if (mPingTask == null) {
+ // No ping, no running syncs -- start a new ping.
+ startPingTask(account, synchronizer);
+ } else {
+ // Ping is already running, so tell it to restart to pick up any new params.
+ mPingTask.restart();
+ }
+ }
+ }
+
+ /**
+ * Stop the currently running ping.
+ */
+ public void pushStop() {
+ mPushEnabled = false;
+ if (mPingTask != null) {
+ mPingTask.stop();
+ }
+ }
+ }
+
+ /**
+ * Lock for access to {@link #mAccountStateMap}, also used to create the {@link Condition}s for
+ * each Account.
+ */
+ private final ReentrantLock mLock;
+
+ /**
+ * Map from account ID -> {@link AccountSyncState} for accounts with a running operation.
+ * An account is in this map only when this account is active, i.e. has a ping or sync running
+ * or pending. If an account is not in the middle of a sync and is not configured for push,
+ * it will not be here. This allows to use emptiness of this map to know whether the service
+ * needs to be running, and is also handy when debugging.
+ */
+ private final LongSparseArray<AccountSyncState> mAccountStateMap;
+
+ /** The {@link Service} that this object is managing. */
+ private final Service mService;
+
+ public PingSyncSynchronizer(final Service service) {
+ mLock = new ReentrantLock();
+ mAccountStateMap = new LongSparseArray<AccountSyncState>();
+ mService = service;
+ }
+
+ public Context getContext() {
+ return mService;
+ }
+
+ /**
+ * Gets the {@link AccountSyncState} for an account.
+ * The caller must hold {@link #mLock}.
+ * @param accountId The id for the account we're interested in.
+ * @param createIfNeeded If true, create the account state if it's not already there.
+ * @return The {@link AccountSyncState} for that account, or null if the account is idle and
+ * createIfNeeded is false.
+ */
+ private AccountSyncState getAccountState(final long accountId, final boolean createIfNeeded) {
+ assert mLock.isHeldByCurrentThread();
+ AccountSyncState state = mAccountStateMap.get(accountId);
+ if (state == null && createIfNeeded) {
+ LogUtils.d(TAG, "PSS adding account state for %d", accountId);
+ state = new AccountSyncState(mLock);
+ mAccountStateMap.put(accountId, state);
+ // TODO: Is this too late to startService?
+ if (mAccountStateMap.size() == 1) {
+ LogUtils.i(TAG, "PSS added first account, starting service");
+ mService.startService(new Intent(mService, mService.getClass()));
+ }
+ }
+ return state;
+ }
+
+ /**
+ * Remove an account from the map. If this was the last account, then also stop this service.
+ * The caller must hold {@link #mLock}.
+ * @param accountId The id for the account we're removing.
+ */
+ private void removeAccount(final long accountId) {
+ assert mLock.isHeldByCurrentThread();
+ LogUtils.d(TAG, "PSS removing account state for %d", accountId);
+ mAccountStateMap.delete(accountId);
+ if (mAccountStateMap.size() == 0) {
+ LogUtils.i(TAG, "PSS removed last account; stopping service.");
+ mService.stopSelf();
+ }
+ }
+
+ public void syncStart(final long accountId) {
+ mLock.lock();
+ try {
+ LogUtils.d(TAG, "PSS syncStart for account %d", accountId);
+ final AccountSyncState accountState = getAccountState(accountId, true);
+ accountState.syncStart();
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ public void syncEnd(final Account account) {
+ mLock.lock();
+ try {
+ final long accountId = account.getId();
+ LogUtils.d(TAG, "PSS syncEnd for account %d", accountId);
+ final AccountSyncState accountState = getAccountState(accountId, false);
+ if (accountState == null) {
+ LogUtils.w(TAG, "PSS syncEnd for account %d but no state found", accountId);
+ return;
+ }
+ if (accountState.syncEnd(account, this)) {
+ removeAccount(accountId);
+ }
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ public void pingEnd(final long accountId, final android.accounts.Account amAccount) {
+ mLock.lock();
+ try {
+ LogUtils.d(TAG, "PSS pingEnd for account %d", accountId);
+ final AccountSyncState accountState = getAccountState(accountId, false);
+ if (accountState == null) {
+ LogUtils.w(TAG, "PSS pingEnd for account %d but no state found", accountId);
+ return;
+ }
+ if (accountState.pingEnd(amAccount)) {
+ removeAccount(accountId);
+ }
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ public void pushModify(final Account account) {
+ mLock.lock();
+ try {
+ final long accountId = account.getId();
+ LogUtils.d(TAG, "PSS pushModify for account %d", accountId);
+ final AccountSyncState accountState = getAccountState(accountId, true);
+ accountState.pushModify(account, this);
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ public void pushStop(final long accountId) {
+ mLock.lock();
+ try {
+ LogUtils.d(TAG, "PSS pushStop for account %d", accountId);
+ final AccountSyncState accountState = getAccountState(accountId, false);
+ if (accountState != null) {
+ accountState.pushStop();
+ }
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ /**
+ * Stops our service if our map contains no active accounts.
+ */
+ public void stopServiceIfIdle() {
+ mLock.lock();
+ try {
+ LogUtils.d(TAG, "PSS stopIfIdle");
+ if (mAccountStateMap.size() == 0) {
+ LogUtils.i(TAG, "PSS has no active accounts; stopping service.");
+ mService.stopSelf();
+ }
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ /**
+ * Tells all running ping tasks to stop.
+ */
+ public void stopAllPings() {
+ mLock.lock();
+ try {
+ for (int i = 0; i < mAccountStateMap.size(); ++i) {
+ mAccountStateMap.valueAt(i).pushStop();
+ }
+ } finally {
+ mLock.unlock();
+ }
+ }
+}
diff --git a/src/com/android/exchange/service/PingTask.java b/src/com/android/exchange/service/PingTask.java
index 768727c..cad66cf 100644
--- a/src/com/android/exchange/service/PingTask.java
+++ b/src/com/android/exchange/service/PingTask.java
@@ -31,15 +31,28 @@
*/
public class PingTask extends AsyncTask<Void, Void, Void> {
private final EasPing mOperation;
+ // TODO: Transition away from mSyncHandlerMap -> mPingSyncSynchronizer.
private final EmailSyncAdapterService.SyncHandlerSynchronizer mSyncHandlerMap;
+ private final PingSyncSynchronizer mPingSyncSynchronizer;
private static final String TAG = Eas.LOG_TAG;
public PingTask(final Context context, final Account account,
final android.accounts.Account amAccount,
final EmailSyncAdapterService.SyncHandlerSynchronizer syncHandlerMap) {
+ assert syncHandlerMap != null;
mOperation = new EasPing(context, account, amAccount);
mSyncHandlerMap = syncHandlerMap;
+ mPingSyncSynchronizer = null;
+ }
+
+ public PingTask(final Context context, final Account account,
+ final android.accounts.Account amAccount,
+ final PingSyncSynchronizer pingSyncSynchronizer) {
+ assert pingSyncSynchronizer != null;
+ mOperation = new EasPing(context, account, amAccount);
+ mSyncHandlerMap = null;
+ mPingSyncSynchronizer = pingSyncSynchronizer;
}
/** Start the ping loop. */
@@ -74,8 +87,12 @@
}
LogUtils.i(TAG, "Ping task ending with status: %d", pingStatus);
- mSyncHandlerMap.pingComplete(mOperation.getAmAccount(), mOperation.getAccountId(),
- pingStatus);
+ if (mSyncHandlerMap != null) {
+ mSyncHandlerMap.pingComplete(mOperation.getAmAccount(), mOperation.getAccountId(),
+ pingStatus);
+ } else {
+ mPingSyncSynchronizer.pingEnd(mOperation.getAccountId(), mOperation.getAmAccount());
+ }
return null;
}
@@ -84,7 +101,11 @@
// TODO: This is also hacky, should have a separate result code at minimum.
// If the ping is cancelled, make sure it reports something to the sync adapter.
LogUtils.w(TAG, "Ping cancelled for %d", mOperation.getAccountId());
- mSyncHandlerMap.pingComplete(mOperation.getAmAccount(), mOperation.getAccountId(),
- EasOperation.RESULT_REQUEST_FAILURE);
+ if (mSyncHandlerMap != null) {
+ mSyncHandlerMap.pingComplete(mOperation.getAmAccount(), mOperation.getAccountId(),
+ EasOperation.RESULT_REQUEST_FAILURE);
+ } else {
+ mPingSyncSynchronizer.pingEnd(mOperation.getAccountId(), mOperation.getAmAccount());
+ }
}
}
diff --git a/src/com/android/exchange/utility/WbxmlResponseLogger.java b/src/com/android/exchange/utility/WbxmlResponseLogger.java
new file mode 100644
index 0000000..fd9ecbb
--- /dev/null
+++ b/src/com/android/exchange/utility/WbxmlResponseLogger.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2014 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.util.Base64;
+import android.util.Log;
+
+import com.android.exchange.Eas;
+import com.android.mail.utils.LogUtils;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.protocol.HttpContext;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Dumps the wbxml in base64 (much like {@link CurlLogger}) so that the
+ * response from Exchange can be viewed for debugging purposes.
+ */
+public class WbxmlResponseLogger implements HttpResponseInterceptor {
+ private static final String TAG = Eas.LOG_TAG;
+ protected static final int MAX_LENGTH = 1024;
+
+ protected static boolean shouldLogResponse(final long contentLength) {
+ // Not going to bother if there is a lot of content since most of that information
+ // will probably just be message contents anyways.
+ return contentLength < MAX_LENGTH;
+ }
+
+ protected static String processContentEncoding(final Header encodingHeader) {
+ if (encodingHeader != null) {
+ final String encodingValue = encodingHeader.getValue();
+ return (encodingValue == null) ? "UTF-8" : encodingValue;
+ }
+ return "UTF-8";
+ }
+
+ protected static byte[] getContentAsByteArray(InputStream is, int batchSize)
+ throws IOException {
+ // Start building our byte array to encode and dump.
+ int count;
+ final byte[] data = new byte[batchSize];
+ final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ while ((count = is.read(data, 0, data.length)) != -1) {
+ buffer.write(data, 0, count);
+ }
+ buffer.flush();
+ return buffer.toByteArray();
+ }
+
+ @Override
+ public void process(HttpResponse response, HttpContext context) throws IOException {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ // Wrap the HttpEntity so the response InputStream can be requested and processed
+ // numerous times.
+ response.setEntity(new BufferedHttpEntity(response.getEntity()));
+
+ // Now grab the wrapped HttpEntity so that you safely can process the response w/o
+ // affecting the core response processing module.
+ final HttpEntity entity = response.getEntity();
+ if (!shouldLogResponse(entity.getContentLength())) {
+ LogUtils.d(TAG, "wbxml response: [TOO MUCH DATA TO INCLUDE]");
+ return;
+ }
+
+ // We need to figure out the encoding in the case that it is gzip and we need to
+ // inflate it during processing.
+ final Header encodingHeader = entity.getContentEncoding();
+ final String encoding = processContentEncoding(encodingHeader);
+
+ final InputStream is;
+ if (encoding.equals("gzip")) {
+ // We need to inflate this first.
+ final InputStream unwrappedIs = response.getEntity().getContent();
+ is = new GZIPInputStream(unwrappedIs);
+ } else {
+ is = response.getEntity().getContent();
+ }
+
+ final byte currentXMLBytes[] = getContentAsByteArray(is, MAX_LENGTH);
+
+ // Now let's dump out the base 64 encoded bytes and the rest of the command that will
+ // tell us what the response is.
+ final String base64 = Base64.encodeToString(currentXMLBytes, Base64.NO_WRAP);
+ LogUtils.d(TAG, "wbxml response: echo '%s' | base64 -d | wbxml", base64);
+ }
+ }
+
+}
diff --git a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
index b70d308..7c25b56 100644
--- a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
+++ b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
@@ -82,7 +82,7 @@
}
}
- public void testEnableEasCalendarSync() {
+ public void brokentestEnableEasCalendarSync() {
final Account[] baseAccounts = getExchangeAccounts();
String a1 = getTestAccountEmailAddress("1");
diff --git a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
index 18e75bc..4056968 100644
--- a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
+++ b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
@@ -39,7 +39,7 @@
super();
}
- public void testReleaseSyncHolds() {
+ public void brokentestReleaseSyncHolds() {
ExchangeService exchangeService = new ExchangeService();
SyncError securityErrorAccount1 =
exchangeService.new SyncError(AbstractSyncService.EXIT_SECURITY_FAILURE, false);
@@ -102,7 +102,7 @@
assertEquals(0, errorMap.keySet().size());
}
- public void testIsSyncable() {
+ public void brokentestIsSyncable() {
Account acct1 = setupTestAccount("acct1", true);
Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", acct1.mId, true,
mProviderContext, Mailbox.TYPE_DRAFTS);
diff --git a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
index a14167d..8f030cd 100644
--- a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
+++ b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
@@ -37,6 +37,7 @@
import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+
@SmallTest
public class EmailSyncAdapterTests extends SyncAdapterTestCase<EmailSyncAdapter> {
@@ -93,7 +94,7 @@
assertEquals("2012-01-02T23:00:01.000Z", date);
}
- public void testSendDeletedItems() throws IOException {
+ public void brokentestSendDeletedItems() throws IOException {
setupAccountMailboxAndMessages(0);
// Setup our adapter and parser
setupSyncParserAndAdapter(mAccount, mMailbox);
@@ -190,7 +191,7 @@
return ids;
}
- public void testDeleteParser() throws IOException {
+ public void brokentestDeleteParser() throws IOException {
// Setup some messages
ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
ContentValues cv = new ContentValues();
@@ -219,7 +220,7 @@
assertEquals(deleteMessageId, id);
}
- public void testChangeParser() throws IOException {
+ public void brokentestChangeParser() throws IOException {
// Setup some messages
ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
ContentValues cv = new ContentValues();
@@ -260,7 +261,7 @@
assertEquals((Integer)(randomFlags | Message.FLAG_FORWARDED), change.flags);
}
- public void testCleanup() throws IOException {
+ public void brokentestCleanup() throws IOException {
// Setup some messages
ArrayList<Long> messageIds = setupAccountMailboxAndMessages(3);
// Setup our adapter and parser
diff --git a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
index 202b8f8..3afc299 100644
--- a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
+++ b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
@@ -73,7 +73,7 @@
return true;
}
- public void testSaveAndRestoreMailboxSyncOptions() throws IOException {
+ public void brokentestSaveAndRestoreMailboxSyncOptions() throws IOException {
EasSyncService service = getTestService();
EmailSyncAdapter adapter = new EmailSyncAdapter(service);
FolderSyncParser parser = new FolderSyncParser(getTestInputStream(), adapter);
@@ -344,17 +344,17 @@
// FolderSyncParserTest.txt is based on customer data (all names changed) that failed to
// properly create the Mailbox list
- public void testComplexFolderListParse1() throws CommandStatusException, IOException {
+ public void brokentestComplexFolderListParse1() 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 {
+ public void brokentestComplexFolderListParse2() throws CommandStatusException, IOException {
testComplexFolderListParse("FolderSyncParserTest2.txt");
}
// Much larger test (from user with issues related to Type 1 folders)
- public void testComplexFolderListParse3() throws CommandStatusException, IOException {
+ public void brokentestComplexFolderListParse3() throws CommandStatusException, IOException {
EasSyncService service = getTestService();
EmailSyncAdapter adapter = new EmailSyncAdapter(service);
FolderSyncParser parser = new MockFolderSyncParser("FolderSyncParserTest3.txt", adapter);
diff --git a/tests/src/com/android/exchange/eas/EasProvisionTests.java b/tests/src/com/android/exchange/eas/EasProvisionTests.java
new file mode 100644
index 0000000..7d04233
--- /dev/null
+++ b/tests/src/com/android/exchange/eas/EasProvisionTests.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2014 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 android.os.Bundle;
+import android.telephony.TelephonyManager;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.emailcommon.provider.EmailContent;
+import com.android.exchange.adapter.Serializer;
+import com.android.exchange.Eas;
+import com.android.exchange.adapter.Tags;
+import com.android.exchange.utility.ExchangeTestCase;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * You can run this entire test case with:
+ * runtest -c com.android.exchange.eas.EasProvisionTests exchange
+ */
+@SmallTest
+public class EasProvisionTests extends ExchangeTestCase {
+
+ /**
+ * This test case will test PHASE_INITIAL along with a protocol version of Ex2007.
+ */
+ public void testPopulateRequestEntitySerializerPhaseInitialEx2007() throws IOException {
+ // Set up some parameters for the test case
+ final String policyType = "Test_Policy";
+ final String userAgent = "User_Agent";
+ final String status = "Test_Status";
+ final String policyKey = "Test_Policy_Key";
+ final int phase = EasProvision.PHASE_INITIAL;
+ final double protocolVersion = Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE;
+
+ // Build the result that we are expecting
+ final Serializer expectedResult = new Serializer();
+ expectedResult.start(Tags.PROVISION_PROVISION);
+ expectedResult.start(Tags.PROVISION_POLICIES);
+ expectedResult.start(Tags.PROVISION_POLICY);
+ expectedResult.data(Tags.PROVISION_POLICY_TYPE, policyType);
+ // PROVISION_POLICY, PROVISION_POLICIES, PROVISION_PROVISION
+ expectedResult.end().end().end().done();
+ final byte[] expectedBytes = expectedResult.toByteArray();
+
+ // Now run it through the code that we are testing
+ final Serializer generatedResult = EasProvision.generateRequestEntitySerializer(
+ mContext, userAgent, policyKey, policyType, status, phase, protocolVersion);
+
+ // Now let's analyze the results
+ assertTrue(Arrays.equals(generatedResult.toByteArray(), expectedBytes));
+ }
+
+ /**
+ * This test case will test PHASE_INITIAL along with a protocol version of Ex2010.
+ */
+ public void testPopulateRequestEntitySerializerPhaseInitialEx2010() throws IOException {
+ // Set up some parameters for the test case
+ final String policyType = "Test_Policy";
+ final String userAgent = "User_Agent";
+ final String status = "Test_Status";
+ final String policyKey = "Test_Policy_Key";
+ final int phase = EasProvision.PHASE_INITIAL;
+ final double protocolVersion = Eas.SUPPORTED_PROTOCOL_EX2010_SP1_DOUBLE;
+
+ // Build the result that we are expecting
+ final Serializer expectedResult = new Serializer();
+ expectedResult.start(Tags.PROVISION_PROVISION);
+ EasProvision.expandedAddDeviceInformationToSerializer(expectedResult, mContext, userAgent);
+ expectedResult.start(Tags.PROVISION_POLICIES);
+ expectedResult.start(Tags.PROVISION_POLICY);
+ expectedResult.data(Tags.PROVISION_POLICY_TYPE, policyType);
+ // PROVISION_POLICY, PROVISION_POLICIES, PROVISION_PROVISION
+ expectedResult.end().end().end().done();
+ final byte[] expectedBytes = expectedResult.toByteArray();
+
+ // Now run it through the code that we are testing
+ final Serializer generatedResult = EasProvision.generateRequestEntitySerializer(
+ mContext, userAgent, policyKey, policyType, status, phase, protocolVersion);
+
+ // Now let's analyze the results
+ assertTrue(Arrays.equals(generatedResult.toByteArray(), expectedBytes));
+ }
+
+ /**
+ * This test case will test PHASE_WIPE.
+ */
+ public void testPopulateRequestEntitySerializerPhaseWipe() throws IOException {
+ // Set up some parameters for the test case
+ final String policyType = "Test_Policy";
+ final String userAgent = "User_Agent";
+ final String status = "Test_Status";
+ final String policyKey = "Test_Policy_Key";
+ final int phase = EasProvision.PHASE_WIPE;
+ final double protocolVersion = Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE;
+
+ // Build the result that we are expecting
+ final Serializer expectedResult = new Serializer();
+ expectedResult.start(Tags.PROVISION_PROVISION);
+ expectedResult.start(Tags.PROVISION_REMOTE_WIPE);
+ expectedResult.data(Tags.PROVISION_STATUS, EasProvision.PROVISION_STATUS_OK);
+ expectedResult.end().end().done(); // PROVISION_REMOTE_WIPE, PROVISION_PROVISION
+ final byte[] expectedBytes = expectedResult.toByteArray();
+
+ // Now run it through the code that we are testing
+ final Serializer generatedResult = EasProvision.generateRequestEntitySerializer(
+ mContext, userAgent, policyKey, policyType, status, phase, protocolVersion);
+
+ // Now let's analyze the results
+ assertTrue(Arrays.equals(generatedResult.toByteArray(), expectedBytes));
+ }
+
+ /**
+ * This test case will test PHASE_ACKNOWLEDGE.
+ */
+ public void testPopulateRequestEntitySerializerPhaseAcknowledge() throws IOException {
+ // Set up some parameters for the test case
+ final String policyType = "Test_Policy";
+ final String userAgent = "User_Agent";
+ final String status = "Test_Status";
+ final String policyKey = "Test_Policy_Key";
+ final int phase = EasProvision.PHASE_ACKNOWLEDGE;
+ final double protocolVersion = Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE;
+
+ // Build the result that we are expecting
+ final Serializer expectedResult = new Serializer();
+ expectedResult.start(Tags.PROVISION_PROVISION);
+ expectedResult.start(Tags.PROVISION_POLICIES);
+ expectedResult.start(Tags.PROVISION_POLICY);
+ expectedResult.data(Tags.PROVISION_POLICY_TYPE, policyType);
+ expectedResult.data(Tags.PROVISION_POLICY_KEY, policyKey);
+ expectedResult.data(Tags.PROVISION_STATUS, status);
+ // PROVISION_POLICY, PROVISION_POLICIES, PROVISION_PROVISION
+ expectedResult.end().end().end().done();
+ final byte[] expectedBytes = expectedResult.toByteArray();
+
+ // Now run it through the code that we are testing
+ final Serializer generatedResult = EasProvision.generateRequestEntitySerializer(
+ mContext, userAgent, policyKey, policyType, status, phase, protocolVersion);
+
+ // Now let's analyze the results
+ assertTrue(Arrays.equals(generatedResult.toByteArray(), expectedBytes));
+ }
+
+}
diff --git a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
index 1acac51..9535288 100644
--- a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
+++ b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
@@ -95,7 +95,7 @@
return result;
}
- public void testDisplayNameLogic() {
+ public void brokentestDisplayNameLogic() {
GalResult result = getTestDisplayNameResult();
// Make sure our returned cursor has the expected contents
ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
@@ -109,7 +109,7 @@
}
}
- public void testLookupKeyLogic() {
+ public void brokentestLookupKeyLogic() {
GalResult result = getTestDisplayNameResult();
// Make sure our returned cursor has the expected contents
ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
@@ -128,7 +128,7 @@
}
}
- public void testGetAccountIdByName() {
+ public void brokentestGetAccountIdByName() {
Context context = getContext(); //getMockContext();
ExchangeDirectoryProvider provider = new ExchangeDirectoryProvider();
// Nothing up my sleeve
diff --git a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
index 0a7714a..e8f8987 100644
--- a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
+++ b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
@@ -69,7 +69,7 @@
}
}
- public void testSetupParentKeyAndFlag() {
+ public void brokentestSetupParentKeyAndFlag() {
// Set up account and various mailboxes with/without parents
mAccount = setupTestAccount("acct1", true);
Mailbox box1 = EmailContentSetupUtils.setupMailbox("box1", mAccount.mId, true,
@@ -130,7 +130,7 @@
/**
* Test three cases of adding a folder to an existing hierarchy. Case 1: Add to parent.
*/
- public void testParentKeyAddFolder1() {
+ public void brokentestParentKeyAddFolder1() {
// Set up account and various mailboxes with/without parents
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -181,7 +181,7 @@
/**
* Test three cases of adding a folder to an existing hierarchy. Case 2: Add to child.
*/
- public void testParentKeyAddFolder2() {
+ public void brokentestParentKeyAddFolder2() {
// Set up account and various mailboxes with/without parents
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -225,7 +225,7 @@
/**
* Test three cases of adding a folder to an existing hierarchy. Case 3: Add to root.
*/
- public void testParentKeyAddFolder3() {
+ public void brokentestParentKeyAddFolder3() {
// Set up account and various mailboxes with/without parents
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -269,7 +269,7 @@
/**
* Test three cases of removing a folder from the hierarchy. Case 1: Remove from parent.
*/
- public void testParentKeyRemoveFolder1() {
+ public void brokentestParentKeyRemoveFolder1() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -322,7 +322,7 @@
/**
* Test three cases of removing a folder from the hierarchy. Case 2: Remove from child.
*/
- public void testParentKeyRemoveFolder2() {
+ public void brokentestParentKeyRemoveFolder2() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -375,7 +375,7 @@
/**
* Test three cases of removing a folder from the hierarchy. Case 3: Remove from root.
*/
- public void testParentKeyRemoveFolder3() {
+ public void brokentestParentKeyRemoveFolder3() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -428,7 +428,7 @@
/**
* Test changing a parent from none
*/
- public void testChangeFromNoParentToParent() {
+ public void brokentestChangeFromNoParentToParent() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -485,7 +485,7 @@
/**
* Test changing to no parent from a parent
*/
- public void testChangeFromParentToNoParent() {
+ public void brokentestChangeFromParentToNoParent() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -536,7 +536,7 @@
/**
* Test a mailbox that has no server id (Hotmail Outbox is an example of this)
*/
- public void testNoServerId() {
+ public void brokentestNoServerId() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -571,7 +571,7 @@
/**
* Test changing a parent from one mailbox to another
*/
- public void testChangeParent() {
+ public void brokentestChangeParent() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
String accountSelector = MailboxColumns.ACCOUNT_KEY + " IN (" + mAccount.mId + ")";
@@ -632,7 +632,7 @@
* This test will fail if MailboxUtilities fails to distinguish between mailboxes in different
* accounts that happen to have the same serverId
*/
- public void testChangeParentTwoAccounts() {
+ public void brokentestChangeParentTwoAccounts() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
Account acct2 = setupTestAccount("acct2", true);
@@ -768,7 +768,7 @@
* This test will fail if MailboxUtilities fails to distinguish between mailboxes in different
* accounts that happen to have the same serverId
*/
- public void testSetupHierarchicalNames() {
+ public void brokentestSetupHierarchicalNames() {
// Set up account and mailboxes
mAccount = setupTestAccount("acct1", true);
long accountId = mAccount.mId;
diff --git a/tests/src/com/android/exchange/service/PingSyncSynchronizerTest.java b/tests/src/com/android/exchange/service/PingSyncSynchronizerTest.java
new file mode 100644
index 0000000..40235d8
--- /dev/null
+++ b/tests/src/com/android/exchange/service/PingSyncSynchronizerTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 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.Intent;
+import android.os.IBinder;
+import android.test.AndroidTestCase;
+
+import android.test.suitebuilder.annotation.SmallTest;
+
+@SmallTest
+public class PingSyncSynchronizerTest extends AndroidTestCase {
+
+ private static class StubService extends Service {
+ @Override
+ public IBinder onBind(final Intent intent) {
+ return null;
+ }
+ }
+
+}
diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
index 0b841ef..41b23e6 100644
--- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
@@ -882,7 +882,7 @@
CalendarUtilities.BUSY_STATUS_OUT_OF_OFFICE));
}
- public void testBusyStatusFromSelfStatus() {
+ public void brokentestBusyStatusFromSelfStatus() {
assertEquals(CalendarUtilities.BUSY_STATUS_FREE,
CalendarUtilities.busyStatusFromAttendeeStatus(
Attendees.ATTENDEE_STATUS_DECLINED));
diff --git a/tests/src/com/android/exchange/utility/WbxmlResponseLoggerTests.java b/tests/src/com/android/exchange/utility/WbxmlResponseLoggerTests.java
new file mode 100644
index 0000000..29d493b
--- /dev/null
+++ b/tests/src/com/android/exchange/utility/WbxmlResponseLoggerTests.java
@@ -0,0 +1,83 @@
+/* Copyright (C) 2014 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.test.suitebuilder.annotation.SmallTest;
+
+import org.apache.http.message.BasicHeader;
+
+import junit.framework.TestCase;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * Test for {@link WbxmlResponseLogger}.
+ * You can run this entire test case with:
+ * runtest -c com.android.exchange.utility.WbxmlResponseLoggerTests exchange
+ */
+@SmallTest
+public class WbxmlResponseLoggerTests extends TestCase {
+ private static final byte testArray[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x11,};
+
+ public void testShouldLogResponseTooBig() {
+ final long contentSize = WbxmlResponseLogger.MAX_LENGTH + 1;
+ assertEquals(false, WbxmlResponseLogger.shouldLogResponse(contentSize));
+ }
+
+ public void testShouldLogResponseSmallEnough() {
+ final long contentSize = WbxmlResponseLogger.MAX_LENGTH - 1;
+ assertEquals(true, WbxmlResponseLogger.shouldLogResponse(contentSize));
+ }
+
+ public void testProcessContentEncoding() {
+ final String encoding = "US-ASCII";
+ final BasicHeader header = new BasicHeader("content-encoding", encoding);
+ final String outputEncoding = WbxmlResponseLogger.processContentEncoding(header);
+ assertEquals(true, encoding.equals(outputEncoding));
+ }
+
+ public void testProcessContentEncodingNullHeader() {
+ final String encoding = "UTF-8";
+ final String outputEncoding = WbxmlResponseLogger.processContentEncoding(null);
+ assertEquals(true, encoding.equals(outputEncoding));
+ }
+
+ public void testProcessContentEncodingNullValue() {
+ final String encoding = "UTF-8";
+ final BasicHeader header = new BasicHeader("content-encoding", null);
+ final String outputEncoding = WbxmlResponseLogger.processContentEncoding(header);
+ assertEquals(true, encoding.equals(outputEncoding));
+ }
+
+ public void testGetContentAsByteArraySingleBatch() throws IOException {
+ final ByteArrayInputStream bis = new ByteArrayInputStream(testArray);
+ final byte outputBytes[] = WbxmlResponseLogger.getContentAsByteArray(bis,
+ testArray.length);
+ assertEquals(true, Arrays.equals(testArray, outputBytes));
+ }
+
+ public void testGetContentAsByteArrayMultipleBatches() throws IOException {
+ final ByteArrayInputStream bis = new ByteArrayInputStream(testArray);
+ // If we cut the batch size to be half the length of testArray, we force
+ // 2 batches of processing.
+ final byte outputBytes[] = WbxmlResponseLogger.getContentAsByteArray(bis,
+ testArray.length / 2);
+ assertEquals(true, Arrays.equals(testArray, outputBytes));
+ }
+}
