Merge commit 'c30c333d006683fde126cc59c90d8da6ece34628'
* commit 'c30c333d006683fde126cc59c90d8da6ece34628':
Clean up transport encryption & port options
Merge commit 'a96c941d9ffa69897ff68a6298b69a2805b81d64' into eclair-plus-aosp
* commit 'a96c941d9ffa69897ff68a6298b69a2805b81d64':
Clean up transport encryption & port options
Merge commit '68b620cca0097e2fbde9498bd76129d081c5c9b2' into eclair-plus-aosp
* commit '68b620cca0097e2fbde9498bd76129d081c5c9b2':
Switch Email to new FastTrack API.
Merge commit '666dd867625d52c26d42e68e837f2e5234efb1bd' into eclair-plus-aosp
* commit '666dd867625d52c26d42e68e837f2e5234efb1bd':
Move chip in mailbox to the left
As part of http://b/2087222 we have a new API specifically
for launching FastTrack. This allows SHOW_OR_CREATE to be
returned to its original behavior.
I've tested this change and confirmed that it's WAI, and
may have also fixed up some deprecated references.
* Remove SSL-Optional and TLS-Optional choices from UI
* Remove SSL-Optional and TLS-Optional choices from providers.xml
* Switch over most SMTP connections from 25 to 587
* Clean up the providers list which has a lot of "optional" cases
that were probably falling back to unencrypted.
Fixes bugs:
2110243 Settings UI shouldn't offer SSL/TLS (if available) options
2089070 Update list of providers
Change-Id: I57be57b349eed33a5284121d904528279a36a91c
Merge commit 'db601c4776d7baed4fd66b4aad2188e50c1d4007'
* commit 'db601c4776d7baed4fd66b4aad2188e50c1d4007':
Turn off debugging code that was accidentally left on.
Merge commit '9e7a9801c7e08557c1b57433f58c519caf504ccb' into eclair-plus-aosp
* commit '9e7a9801c7e08557c1b57433f58c519caf504ccb':
Rename name of color
Merge commit '27bc39399e47e8f14cbb42834990546eb93851de' into eclair-plus-aosp
* commit '27bc39399e47e8f14cbb42834990546eb93851de':
Turn off debugging code that was accidentally left on.
Merge commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae' into eclair-plus-aosp
* commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae':
Fix sort order of MailboxList
Merge commit '8b240ed9dc57425804ed816265be7a032be21717' into eclair-plus-aosp
* commit '8b240ed9dc57425804ed816265be7a032be21717':
UI Refulesh of account folder list
Merge commit '925be3bf76a943375947be8565800c24e4d27a6c' into eclair-plus-aosp
* commit '925be3bf76a943375947be8565800c24e4d27a6c':
UI Refuresh of account folder list
Merge commit 'fcdebb69a5f7790c377e11e913536977cff19471' into eclair-plus-aosp
* commit 'fcdebb69a5f7790c377e11e913536977cff19471':
Revert very bad commit (strange merge problem)?
* This reverts commit 3f224e7efe.
* Use StructuredName.DISPLAY_NAME for Email display name on upload
Change-Id: Ic11713773d0e5b0db452dce3c9c31680ca45dbf5
This cleans up a number of bugs that could be generically described as
"MailService and Notifications not being updated when accounts or account
settings are changed."
This also fixes a number of race conditions, one of which was causing
accounts to be refreshed in a nearly-endless loop, and another which
could cause an endless loop of alarms to be posted & fired..
Specific changes:
* Update/reschedule any time an account is edited (this was accidentally
broken and being handled on EAS only.)
* Make sure we reschedule if an account becomes unavailable
* Clear notifications whenever refreshing accounts
* Reload local copy of account settings whenever refreshing accounts
* When restoring prev sync times (this happens when process is killed),
be sure to also recalculate next sync times.
* Set flags on the pending intents to make sure old pending intents are
not being reused.
* Set a watchdog each time we check the mail, so if we are killed during
the mail check, we will be woken up again to retry.
* Fix a 2nd race condition in which a just-created account fails to sync,
due to not (yet) having an inbox.
* Clean up handling of Controller callback:
* Fix a minor bug in which refresh of non-inbox mailboxes would delay
the next timed sync of the inbox for that account.
* If the checkmail ended in an error (result != null) the service was
never rescheduled.
Bugs Fixed:
bug 2078149 - Update service and notifications when account settings
change or accounts are added/deleted.
bug 2084412 - Fix race condition caused by first intent being refired
bug 2071484 - Make sure we wake up later if killed during mail check
Change-Id: I3ee0d1b389c652351de5eb798c32a2daea244067
Merge commit '77c7e549d5b972de182b619b79d2fe6d13567731'
* commit '77c7e549d5b972de182b619b79d2fe6d13567731':
Add logging to EasOutboxService to help find sending issues
Merge commit 'f671401a3abb852862d6f49a279974a78bc0d1b4' into eclair-plus-aosp
* commit 'f671401a3abb852862d6f49a279974a78bc0d1b4':
Add logging to EasOutboxService to help find sending issues
Merge commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15' into eclair-plus-aosp
* commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15':
Import revised translations. DO NOT MERGE
Merge commit 'b9213876f6a233baca501d3502c3ed868c32a2e6' into eclair-plus-aosp
* commit 'b9213876f6a233baca501d3502c3ed868c32a2e6':
Fix issue with older messages not getting deleted properly from device
