Commit Graph

1052 Commits

Author SHA1 Message Date
Marc Blank
b9213876f6 Fix issue with older messages not getting deleted properly from device
Change-Id: I3c3a7b6c7c6983cad47826543f9ac4291c6b2a69
2009-09-17 14:19:44 -07:00
Marc Blank
84d4acfb73 am 7b73b440: am 3f224e7e: Use StructuredName.DISPLAY_NAME for Email display name on new contacts
Merge commit '7b73b440b78e157d641b68ece4101d23b4213fd9'

* commit '7b73b440b78e157d641b68ece4101d23b4213fd9':
  Use StructuredName.DISPLAY_NAME for Email display name on new contacts
2009-09-17 12:17:33 -07:00
Marc Blank
0941e7e844 am b4b87a34: am 492e8498: Merge change 25427 into eclair
Merge commit 'b4b87a343fb98478cc0c87ebe7b27595d1e95534'

* commit 'b4b87a343fb98478cc0c87ebe7b27595d1e95534':
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 12:17:29 -07:00
Marc Blank
5d758e26e3 am 2aa9724e: am e7e1ca43: Change AccountManager username for Exchange to the user\'s login credential
Merge commit '2aa9724ea02979e9ddbde4c570949f3de4e75987'

* commit '2aa9724ea02979e9ddbde4c570949f3de4e75987':
  Change AccountManager username for Exchange to the user's login credential
2009-09-17 12:17:25 -07:00
Marc Blank
9b54f316a0 am 51e02f3e: am c0228398: Implement HOME/WORK phones as multiple typed rows
Merge commit '51e02f3ef865e1fc8a2637f1b17b0e9beee4a7b4'

* commit '51e02f3ef865e1fc8a2637f1b17b0e9beee4a7b4':
  Implement HOME/WORK phones as multiple typed rows
2009-09-17 12:17:21 -07:00
Marc Blank
12478ba6a3 am a380b1a2: am 767ea863: Merge change 25344 into eclair
Merge commit 'a380b1a2e89688d7bb8bb64d5096399f59e452ea'

* commit 'a380b1a2e89688d7bb8bb64d5096399f59e452ea':
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-17 12:17:17 -07:00
Andrew Stadler
ca79851fe7 am 6da8c4bb: am b734bfc0: Merge change 25320 into eclair
Merge commit '6da8c4bb60679ddd08ffb91d9db421e2b4597ca6'

* commit '6da8c4bb60679ddd08ffb91d9db421e2b4597ca6':
  Fix NumberFormatException in POP3 message sync
2009-09-17 12:17:13 -07:00
Marc Blank
7b73b440b7 am 3f224e7e: Use StructuredName.DISPLAY_NAME for Email display name on new contacts
Merge commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b' into eclair-plus-aosp

* commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b':
  Use StructuredName.DISPLAY_NAME for Email display name on new contacts
2009-09-17 10:23:13 -07:00
Marc Blank
b4b87a343f am 492e8498: Merge change 25427 into eclair
Merge commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9' into eclair-plus-aosp

* commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9':
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 10:23:09 -07:00
Marc Blank
2aa9724ea0 am e7e1ca43: Change AccountManager username for Exchange to the user\'s login credential
Merge commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2' into eclair-plus-aosp

* commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2':
  Change AccountManager username for Exchange to the user's login credential
2009-09-17 10:23:05 -07:00
Marc Blank
3f224e7efe Use StructuredName.DISPLAY_NAME for Email display name on new contacts
* Fixes #2115514

Change-Id: Ib9c437a1cbcbcf1069692e8d5d17d29e80369418
2009-09-17 10:14:12 -07:00
Android (Google) Code Review
492e8498e7 Merge change 25427 into eclair
* changes:
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 13:07:59 -04:00
Marc Blank
e7e1ca432e 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
2009-09-17 10:06:27 -07:00
Marc Blank
e997a9a10a am b8ed6783: am ec11b965: Merge change 25348 into eclair
Merge commit 'b8ed67830827330f78aed1a734f219d15a9af233'

* commit 'b8ed67830827330f78aed1a734f219d15a9af233':
  Fix "reloadFolderList" service call in SyncManager
2009-09-17 09:59:13 -07:00
Andrew Stadler
3e4297f8e2 am 2077e5ef: am 0c4dc851: Harden against crashes caused by account deletes
Merge commit '2077e5efa22b0211a07ead9b444b9e17008e712b'

* commit '2077e5efa22b0211a07ead9b444b9e17008e712b':
  Harden against crashes caused by account deletes
2009-09-17 09:56:30 -07:00
Marc Blank
fb0c1b411c am a3a60bc1: am fc7dfddf: Merge change 25130 into eclair
Merge commit 'a3a60bc1b41fa44000daeb8bb8030c5a067ea452'

* commit 'a3a60bc1b41fa44000daeb8bb8030c5a067ea452':
  Support StructuredName.DISPLAY_NAME for Exchange contacts
2009-09-17 09:50:17 -07:00
satok
cae5bca96f am a3e8386f: am 2aa3e92f: Merge change 25041 into eclair
Merge commit 'a3e8386f98b7d7425e03b1c95d19b073d3d4ed87'

* commit 'a3e8386f98b7d7425e03b1c95d19b073d3d4ed87':
  show message list selection
2009-09-17 09:48:25 -07:00
Marc Blank
e846a54238 am 16e4608a: am ac37c5c1: Change Exchange username validation to exclude bare backslash
Merge commit '16e4608ab577fa234c680383fc8488ce98be60af'

* commit '16e4608ab577fa234c680383fc8488ce98be60af':
  Change Exchange username validation to exclude bare backslash
2009-09-17 09:47:02 -07:00
Marc Blank
51e02f3ef8 am c0228398: Implement HOME/WORK phones as multiple typed rows
Merge commit 'c022839861c26b8f073144b32a7527ba842c1181' into eclair-plus-aosp

* commit 'c022839861c26b8f073144b32a7527ba842c1181':
  Implement HOME/WORK phones as multiple typed rows
2009-09-17 08:45:20 -07:00
Marc Blank
a380b1a2e8 am 767ea863: Merge change 25344 into eclair
Merge commit '767ea863986c1d03332ca43591106510de0c8725' into eclair-plus-aosp

* commit '767ea863986c1d03332ca43591106510de0c8725':
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-17 08:42:01 -07:00
Andrew Stadler
6da8c4bb60 am b734bfc0: Merge change 25320 into eclair
Merge commit 'b734bfc08b28ea87c507ddcbce4487aa96a73fee' into eclair-plus-aosp

* commit 'b734bfc08b28ea87c507ddcbce4487aa96a73fee':
  Fix NumberFormatException in POP3 message sync
2009-09-17 08:40:08 -07:00
Andrew Stadler
bc991a9ad9 am 59ce4670: am da8836a7: Give warnings if dupe account created:
Merge commit '59ce4670b531ff28ec89ef0910ed0fb2121ff584'

* commit '59ce4670b531ff28ec89ef0910ed0fb2121ff584':
  Give warnings if dupe account created:
2009-09-17 06:43:47 -07:00
Marc Blank
46c33e519c am 1fd13dc9: am f2147b18: Merge change 25159 into eclair
Merge commit '1fd13dc9fbe39e5fef9eed7eac388b547bfe750e'

* commit '1fd13dc9fbe39e5fef9eed7eac388b547bfe750e':
  Fix EAS sending (#2122221)
2009-09-17 06:43:36 -07:00
Andrew Stadler
88db3812b2 am 0ef15157: am c21d326e: Merge change 25145 into eclair
Merge commit '0ef15157e29a87444b9726166a2cab6c19323e93'

* commit '0ef15157e29a87444b9726166a2cab6c19323e93':
  Disable testResolveInlineImage
2009-09-17 06:42:56 -07:00
Marc Blank
4059273502 am bb618d88: am 2d5691ca: Support bcc in Exchange (Fixes #2117849)
Merge commit 'bb618d889291448d497b1759b0195ac3e819b1ea'

* commit 'bb618d889291448d497b1759b0195ac3e819b1ea':
  Support bcc in Exchange (Fixes #2117849)
2009-09-17 06:42:30 -07:00
Marc Blank
1bf64afe3a am 42e18b2e: am ffc681a4: Handle the case of no body being present (happens in unit tests)
Merge commit '42e18b2edbeca92ff0f2de1525481336daee61b0'

* commit '42e18b2edbeca92ff0f2de1525481336daee61b0':
  Handle the case of no body being present (happens in unit tests)
2009-09-17 06:41:02 -07:00
Fred Quintana
9798d2f6ff am 8831da7a: am 3bef6101: Merge change 24991 into eclair
Merge commit '8831da7a240898b5e35b0f35f14f1de93fb780f1'

* commit '8831da7a240898b5e35b0f35f14f1de93fb780f1':
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-17 06:38:35 -07:00
satok
3449b3184c Fix sort order of MailboxList
BUG: 2083746
2009-09-17 17:33:19 +09:00
Marc Blank
c022839861 Implement HOME/WORK phones as multiple typed rows
Change-Id: I7e1c885e7735022026df9599babd48f5dbf71af9
2009-09-16 19:57:19 -07:00
Marc Blank
acfd155c12 Don't add backslash if there already is one; fixes #2124974
Change-Id: If5fa8369ee4c52449047d5134f3bf28feb88de1a
2009-09-16 18:55:28 -07:00
satok
c6d40688a4 am 7355f0fa: am 0cc0e709: Rename adding/removing star strings
Merge commit '7355f0fab170219dec81cf01f75444cf78f0a332'

* commit '7355f0fab170219dec81cf01f75444cf78f0a332':
  Rename adding/removing star strings
2009-09-16 18:24:03 -07:00
satok
5a64be7c4d am 58096513: am d2174733: Auto-sync of stale mailboxes
Merge commit '58096513df655d13978e8899535a7344d3ced7ea'

* commit '58096513df655d13978e8899535a7344d3ced7ea':
  Auto-sync of stale mailboxes
2009-09-16 18:23:44 -07:00
satok
5e8915fe53 am aa6786a5: am 043dba5e: Merge change 24672 into eclair
Merge commit 'aa6786a5cb547495aff770cbbeef3c62169de3cd'

* commit 'aa6786a5cb547495aff770cbbeef3c62169de3cd':
  Enable long press Open on Accounts screen
2009-09-16 18:23:19 -07:00
Marc Blank
ae0b0110bc am 64fa19b6: am 1d989892: Implement SmartReply/SmartForward for EAS; fixes #2098779
Merge commit '64fa19b66535dbd078ffb73098735ad32bf66fd0'

* commit '64fa19b66535dbd078ffb73098735ad32bf66fd0':
  Implement SmartReply/SmartForward for EAS; fixes #2098779
2009-09-16 18:20:02 -07:00
Marc Blank
91e0daeb85 am 3463b401: am 42c130dc: Fix bug in which EAS mail won\'t ever get sent (#2118279)
Merge commit '3463b401466628f58118d74f0a1a7ee51edb27b5'

* commit '3463b401466628f58118d74f0a1a7ee51edb27b5':
  Fix bug in which EAS mail won't ever get sent (#2118279)
2009-09-16 18:02:04 -07:00
Marc Blank
1618f10ffb am 54ef9499: am e59c8725: Make sure SyncManager keeps running in various edge cases
Merge commit '54ef94999bc8460e6548ee92e9e8d2b3b7be2160'

* commit '54ef94999bc8460e6548ee92e9e8d2b3b7be2160':
  Make sure SyncManager keeps running in various edge cases
2009-09-16 18:01:03 -07:00
Marc Blank
9c61402914 am da57cf18: am d6090941: Merge change 24849 into eclair
Merge commit 'da57cf18f75d58e66388a1bc39a9a9383bd48fb4'

* commit 'da57cf18f75d58e66388a1bc39a9a9383bd48fb4':
  Improve the checkMailbox loop query to get only the appropriate boxes
2009-09-16 18:00:30 -07:00
Android (Google) Code Review
767ea86398 Merge change 25344 into eclair
* changes:
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-16 19:11:28 -04:00
Marc Blank
e428f94161 Add "Sync Contacts" to Account preferences screen (part of #2106733)
* Also added some checks for null Accounts and HostAuth

Change-Id: Ia4ae68d0e8a62abdaf002519766b6685b6947e9e
2009-09-16 16:07:27 -07:00
Android (Google) Code Review
b734bfc08b Merge change 25320 into eclair
* changes:
  Fix NumberFormatException in POP3 message sync
2009-09-16 17:54:03 -04:00
Marc Blank
b8ed678308 am ec11b965: Merge change 25348 into eclair
Merge commit 'ec11b9658b162c8abcf9757591df4fc49639565f' into eclair-plus-aosp

* commit 'ec11b9658b162c8abcf9757591df4fc49639565f':
  Fix "reloadFolderList" service call in SyncManager
2009-09-16 14:33:28 -07:00
Android (Google) Code Review
ec11b9658b Merge change 25348 into eclair
* changes:
  Fix "reloadFolderList" service call in SyncManager
2009-09-16 17:28:31 -04:00
Marc Blank
5ebdc0efeb Fix "reloadFolderList" service call in SyncManager
* Fixes #2118439

Change-Id: Iee75c5902940fb7f38f19717306708809fa06dd5
2009-09-16 14:27:39 -07:00
Andrew Stadler
092d35c98d Fix NumberFormatException in POP3 message sync
* 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
2009-09-16 12:20:38 -07:00
Andrew Stadler
2077e5efa2 am 0c4dc851: Harden against crashes caused by account deletes
Merge commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313' into eclair-plus-aosp

* commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313':
  Harden against crashes caused by account deletes
2009-09-16 11:05:35 -07:00
Andrew Stadler
0c4dc85190 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
2009-09-16 10:58:54 -07:00
Marc Blank
c1787232c4 am 09982cf4: am bba6d443: Merge change 24858 into eclair
Merge commit '09982cf4e29afe44acb63acfc85546ab5ea6e641'

* commit '09982cf4e29afe44acb63acfc85546ab5ea6e641':
  Don't wait longer than 10s for ping boxes to be ready
2009-09-16 10:52:22 -07:00
Marc Blank
6c3fccd4ca am 677755c3: am 403a45e7: Merge change 24844 into eclair
Merge commit '677755c376acbebd2157a0297f0cb33be5d4eee3'

* commit '677755c376acbebd2157a0297f0cb33be5d4eee3':
  Reimplement reply/forward to use mTextReply/mHtmlReply
2009-09-16 10:52:18 -07:00
Marc Blank
3ff3d5a80d am 66d63306: am 60c7502b: Change exchange setup screen per #2025029
Merge commit '66d6330618f81a80daed58e44c818bbe2cbd8aad'

* commit '66d6330618f81a80daed58e44c818bbe2cbd8aad':
  Change exchange setup screen per #2025029
2009-09-16 10:52:14 -07:00
Marc Blank
d90515199c am 199f8d65: am c7897acf: Fix NPE when adding note rows to Contacts
Merge commit '199f8d65ffd8d51209f38b873e98a7654a5db5e5'

* commit '199f8d65ffd8d51209f38b873e98a7654a5db5e5':
  Fix NPE when adding note rows to Contacts
2009-09-16 10:51:25 -07:00