Merge commit '21563fad0908f257d984677dcfa41145582a0d4e' into eclair-plus-aosp
* commit '21563fad0908f257d984677dcfa41145582a0d4e':
Fix an issue related to ping loop errors and ping state; add logging
Merge commit '54e0a5f65c777147a1d90cd73d2ebeab2a67e417' into eclair-plus-aosp
* commit '54e0a5f65c777147a1d90cd73d2ebeab2a67e417':
Only auto-refresh when user opens mailbox
Merge commit '059b3e5ed55b025affab63e5bcfc23cf418fbbd6' into eclair-plus-aosp
* commit '059b3e5ed55b025affab63e5bcfc23cf418fbbd6':
Make sure intro text is saved/restored properly (fix#2155286)
* New menu items in MessageList
* Show/hide menu item if anything is checked
* Clear the selected items map, redraw listview, hide button panel
Bug # 2116257
Merge commit 'ba6cf35b4f43cd59fe98c4c32e1e83af6efa5107' into eclair-plus-aosp
* commit 'ba6cf35b4f43cd59fe98c4c32e1e83af6efa5107':
MessageCompose: avoid saving Draft early, before the message was loaded.
Merge commit '62b5a51b8fc7d85f8b71d5d6db04986a6080eff7' into eclair-plus-aosp
* commit '62b5a51b8fc7d85f8b71d5d6db04986a6080eff7':
Use FLAG_ACTIVITY_CLEAR_TOP for list activities
This prevents these activities from ever repeating on the task stack.
Helps http://b/issue?id=2149204 (and may even fix it)
Change-Id: Idf8255b703094a78a2df3e9f535b67fd65faef32
Merge commit 'bedd617c89a9a63e7808af77f35b2c2101a1548c' into eclair-plus-aosp
* commit 'bedd617c89a9a63e7808af77f35b2c2101a1548c':
Fix the bug that combined Drafts folder is hidden when there are only read messages.
Merge commit 'ed94cfd1202dea018b21a57d38e403b24c976e06' into eclair-plus-aosp
* commit 'ed94cfd1202dea018b21a57d38e403b24c976e06':
Change the color of READ/UNREAD messages
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
