Merge commit 'de3022268982d1ef7e81ef563c6b3a87faa9b002' into froyo-plus-aosp
* commit 'de3022268982d1ef7e81ef563c6b3a87faa9b002':
Always check serverId AND calendarId in queries
* With multiple accounts, serverId's are not guaranteed to be unique
(indeed, they rarely are)
* There were two queries in CalendarSyncAdapter that checked only
serverId and this has caused the referenced bug PLUS others that
would have turned up later on
* This is a critical fix
Bug: 2589815
Change-Id: I49bc6cb5bb4708f4bf4ca60a891ff78f0b25e989
* We weren't sending up the event description with exceptions, so
changes to description were being lost on upload
* Move the code uploading description so that it happens with
exceptions as well as top-level events
Bug: 2590020
Change-Id: Ifab556bed68671f3ee8cab02b657adbd8ba9c50c
* It's reported that 50% of third party users have issues syncing
Calendar in Exchange
* In testing, it was determined that the server takes > 30 seconds
to respond to a sync request initially, which is beyond our timeout
limit
* Also, I found that the system SyncManager was trying to trigger an
upload sync at the same time (i.e. before the sync session was
established with the server)
* There are four changes here:
1) Prevent upload syncs while the sync key is null or "0" ("0"
is the initial state)
2) Increase timeout for connection; at worst, this will
cause a short extra delay in syncs with a bad connection, but this
will be unnoticable to users
3) Increase the read timeout for initial sync to twice that of
regular syncs (the initial sync always seems to take longer)
3) Reduce the lookback for calendar to two weeks (from one month);
this is a better default anyway, and it probably reduces the server
and client load a great deal
* Empirically, this solves the bug for a known completely repeatable
case.
Bug: 2569162
Change-Id: I36b1c3e1e0b65f50d42e05f1830fed912191651f
Merge commit 'b0690302bfc486ae76002179de11df0537090c30' into kraken
* commit 'b0690302bfc486ae76002179de11df0537090c30':
Set CLEAR_WHEN_TASK_RESET flag when launching Calendar
Merge commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73' into froyo-plus-aosp
* commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73':
Set CLEAR_WHEN_TASK_RESET flag when launching Calendar
and Contacts, so that when you relaunch Email from Home, you always see
the Email app, not Calendar/Contacts.
Note as stated in the corresponding bug, this CL itself won't fix the issue,
because CLEAR_WHEN_TASK_RESET will be lost when Contacts/Calendar apps handle
the intent.
There's a feature request against the framework (bug 2586404) which should fix
this losing flag problem.
Bug 2584792
Change-Id: I34ac3707b99926fc07529ea2229f2a6b3c4f93e4
Merge commit 'ef01261a8909ea3fe3e40b06cc537e0032d47898' into kraken
* commit 'ef01261a8909ea3fe3e40b06cc537e0032d47898':
Try TOP even on POP servers that fail to report CAPA
Merge commit '9cc6f46b05cdb1678b0ef73daf268c5728e96208' into froyo-plus-aosp
* commit '9cc6f46b05cdb1678b0ef73daf268c5728e96208':
Try TOP even on POP servers that fail to report CAPA
* Ignore the results of CAPA and always try TOP
* If TOP returns -ERR simply fall back to (bad old slow) RETR
* Unit tests for positive & failure cases
Bug: 2588432
Change-Id: Ife4b551217de1025e14efc46074f16ef4ae99c6f
Merge commit 'dc0f9ee7ed36947414b37bb8d303f6ca0b768a8a' into kraken
* commit 'dc0f9ee7ed36947414b37bb8d303f6ca0b768a8a':
Always add changed exceptions to the upload list
Merge commit '536a36555b2a03eb852e2e54afedca7281f67f91' into froyo-plus-aosp
* commit '536a36555b2a03eb852e2e54afedca7281f67f91':
Always add changed exceptions to the upload list
* We were adding deleted exceptions to the "deleted" list; this is bad,
because the exception then gets deleted from the database after the
sync. The symptom is that the deleted exception reappears on the
calendar.
Bug: 2587837
Change-Id: If497f82ba0b2b817d1cef6165ded23d19876528f
Merge commit '605433f78dfacc6c634c6313832c9e1f475bcd99' into kraken
* commit '605433f78dfacc6c634c6313832c9e1f475bcd99':
Only allow the account mailbox to attempt provisioning
Merge commit '3b19278a24ec6f1062d3c5e38580fe9fb20326cf' into froyo-plus-aosp
* commit '3b19278a24ec6f1062d3c5e38580fe9fb20326cf':
Only allow the account mailbox to attempt provisioning
Merge commit '6155bc2b10316b5257692b2e4c540c24f5f49836' into kraken
* commit '6155bc2b10316b5257692b2e4c540c24f5f49836':
Fix upload of multi-day all day events
* We were allowing all sync services to attempt provisioning, but this
could potentially lead to a race condition in which two different
policy keys are created on the server (this is speculative)
* Change to allow only the account mailbox to attempt provisioning
* Log policy keys when verbose exchange logging is enabled
* We'll see if this solves the referenced bug
Bug: 2569162
Change-Id: I36c60098a4866882a8f9f4c288da54ea378d9aee
Merge commit '6a4eae5f4104599cddfea67705cc4d594ee7d47f' into froyo-plus-aosp
* commit '6a4eae5f4104599cddfea67705cc4d594ee7d47f':
Fix upload of multi-day all day events
* We were assuming a single day for all-day events
* Use the actual end date
* Make sure we send date/time back to server in local TZ
* Also fixes#2500863
Bug: 2578776
Change-Id: I58767a574248935b9840ce93e634a24e54abe62f
* We need to send name & email for Exchange 2007
* For Exchange 2003, only name & email if the event is new
Bug: 2586661
Change-Id: Ia35c2c7a645a3d20b7031e9a43b8b5044a40f005
Merge commit '13cc00239e958647312b26deae7e62e3c4b27fdf' into kraken
* commit '13cc00239e958647312b26deae7e62e3c4b27fdf':
Send meeting status with all upsynced changes
Merge commit '06699c0d911ad71d5964c68e182745f5c4144569' into froyo-plus-aosp
* commit '06699c0d911ad71d5964c68e182745f5c4144569':
Send meeting status with all upsynced changes
Merge commit '6445efb6497348f4fc0b2c7ca5c78634626dfa3f' into kraken
* commit '6445efb6497348f4fc0b2c7ca5c78634626dfa3f':
Check for active device admin before each ping loop
Merge commit '7ac1a975c470f1a41e589e2a223467bf564fafc9' into kraken
* commit '7ac1a975c470f1a41e589e2a223467bf564fafc9':
Add organizer to Attendees before handling exceptions
* Meeting status differentiates between appointments and meetings,
which is important in Outlook and OWA
* Fix older, completely incorrect code for upsyncing categories
Bug: 2586071
Change-Id: I277252ef2c31e5b8ec7ceda69c229f5fd100ecdb
Merge commit '7d32ec27ec7f17238d0f5c373acc502053e59647' into froyo-plus-aosp
* commit '7d32ec27ec7f17238d0f5c373acc502053e59647':
Check for active device admin before each ping loop
Merge commit '0cd9cbf08817b18b4221efa15388f5a144ebfab4' into froyo-plus-aosp
* commit '0cd9cbf08817b18b4221efa15388f5a144ebfab4':
Add organizer to Attendees before handling exceptions
* Accounts that require security need to check that the Email app
is still an active device admin from time to time
* Add a check for this before each run of the ping loop
Bug: 2583282
Change-Id: I1491821b7d0c1a341b1fe7ef1002c8b21aed12c2
