Merge commit '3e1c871f049f13e433e8e5c4dd8ad789dd93c6c8' into eclair-plus-aosp
* commit '3e1c871f049f13e433e8e5c4dd8ad789dd93c6c8':
Fix EAS sending, which was inadvertently broken by a change in EmailProvider
* syncServerId in the Message table can now be NULL; this broke a test
used by EasOutboxService and SyncManager to determine whether there
were sendable messages in the Outbox
* Changed test to allow for NULL in syncServerId
Change-Id: Id76c7a45bc306abe7a927ab2395700f54a01a298
Merge commit '8cb81390ce808eb71ca6e1e26f8ea6eccba05e78' into eclair-plus-aosp
* commit '8cb81390ce808eb71ca6e1e26f8ea6eccba05e78':
Add a backgroud drawabled for fasttrack presence.
Merge commit '5fc57eccefeba517fe5e6f093786f37c6c4d50e6' into eclair-plus-aosp
* commit '5fc57eccefeba517fe5e6f093786f37c6c4d50e6':
Fix reply/forward for both SMTP and EAS; fixes#2138725
* Add new introText column in the Body database
* Reply/Forward put the appropriate String into this new column
* Rfc822Output uses this when required when streaming the message
Change-Id: I34602fdb3f91692c46fc8bc31ba0e6f680d445a0
Merge commit '0d00889f83fc8c1d69039a2c849b630fb4dd28dd' into eclair-plus-aosp
* commit '0d00889f83fc8c1d69039a2c849b630fb4dd28dd':
Cleanup Provider Message in preparation for upload
Merge commit '39ec429862545b622e166bb0d0a5cf0c1e0e019e' into eclair-plus-aosp
* commit '39ec429862545b622e166bb0d0a5cf0c1e0e019e':
Have SyncManager.ping check that the service is properly started
* If not, it will start the service
* This will catch cases in which the Email process has been killed
while alarms are set (this would be the vast majority of the time)
* Will look into ways of catching any remaining cases...
* Fixes#2131432
Change-Id: Id71e68d14b5d1b0402c866db49a07c7b1adf499d
Merge commit '4cf3252fb07623fe4985aaf3bf63360099320a41' into eclair-plus-aosp
* commit '4cf3252fb07623fe4985aaf3bf63360099320a41':
Workaround system peculiarity to fix#2134509
* Our AccountManager listener was getting unregistered due to the way
ApplicationContext caches AccountManager in a static member
* The result was that AccountManager registers its listeners against the
FIRST context it is instantiated with! Future calls will all obtain
this pre-initialized AccountManager.
* In this case, AccountSetupOptions was the first caller (to create the
AccountManager Account for Exchange)
* The subsequent call to register a listener therefore had its registration
tied to the context of AccountSetupOptions, and was therefore leaked
when AccountSetupOptions finished!
* This caused a chain of problems - the leaked receiver, an Exception in
AccountManager when trying to ping the listener in an expired context,
and eventually the bug referenced above, which became a P1 issue
Change-Id: I478e28d21ca77419afa8011e4ed8101cdf67ab79
Merge commit 'b2f71dac39730afa349459c399811bcadaf05f7b' into eclair-plus-aosp
* commit 'b2f71dac39730afa349459c399811bcadaf05f7b':
Only handle mailbox alarms for EAS mailboxes
* Fixes#2135238 in which a change to a POP/IMAP mailbox
ended up causing a sync of that box as an EAS mailbox
* The fix is to check that mailboxes with changes actually
belong to an EAS account before trying to sync them
Change-Id: I832095ce61665813cbcfb2aa58e45a48db8a34e7
Merge commit 'fa52e6c95674aef6461a5cfc670a052e1c5b7f2f' into eclair-plus-aosp
* commit 'fa52e6c95674aef6461a5cfc670a052e1c5b7f2f':
Clean out old mailbox names logic and fix a couple of bugs.
* Get rid of old Account.getxxxFolderName() calls.
* Clean up any call sites to them
* Properly rename the existing special folder name identifiers
* Use a hash table in MessagingController to improve identification
of special folders for IMAP accounts
* Fix a bug in Controller, which was creating new server-side folders
using localized names.
* Fix a bunch of code in Controller that was using mContext, instead of
using mProviderContext to support testability.
* Fix broken unit tests in ControllerProviderOpsTests
Fixes bug 1904373
Merge commit '71bba443f2c418df69bb3316f9394b1eda6f751f' into eclair-plus-aosp
* commit '71bba443f2c418df69bb3316f9394b1eda6f751f':
Fix broken test after changes to Rfc822Output
Merge commit 'f20fa620d2cd0a871d5b02c113d59bc181c88619' into eclair-plus-aosp
* commit 'f20fa620d2cd0a871d5b02c113d59bc181c88619':
On service calls to startSync, make sure SyncManager is running
* Check that SyncManager's thread is running when called for startSync;
if not, start the service via Intent
* Mostly fixes#2133115 (although there are possibly other cases for
SyncManager not running, this will cause any manual "Refresh" to start
it up.)
* Added large comment at onCreate to explain how all this works
Change-Id: Ib43211ddb36e2f79ee5b1f6973f8bc2bc499024c
Merge commit '06261b704e210b9f560fbef71142c0071dff1acd' into eclair-plus-aosp
* commit '06261b704e210b9f560fbef71142c0071dff1acd':
make EAS set CALLER_IS_SYNCADAPTER for writes
Merge commit '7b79163aac1542577304d60fa76de6feb6be48c7' into eclair-plus-aosp
* commit '7b79163aac1542577304d60fa76de6feb6be48c7':
Show "sync contacts" setting properly in the settings page
Merge commit 'c06b6290c720ab65b0b38eddc522cc8f4f78cfca' into eclair-plus-aosp
* commit 'c06b6290c720ab65b0b38eddc522cc8f4f78cfca':
Clean up recent submission per stadler
Merge commit '1d4d1b8d9032b7a4bab3bf3368d582392aea9dc3' into eclair-plus-aosp
* commit '1d4d1b8d9032b7a4bab3bf3368d582392aea9dc3':
Make sure we don't start account sync without push/ping active
Merge commit '8067b54294356f375521ba3d1e7db3df117b65a4' into eclair-plus-aosp
* commit '8067b54294356f375521ba3d1e7db3df117b65a4':
UI cleanups for new account creation
Merge commit '22722207f5cc68c91d4be8307a29a9adb711b6d3' into eclair-plus-aosp
* commit '22722207f5cc68c91d4be8307a29a9adb711b6d3':
Close security hole in Email provider
* Improve appearance of basics screen and use simplified text
* Provide alternate text when in EAS account setup flow (from acct mgr)
* Change "Exchange/ActiveSync" button to "Exchange account"
* Add some spacing to the three buttons, to improve appearance
Bugs addressed:
2128055 Change string in account picker activity to Exchange
2132713 Welcome message for Email app is inappropriate when coming from
Settings -> Accounts & sync -> New account
* Prevent open access to sent or received messages
* Prevent open access to account info incl. passwords
* Allow access only to system apps
Bug # 2133080
* SmartReply doesn't put in header information related to the original, which
looks like a bug in EAS, so we add our own (as we do for SMTP)
* SmartForward works properly, but doesn't put any CRLF between the new text
and the original; we fix that by adding one after the original text.
* Addresses #2132658
Change-Id: I48efec0d02598a8e9ce2a54b4c66464e8e62e5d6
Merge commit 'cc15a77b289e3c840d0ed49213d7a62dfe2ee25a' into eclair-plus-aosp
* commit 'cc15a77b289e3c840d0ed49213d7a62dfe2ee25a':
Replace commented out call to actionNotifyNewMessages
Merge commit 'a740e2935746254b836051069813489cb38be666' into eclair-plus-aosp
* commit 'a740e2935746254b836051069813489cb38be666':
Fix bugs related to orientation change in MessageCompose
