Merge commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1' into eclair-mr2-plus-aosp
* commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1':
Add sanity checks in SyncManager and EasSyncService
Merge commit '4848aa2a1fda59f20e7acb9259dd355a047f3b93' into eclair-mr2-plus-aosp
* commit '4848aa2a1fda59f20e7acb9259dd355a047f3b93':
Run MailboxAlarmReceiver's code in a background thread
* Fixes 2313077
* Broadcast receivers are run in the UI thread, so we must ensure that
any long-running code is executed in a background thread
Change-Id: I9a3d501a308445a84a1baa99fc6abb9feb56ff2d
* Fixes#2317429
* When "Send outgoing messages" is tapped in Outbox MessageList view,
we clear the error state for all "stuck" messages
* We didn't, however, clear the error state of the Mailbox, which doesn't
clear itself until the end of a pingLoop, which can be up to 30 minutes
* The fix is in two parts:
* We clear the error state of the Outbox when a sync is requested by
the UI
* We don't set the error state of the mailbox for non-auth errors when
sending, because we don't want to block OTHER messages from getting sent.
Change-Id: I768138b6f31eb696811aa94f621b6fa758ec1a5e
Merge commit '9b83870a091084a3575a354539eaf98c516ccf2c' into eclair-mr2-plus-aosp
* commit '9b83870a091084a3575a354539eaf98c516ccf2c':
Use correct EAS protocol version in Outbox (fixes#2319892)
Merge commit 'e312c12b748e9984715295b71e95c90ee8d3d3bd' into eclair-mr2-plus-aosp
* commit 'e312c12b748e9984715295b71e95c90ee8d3d3bd':
Deal with mismatch between our accounts and AccountManager accounts
* Addresses #2226426
* Recognize the case in which there is no EmailProvider Account corresponding
to an AccountManager account (the case being addressed is that of the
EmailProvider database being deleted due to corruption
* In this case, delete the AccountManager account so that the two are in
sync
* Refactor and add unit test for account reconciliation
Change-Id: I356b8bfaa0846f85223cc15994b750df207a63ea
Merge commit 'aec13abacebf0701138b34adce9b21459ede6de5' into eclair-mr2-plus-aosp
* commit 'aec13abacebf0701138b34adce9b21459ede6de5':
Import revised translations. DO NOT MERGE
Merge commit '14d3745f9556232da05c9cd319c097a3e6f791b5' into eclair-mr2
* commit '14d3745f9556232da05c9cd319c097a3e6f791b5':
Import revised translations. DO NOT MERGE
* We inadvertently failed to set the EAS version in EasOutboxService,
so the default of 2.5 is used
* This works, but SmartReply/SmartForward were enhanced in 12.0 and we
aren't taking advantage of those changes
* The fix is to set the version using common code
Change-Id: I3b505448003f340681deeb8fb22e61e9dd8d10a0
Merge commit '052eefe406c7cedad65ed497f2f1137a1a210a42' into eclair-mr2-plus-aosp
* commit '052eefe406c7cedad65ed497f2f1137a1a210a42':
changed to use the new EntityIterator interface
Merge commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b' into eclair-mr2-plus-aosp
* commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b':
Don't delete referenced messages from the Exchange server
Merge commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e' into eclair-mr2-plus-aosp
* commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e':
Ensure that service calls run outside the UI thread (#2235734)
Merge commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f' into eclair-mr2-plus-aosp
* commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f':
DO NOT MERGE. Improve colors of read/unread messages.
* Addresses #2287439 incompletely
* The most likely reason for a reply/forward to get stuck in the Outbox
is that the referenced message has been deleted from the client, with
the deletion occuring BEFORE the message gets sent (currently, the two
are completely independent)
* This change causes deletes NOT to be sent to the server if the message
to be deleted is referenced by an outgoing message
Change-Id: I146f63ab345c07e684790e1d7d1fc08870468bbf
* Addresses #2226426
* If the user deletes Email data, or if data corruption causes
EmailProvider.db to be deleted, we will be in an inconsistent
state with any existing Exchange accounts, since the AccountManager
will still know about them, contacts (and eventually calendar) items will
continue to exist, etc.
* Run an integrity check when the provider is created, deleting any
orphaned EmailProvider.db or EmailProviderBody.db
* Catch SQLiteException's in the Provider and do an integrity check
if any is caught
Change-Id: I47d523b90a6b8f71ba8e13fba4b04846b3da1b1d
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-mr2
* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
DO NOT MERGE. Improve colors of read/unread messages.
Backport of 47da97527b547da97527b5bbecba972e0c6a5d382cd7b0768e9.
Original comment:
Improve visible difference between read and unread messages
BUG: 2168155
turns out the change I submitted before is not required at all. I mistakenly
assumed sqlite wouldn't be able to handle it. but tested it with the latest
version of sqlite 3.6.20. the old style triggers work fine.
* When a mailbox sync is stopped intentionally (for example, if account
settings change), we report a connection error by mistake
* Handle this case properly, reporting "success" (i.e. no error state)
* Remove obsolete comment
Change-Id: I9bec1244267cd2240c369b9b7f905948381a0f91
Merge commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34' into eclair-mr2-plus-aosp
* commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34':
Import revised translations. DO NOT MERGE
This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-mr2
* commit '5905791775e7e431135bda21969b9e5efd24de62':
Import revised translations. DO NOT MERGE
Merge commit '98796942eab3215eb1c3c8486a65a152e8cee516' into eclair-mr2-plus-aosp
* commit '98796942eab3215eb1c3c8486a65a152e8cee516':
change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
