Commit Graph

1000 Commits

Author SHA1 Message Date
Andrew Stadler
59ce4670b5 am da8836a7: Give warnings if dupe account created:
Merge commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066' into eclair-plus-aosp

* commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066':
  Give warnings if dupe account created:
2009-09-15 16:43:26 -07:00
Andrew Stadler
da8836a76c 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
2009-09-15 16:33:44 -07:00
Marc Blank
1fd13dc9fb am f2147b18: Merge change 25159 into eclair
Merge commit 'f2147b183414d4ffc754c95e101c9a64a53c4a40' into eclair-plus-aosp

* commit 'f2147b183414d4ffc754c95e101c9a64a53c4a40':
  Fix EAS sending (#2122221)
2009-09-15 16:28:42 -07:00
Android (Google) Code Review
f2147b1834 Merge change 25159 into eclair
* changes:
  Fix EAS sending (#2122221)
2009-09-15 19:23:40 -04:00
Marc Blank
a84a0e9a0d Fix EAS sending (#2122221)
Change-Id: I92ea4b1a77d96bf7992ea34026a2c5d30f33c317
2009-09-15 16:20:34 -07:00
Andrew Stadler
0ef15157e2 am c21d326e: Merge change 25145 into eclair
Merge commit 'c21d326ef00b6fdbf01d69c32d57bc55b9109a9e' into eclair-plus-aosp

* commit 'c21d326ef00b6fdbf01d69c32d57bc55b9109a9e':
  Disable testResolveInlineImage
2009-09-15 16:08:39 -07:00
Android (Google) Code Review
c21d326ef0 Merge change 25145 into eclair
* changes:
  Disable testResolveInlineImage
2009-09-15 19:03:06 -04:00
Andrew Stadler
1761234fc6 Disable testResolveInlineImage
This test depends on LocalStore and is thus deprecated.

It very much needs to be be rewritten and reestablished.

Bug # 2121424
2009-09-15 15:55:23 -07:00
Marc Blank
bb618d8892 am 2d5691ca: Support bcc in Exchange (Fixes #2117849)
Merge commit '2d5691cac1874eb3491353ab608a84c2a75e2b62' into eclair-plus-aosp

* commit '2d5691cac1874eb3491353ab608a84c2a75e2b62':
  Support bcc in Exchange (Fixes #2117849)
2009-09-15 15:24:58 -07:00
Marc Blank
2d5691cac1 Support bcc in Exchange (Fixes #2117849)
* Must send the bcc header for EAS

Change-Id: I38d119beed334c6bb23a09b87375804f8c03ea76
2009-09-15 15:18:46 -07:00
Marc Blank
71177c5375 Support StructuredName.DISPLAY_NAME for Exchange contacts
* Fixes #2115514

Change-Id: Iac348c4ecac3bf8f895c32fff7077bc36d385bc9
2009-09-15 14:34:03 -07:00
Marc Blank
42e18b2edb am ffc681a4: Handle the case of no body being present (happens in unit tests)
Merge commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0' into eclair-plus-aosp

* commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0':
  Handle the case of no body being present (happens in unit tests)
2009-09-15 14:21:01 -07:00
Fred Quintana
8831da7a24 am 3bef6101: Merge change 24991 into eclair
Merge commit '3bef61019605176b3397b5ae659205ac324689ed' into eclair-plus-aosp

* commit '3bef61019605176b3397b5ae659205ac324689ed':
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 13:46:15 -07:00
Marc Blank
ffc681a4da Handle the case of no body being present (happens in unit tests)
* Fixes #2121403
2009-09-15 13:08:55 -07:00
Android (Google) Code Review
3bef610196 Merge change 24991 into eclair
* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 15:26:50 -04:00
satok
7355f0fab1 am 0cc0e709: Rename adding/removing star strings
Merge commit '0cc0e7094165a40291fbfd7c0f9cbdfcb78d30fd' into eclair-plus-aosp

* commit '0cc0e7094165a40291fbfd7c0f9cbdfcb78d30fd':
  Rename adding/removing star strings
2009-09-15 01:12:24 -07:00
satok
0cc0e70941 Rename adding/removing star strings
BUG: 2116258
2009-09-15 16:05:14 +09:00
satok
58096513df am d2174733: Auto-sync of stale mailboxes
Merge commit 'd2174733b146eeccd5f3b3b95f98e1e1aaafb257' into eclair-plus-aosp

* commit 'd2174733b146eeccd5f3b3b95f98e1e1aaafb257':
  Auto-sync of stale mailboxes
2009-09-14 23:47:32 -07:00
satok
d2174733b1 Auto-sync of stale mailboxes
BUG: 2050116
- auto sync onResume
- add mNonPushMode
-- mNonPushMode is updated in SetFooterTask
2009-09-15 14:38:13 +09:00
satok
aa6786a5cb am 043dba5e: Merge change 24672 into eclair
Merge commit '043dba5e1b79037f438483f32108aa348d0f0ad6' into eclair-plus-aosp

* commit '043dba5e1b79037f438483f32108aa348d0f0ad6':
  Enable long press Open on Accounts screen
2009-09-14 21:49:59 -07:00
Android (Google) Code Review
043dba5e1b Merge change 24672 into eclair
* changes:
  Enable long press Open on Accounts screen
2009-09-15 00:42:21 -04:00
Fred Quintana
977cd2f58a change to use the new CALLER_IS_SYNCADAPTER flag 2009-09-14 17:37:18 -07:00
Marc Blank
64fa19b665 am 1d989892: Implement SmartReply/SmartForward for EAS; fixes #2098779
Merge commit '1d98989222f2d023ddb08a70d5abb850029f95dc' into eclair-plus-aosp

* commit '1d98989222f2d023ddb08a70d5abb850029f95dc':
  Implement SmartReply/SmartForward for EAS; fixes #2098779
2009-09-14 15:54:02 -07:00
Marc Blank
1d98989222 Implement SmartReply/SmartForward for EAS; fixes #2098779
* SmartForward and SmartReply are EAS commands that automatically
  include the original message and, if a forward, all original
  attachments, regardless of whether they've been downloaded to
  the device
* Both commands improve battery life by sending less data; greatly
  so for SmartForward if there are attachments

Change-Id: I12432cd5275a3b54e9a80d5cd59da437c4a086cc
2009-09-14 15:47:38 -07:00
Marc Blank
3463b40146 am 42c130dc: Fix bug in which EAS mail won\'t ever get sent (#2118279)
Merge commit '42c130dcf1f6163b75b7d75ab66027c27d7c5422' into eclair-plus-aosp

* commit '42c130dcf1f6163b75b7d75ab66027c27d7c5422':
  Fix bug in which EAS mail won't ever get sent (#2118279)
2009-09-14 11:14:53 -07:00
Marc Blank
42c130dcf1 Fix bug in which EAS mail won't ever get sent (#2118279)
Change-Id: Iedd80269bafd39a3536527ebe8902b4999eff41e
2009-09-14 11:03:18 -07:00
Marc Blank
54ef94999b am e59c8725: Make sure SyncManager keeps running in various edge cases
Merge commit 'e59c8725c595ae21dff5e04dc418818a18555a55' into eclair-plus-aosp

* commit 'e59c8725c595ae21dff5e04dc418818a18555a55':
  Make sure SyncManager keeps running in various edge cases
2009-09-14 08:58:16 -07:00
Marc Blank
e59c8725c5 Make sure SyncManager keeps running in various edge cases
* Have Welcome start the service (in case the app has been reloaded)
* Have SyncManager.ping start the service if there's no instance of
  SyncManager

Change-Id: I8bed2843a3e065d2db29fad67dfb0bb3a5d0ff5e
2009-09-14 08:50:50 -07:00
Marc Blank
da57cf18f7 am d6090941: Merge change 24849 into eclair
Merge commit 'd60909418221d8b7f762c11d8322a98f0952dca7' into eclair-plus-aosp

* commit 'd60909418221d8b7f762c11d8322a98f0952dca7':
  Improve the checkMailbox loop query to get only the appropriate boxes
2009-09-14 07:13:49 -07:00
Android (Google) Code Review
d609094182 Merge change 24849 into eclair
* changes:
  Improve the checkMailbox loop query to get only the appropriate boxes
2009-09-14 10:06:44 -04:00
Marc Blank
09982cf4e2 am bba6d443: Merge change 24858 into eclair
Merge commit 'bba6d443f55a361a682ffc2a84c7809f4b894e94' into eclair-plus-aosp

* commit 'bba6d443f55a361a682ffc2a84c7809f4b894e94':
  Don't wait longer than 10s for ping boxes to be ready
2009-09-13 22:58:29 -07:00
Marc Blank
677755c376 am 403a45e7: Merge change 24844 into eclair
Merge commit '403a45e73606f3d41624c3e3ac02597c08145281' into eclair-plus-aosp

* commit '403a45e73606f3d41624c3e3ac02597c08145281':
  Reimplement reply/forward to use mTextReply/mHtmlReply
2009-09-13 22:58:25 -07:00
Android (Google) Code Review
bba6d443f5 Merge change 24858 into eclair
* changes:
  Don't wait longer than 10s for ping boxes to be ready
2009-09-14 01:53:36 -04:00
Marc Blank
4f9d5cf8f8 Don't wait longer than 10s for ping boxes to be ready
* Do a short ping in this case, which at least will allow the device
  to sleep while waiting
* Addresses #2116749

Change-Id: I9e70feaeef1361e1d66652dc66b92f6ee14751bf
2009-09-13 22:52:36 -07:00
Android (Google) Code Review
403a45e736 Merge change 24844 into eclair
* changes:
  Reimplement reply/forward to use mTextReply/mHtmlReply
2009-09-14 01:32:10 -04:00
Marc Blank
66d6330618 am 60c7502b: Change exchange setup screen per #2025029
Merge commit '60c7502b6777be550aaace9e9d780a9f84c8b03f' into eclair-plus-aosp

* commit '60c7502b6777be550aaace9e9d780a9f84c8b03f':
  Change exchange setup screen per #2025029
2009-09-13 22:30:15 -07:00
Marc Blank
f2dded3a2f Reimplement reply/forward to use mTextReply/mHtmlReply
* Move creation of final reply/forward text (i.e. new text plus
  the original) to Rfc822Output, where it belongs.
* Prepares the way for use of SmartForward/SmartReply in
  Exchange and replying w/ multipart/alternative in SMTP
* Moved test from MessageCompose to new Rfc822OutputTests, and note
  that new tests should be added (this is not a regression; there
  were never enough tests here)

Change-Id: Ibefb842f47cc9223714856d99b8d4f55b55f49e3
2009-09-13 22:28:38 -07:00
Marc Blank
60c7502b67 Change exchange setup screen per #2025029
Change-Id: Ib94713857902e336984b847f70c96e04826b9b74
2009-09-13 21:55:10 -07:00
Marc Blank
199f8d65ff am c7897acf: Fix NPE when adding note rows to Contacts
Merge commit 'c7897acf56251d3ea4c484616643c22fe76c2646' into eclair-plus-aosp

* commit 'c7897acf56251d3ea4c484616643c22fe76c2646':
  Fix NPE when adding note rows to Contacts
2009-09-13 12:11:38 -07:00
Marc Blank
c7897acf56 Fix NPE when adding note rows to Contacts
Change-Id: I51574db9abc45b55f8a7c19d493fdc47bc24b11b
2009-09-13 12:04:59 -07:00
Marc Blank
fa1ad355a1 Improve the checkMailbox loop query to get only the appropriate boxes
* Boxes must 1) be from an EAS account and 2) have a syncInterval that
  is not "never"

Change-Id: I5efbdc527063b2ee3373bc763b625eadfed67c4a
2009-09-13 12:04:06 -07:00
Marc Blank
16b76d78cd am f50c6d1f: Don\'t sync "trash" folder in Exchange
Merge commit 'f50c6d1fafde92f38ad80b36bb152cc58228a474' into eclair-plus-aosp

* commit 'f50c6d1fafde92f38ad80b36bb152cc58228a474':
  Don't sync "trash" folder in Exchange
2009-09-12 16:52:08 -07:00
Marc Blank
f50c6d1faf Don't sync "trash" folder in Exchange
Change-Id: I6a1dc2a8ae5936bb7428d82e48ddbf114500051a
2009-09-12 16:47:07 -07:00
Marc Blank
5024030e89 am 492228bd: Merge change 24815 into eclair
Merge commit '492228bdc4b90c632d7cf4d87a81fa42d3c3456f' into eclair-plus-aosp

* commit '492228bdc4b90c632d7cf4d87a81fa42d3c3456f':
  Don't sync if the "Sync Contacts" checkbox isn't set
2009-09-12 11:55:05 -07:00
Android (Google) Code Review
492228bdc4 Merge change 24815 into eclair
* changes:
  Don't sync if the "Sync Contacts" checkbox isn't set
2009-09-12 14:51:28 -04:00
Marc Blank
90a32e1f83 am 411334d4: Fix broken test cases
Merge commit '411334d4e5c8019e646287c102faec7f18b8a13a' into eclair-plus-aosp

* commit '411334d4e5c8019e646287c102faec7f18b8a13a':
  Fix broken test cases
2009-09-12 11:50:37 -07:00
Marc Blank
411334d4e5 Fix broken test cases
Change-Id: Ib2d019662d358a20b4d62992529bfdf398e4661b
2009-09-11 23:00:39 -07:00
Marc Blank
9e93aa16f3 am 95bc6a6a: Merge change 24755 into eclair
Merge commit '95bc6a6ad9f7332eba594c8e5f732884d6f02990' into eclair-plus-aosp

* commit '95bc6a6ad9f7332eba594c8e5f732884d6f02990':
  Allow download of contact w/ no name; don't accept empty note
2009-09-11 18:50:45 -07:00
Android (Google) Code Review
95bc6a6ad9 Merge change 24755 into eclair
* changes:
  Allow download of contact w/ no name; don't accept empty note
2009-09-11 21:42:21 -04:00
Marc Blank
9679d4cf64 Don't sync if the "Sync Contacts" checkbox isn't set
Change-Id: I606f6c384fa34283ccee1eeaac90123347846f28
2009-09-11 18:34:06 -07:00