Merge commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15' into eclair-plus-aosp
* commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15':
Import revised translations. DO NOT MERGE
Merge commit 'b9213876f6a233baca501d3502c3ed868c32a2e6' into eclair-plus-aosp
* commit 'b9213876f6a233baca501d3502c3ed868c32a2e6':
Fix issue with older messages not getting deleted properly from device
Merge commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b' into eclair-plus-aosp
* commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b':
Use StructuredName.DISPLAY_NAME for Email display name on new contacts
Merge commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9' into eclair-plus-aosp
* commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9':
Don't add backslash if there already is one; fixes#2124974
Merge commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2' into eclair-plus-aosp
* commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2':
Change AccountManager username for Exchange to the user's login credential
* This is not a backward-compatible change (sorry)
* Existing AccountManager EAS accounts and contacts are deleted
* Existing EmailProvider data is deleted
* Change works with new code (stadler) to avoid account duplication
Change-Id: Ife09c51fa714d91054d017b497bce603add5375a
Merge commit 'ec11b9658b162c8abcf9757591df4fc49639565f' into eclair-plus-aosp
* commit 'ec11b9658b162c8abcf9757591df4fc49639565f':
Fix "reloadFolderList" service call in SyncManager
* Write unit test to replicate failure(s) in POP3 use of parseInt. All
calls to parseInt must be guarded by try/catch NumberFormatException.
* Fix the failures
Bug # 2115586
Merge commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313' into eclair-plus-aosp
* commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313':
Harden against crashes caused by account deletes
The basic failure mode is to delete an account while it is being
synced or some other background activity. The fixes in this CL will
harden against this, but it will not be a perfect solution; That
will require shutting down all sync, which is difficult in the current
too-many-threads implementation.
Primary bug# 2112564
Merge commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af' into eclair-plus-aosp
* commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af':
Support StructuredName.DISPLAY_NAME for Exchange contacts
Merge commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c' into eclair-plus-aosp
* commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c':
show message list selection
Merge commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066' into eclair-plus-aosp
* commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066':
Give warnings if dupe account created:
* Check for existing accounts with matching servername + username
* Show a dialog and block account creation
* Triggers in three cases:
* After input of an auto-setup account (e.g. Gmail or AOL)
* After input of manual setup (incoming) parameters
* After changing incoming parameters of *any* existing account
* Made some notes in EmailContent regarding fields in HostAuth that we
are not actually using.
* Added HostAuth unit tests
Primarily fixes bug # 1964449
Bonus fix for bug # 1594408
Change-Id: I49310faf6654280582e0ab3d3e40f2701bfcd21d
Merge commit '2d5691cac1874eb3491353ab608a84c2a75e2b62' into eclair-plus-aosp
* commit '2d5691cac1874eb3491353ab608a84c2a75e2b62':
Support bcc in Exchange (Fixes#2117849)
Merge commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0' into eclair-plus-aosp
* commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0':
Handle the case of no body being present (happens in unit tests)
Merge commit '3bef61019605176b3397b5ae659205ac324689ed' into eclair-plus-aosp
* commit '3bef61019605176b3397b5ae659205ac324689ed':
change to use the new CALLER_IS_SYNCADAPTER flag