1. Replaced SSLContextImpl with SSLContext with TLS. (They're the same, according to crazybob)
2. Copied SSLSocketFactory from org.apache.http.conn.ssl, so that we can use the hidden costructor. (Which wasn't in the original code -- it was added by the android team, which is why it's hidden.)
Merge commit '78f609db56500c01f75ea2d8742468907255f7ba'
* commit '78f609db56500c01f75ea2d8742468907255f7ba':
MessageView: upon delete move to older instead of newer.
Merge commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8'
* commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8':
MessageCompose: fix NPE cased by WebView set to null in onDestroy().
Merge commit 'af1bf48773154226fd88ab823a250fafa2814241' into eclair-mr2-plus-aosp
* commit 'af1bf48773154226fd88ab823a250fafa2814241':
MessageView: upon delete move to older instead of newer.
Merge commit '2b6dfc9796b6c54b329e234244e076a8dc6d3a07' into eclair-mr2-plus-aosp
* commit '2b6dfc9796b6c54b329e234244e076a8dc6d3a07':
MessageCompose: fix NPE cased by WebView set to null in onDestroy().
MessageListAdapter.doRequery() is supporsed to do the same thing as CursorAdapter.onContentChanged() does. So the entire method body can be replaced with super.onContentChanged().
Merge commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1'
* commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1':
Use correct EAS version in Outbox (fixes#2319892) DO NOT MERGE
Merge commit '420f664891b2f46356bfc5cdd645aae727ecc71f'
* commit '420f664891b2f46356bfc5cdd645aae727ecc71f':
Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
Merge commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac'
* commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac':
Don't delete referenced messages from the Exchange server DO NOT MERGE
Merge commit '27051e480f9cc5396aacc3cc5e520d5875390548' into eclair-plus-aosp
* commit '27051e480f9cc5396aacc3cc5e520d5875390548':
Use correct EAS version in Outbox (fixes#2319892) DO NOT MERGE
Merge commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a' into eclair-plus-aosp
* commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a':
Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
Merge commit 'c874824ca8b76f795575538ffa34138e2de47cad' into eclair-plus-aosp
* commit 'c874824ca8b76f795575538ffa34138e2de47cad':
Don't delete referenced messages from the Exchange server DO NOT MERGE
* The existing flow is badly broken; every "back" causes the user
to leave the setup flow and therefore have to start from scratch.
This is a very bad user experience, as previously entered data is
lost and must be re-entered.
* The fix corrects these problems, allowing the user to back up
through screens UNTIL the account is successfully created.
* After account creation, the user is returned to the proper screen,
depending on whether we're in "eas flow mode" or not
Bug: 2337511
Change-Id: Ie25ac73dfcd8a1dca36e1b31c75ffb22359840d1
Merge commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1' into eclair-mr2-plus-aosp
* commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1':
Add sanity checks in SyncManager and EasSyncService
Seems like it's the simplest way to make it.
- Base64 no longer implements BinaryEncoder/Decoder. Email app doesn't use them.
- Copied Decoder/EncoderException. Email app doesn't catch them either.
Merge commit '68011bddf01d6b62d621784fad9a43884ec434fd' into eclair-plus-aosp
* commit '68011bddf01d6b62d621784fad9a43884ec434fd':
Revised strings in corporate mail settings screen.
* 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: Iad3777282385bea82276f363d6f95ba8b07cc01c
* 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: I06d98e54049b01c2156b1bc3ebbccf043e7b93f5
* 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: Ife6689fa9934da42d98a48df74fca90ba6d1718c
