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.
Merge commit 'd4ecce95f513e3567f5c1be550d86d6a90e7ca63'
* commit 'd4ecce95f513e3567f5c1be550d86d6a90e7ca63':
Run MailboxAlarmReceiver's code in a background thread
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 'c6a0605f611670bcf44463be5fcb3d35a68165cf'
* commit 'c6a0605f611670bcf44463be5fcb3d35a68165cf':
Use correct EAS protocol version in Outbox (fixes#2319892)
Merge commit '9b83870a091084a3575a354539eaf98c516ccf2c' into eclair-mr2-plus-aosp
* commit '9b83870a091084a3575a354539eaf98c516ccf2c':
Use correct EAS protocol version in Outbox (fixes#2319892)
Merge commit '89ecbbaed6858896c76029803244a7f6c1f13b97'
* commit '89ecbbaed6858896c76029803244a7f6c1f13b97':
Deal with mismatch between our accounts and AccountManager accounts
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 'e3362a3163ccc2ce5d93dfaebe35645f368c1863'
* commit 'e3362a3163ccc2ce5d93dfaebe35645f368c1863':
changed to use the new EntityIterator interface
Merge commit 'ff636171da3423ffd66512304f186445abc73398'
* commit 'ff636171da3423ffd66512304f186445abc73398':
Don't delete referenced messages from the Exchange server
Merge commit '936886206bc2566826dc080371b9b86c3ba15ce2'
* commit '936886206bc2566826dc080371b9b86c3ba15ce2':
Ensure that service calls run outside the UI thread (#2235734)
Merge commit 'f22c389792b9e6674cce3b16418b0d235340ffc3'
* commit 'f22c389792b9e6674cce3b16418b0d235340ffc3':
DO NOT MERGE. Improve colors of read/unread messages.
Merge commit '14d3745f9556232da05c9cd319c097a3e6f791b5' into eclair-plus-aosp
* commit '14d3745f9556232da05c9cd319c097a3e6f791b5':
Import revised translations. DO NOT MERGE
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.
