Merge commit '3786cab2aa1776e92fc67af3931a76cd8b848b48' into eclair-plus-aosp
* commit '3786cab2aa1776e92fc67af3931a76cd8b848b48':
More refresh account and folder list
BUG: 2149171
* Change the string of combined inbox
* Change the string of combined starred folder
* Change the icon for combined inbox
* Change the icon for combined starred folder
Merge commit 'e4a7cc440f081ef9c4375a2bd2f82680cc11b152' into eclair-plus-aosp
* commit 'e4a7cc440f081ef9c4375a2bd2f82680cc11b152':
Re-enable modernized version of "optional" SSL/TLS
* Add "Accept all certificates" modes to incoming/outgoing secure choices
* Change URI scheme slightly to make "trust" a flag, not part of the
protocol.
* Change Stores to know about new URI scheme
* Slightly rework Transport API to make "trust" an independent flag
* Adapt HostAuth to handle new Uri scheme
* Remove the old ambiguous "optional" code, which was allowing
some unsigned certificates, but was *also* allowing TLS to
optionally start (though not SSL, despite the UI strings.)
* Add a few unit tests to EmailContent
* Add logging and a bunch of comments to TrustManagerFactory, and a bit
of simple cleanup to make it more readable.
* Add missing conversion of SSLException->CertificateValidationException
in TLS so we get the correct certificate errors from TLS too.
* Re-enable TLS for mac.com accounts (which had a certificate problem)
Fixes bug http://b/2119755, http://b/1374780, and probably a raft of
earlier and/or external bugs about certificate problems.
Change-Id: Iaf99a8da3eaadaa4cdeec224737838b5d6813e55
Merge commit '0797b4e35189c47574476773c126178a493bfada' into eclair-plus-aosp
* commit '0797b4e35189c47574476773c126178a493bfada':
Near-final tweaks to sync timeouts and logging
* Tighten up user logging
* Send all HttpClient commands w/ watchdog to prevent
holding wakelocks too long
* Fix case in which no ping boxes are ready in which
ping loop would hang on to WakeLock indefinitely
* Release WakeLock for waits < 10 seconds, rather than
30s in SyncManager
* Improve logging of IOExceptions
* Log network status (at least until #2150976 is fixed)
Change-Id: I020b8a21c2c4f536d5b6df871f6b5c03fdc66ab8
Merge commit '2dd894df2fee388addcf23ea4c63c2a95b984890' into eclair-plus-aosp
* commit '2dd894df2fee388addcf23ea4c63c2a95b984890':
MessageCompose: fix unit tests that were broken by CL 27435.
Merge commit 'b0b61fa2e4b9e884e745115697f7f4f081272f08' into eclair-plus-aosp
* commit 'b0b61fa2e4b9e884e745115697f7f4f081272f08':
Update unread counts and default sender Id in AccountFolderList after folder loding messages
Merge commit 'a4258ed4877a0d559c7f600be9a326135aed4440' into eclair-plus-aosp
* commit 'a4258ed4877a0d559c7f600be9a326135aed4440':
Fix sendPing to set proper ping timeouts
* We were setting the timeout and heartbeat to the same time,
which could cause mistaken timeouts
* Set timeout ten seconds after the heartbeat for now, and set
an alarm a few seconds after that
Change-Id: Ic2f7b44c9626ebbdd7a8821f53f7aaf6169f62c3
Merge commit '62cf0a3336875752b1a180f55ed19f1f6fb3ee68' into eclair-plus-aosp
* commit '62cf0a3336875752b1a180f55ed19f1f6fb3ee68':
Remove a bit of logging in ContactsSyncAdapter
Merge commit '0d4681cd6606015fd242f148ec213a3256a81ec7' into eclair-plus-aosp
* commit '0d4681cd6606015fd242f148ec213a3256a81ec7':
Catch possible NPE in IMAP sync.
I don't know the root cause of the null pointer (possibly a broken
connection earlier in the sync) but we shouldn't be crashing here.
Fixes http://b/2135743
Merge commit 'aff9926d84a2ae3b669d8acb1cb2f80e3b37b33f' into eclair-plus-aosp
* commit 'aff9926d84a2ae3b669d8acb1cb2f80e3b37b33f':
Reduce the sync window from 20 items to 5 (partial fix#2149029)
* This change trades off network time / overhead with time keeping
ContactsProvider2 busy
* The net effect will probably be to reduce some UI slowdowns while
syncing Exchange contacts, while increasing the time it takes to
sync those contacts
Change-Id: I56e2358698aa4c901cda4559f7a8f9117681f627
Merge commit 'deffba584e9a66ca3dca3c897728fd1b8c66b368' into eclair-plus-aosp
* commit 'deffba584e9a66ca3dca3c897728fd1b8c66b368':
Stop forcing email logging for all users
Merge commit '832e4a02a670b565a377938b3138e73421d59388' into eclair-plus-aosp
* commit '832e4a02a670b565a377938b3138e73421d59388':
Add hostChanged service call; use it from UI (fixes#2148572)
* After a HostAuth has been changed for an EAS account, the SyncManager needs
to be alerted so that it can take appropriate action
* Added hostChanged service call
* Send service call from AccountSetupExchange after a HostAuth is edited
* Stop running syncs and clear error states in hostChanged
Change-Id: I2311e2d00be81ea7829f5f4e38b2377f18c63f30
Merge commit '695fdb1cbbe2da817b5b70a00568a0a905e139f0' into eclair-plus-aosp
* commit '695fdb1cbbe2da817b5b70a00568a0a905e139f0':
MessageView: check for null mMessageContentView on access.
Merge commit '02fcd3b4e7ad526d1be1f7a62d7dfbefc50727ba' into eclair-plus-aosp
* commit '02fcd3b4e7ad526d1be1f7a62d7dfbefc50727ba':
MessageCompose: fix loading the quoted text after a configuration change.
Merge commit '7768ce276ede4ee979df28ee514ddca79bdb90ab' into eclair-plus-aosp
* commit '7768ce276ede4ee979df28ee514ddca79bdb90ab':
MessageCompose: delete the attachments that are removed in the UI.
Bug 2136283.
Because of the mSourceMessageProcessed guard, the loading after a config change
was done exclusively by the default view hierarchy save/restore.
But this default view restore does not handle WebView content,
thus affecting the quoted text.
Merge commit 'ce3bb9abccf02f047b1d11083584d5ab04ad6341' into eclair-plus-aosp
* commit 'ce3bb9abccf02f047b1d11083584d5ab04ad6341':
Per spec, allow all attachments to be added via INTENT.
Merge commit '4c8f06283ff1ecdb197d4e446588928333e77a81' into eclair-plus-aosp
* commit '4c8f06283ff1ecdb197d4e446588928333e77a81':
Don't send local changes of Drafts/Outbox to server (fixes#2149122)
