Commit Graph

2532 Commits

Author SHA1 Message Date
Andrew Stadler
ddc5dd3fe0 am 80bd83fd: Upsync appropriate organizer name/email
Merge commit '80bd83fd8550ed1b58c26241aab6830d66289b5e' into froyo-plus-aosp

* commit '80bd83fd8550ed1b58c26241aab6830d66289b5e':
  Upsync appropriate organizer name/email
2010-04-10 17:40:31 -07:00
Andrew Stadler
80bd83fd85 Upsync appropriate organizer name/email
* We need to send name & email for Exchange 2007
* For Exchange 2003, only name & email if the event is new

Bug: 2586661
Change-Id: Ia35c2c7a645a3d20b7031e9a43b8b5044a40f005
2010-04-10 17:35:34 -07:00
Andrew Stadler
13cc00239e am 06699c0d: Send meeting status with all upsynced changes
Merge commit '06699c0d911ad71d5964c68e182745f5c4144569' into froyo-plus-aosp

* commit '06699c0d911ad71d5964c68e182745f5c4144569':
  Send meeting status with all upsynced changes
2010-04-10 17:28:53 -07:00
Andrew Stadler
06699c0d91 Send meeting status with all upsynced changes
* Meeting status differentiates between appointments and meetings,
  which is important in Outlook and OWA
* Fix older, completely incorrect code for upsyncing categories

Bug: 2586071
Change-Id: I277252ef2c31e5b8ec7ceda69c229f5fd100ecdb
2010-04-10 17:24:23 -07:00
Andy Stadler
6445efb649 am 7d32ec27: Merge "Check for active device admin before each ping loop" into froyo
Merge commit '7d32ec27ec7f17238d0f5c373acc502053e59647' into froyo-plus-aosp

* commit '7d32ec27ec7f17238d0f5c373acc502053e59647':
  Check for active device admin before each ping loop
2010-04-10 17:23:23 -07:00
Andy Stadler
6647399802 am 69757c66: Merge "Synchronize getAccountById on sAccountList" into froyo
Merge commit '69757c6670b8b6fbeea6da1d9690002e0f7b9293' into froyo-plus-aosp

* commit '69757c6670b8b6fbeea6da1d9690002e0f7b9293':
  Synchronize getAccountById on sAccountList
2010-04-10 17:21:57 -07:00
Marc Blank
7ac1a975c4 am 0cd9cbf0: Add organizer to Attendees before handling exceptions
Merge commit '0cd9cbf08817b18b4221efa15388f5a144ebfab4' into froyo-plus-aosp

* commit '0cd9cbf08817b18b4221efa15388f5a144ebfab4':
  Add organizer to Attendees before handling exceptions
2010-04-10 17:21:54 -07:00
Andy Stadler
7d32ec27ec Merge "Check for active device admin before each ping loop" into froyo 2010-04-10 17:18:35 -07:00
Andy Stadler
69757c6670 Merge "Synchronize getAccountById on sAccountList" into froyo 2010-04-10 17:17:56 -07:00
Marc Blank
2769c06b3d Check for active device admin before each ping loop
* Accounts that require security need to check that the Email app
  is still an active device admin from time to time
* Add a check for this before each run of the ping loop

Bug: 2583282
Change-Id: I1491821b7d0c1a341b1fe7ef1002c8b21aed12c2
2010-04-10 16:59:15 -07:00
Marc Blank
c89e346244 am 232b2dd9: Merge "Handle exception deletion properly" into froyo
Merge commit '232b2dd9dcce647e49e770ec9b4e6a3a564008d2' into froyo-plus-aosp

* commit '232b2dd9dcce647e49e770ec9b4e6a3a564008d2':
  Handle exception deletion properly
2010-04-10 11:38:07 -07:00
Makoto Onuki
aab0d339da am 17a18d64: Merge "Fix NPE caused by I34451000" into froyo
Merge commit '17a18d644af54b98087f3ec7a9b1e6d55e604e67' into froyo-plus-aosp

* commit '17a18d644af54b98087f3ec7a9b1e6d55e604e67':
  Fix NPE caused by I34451000
2010-04-10 11:38:05 -07:00
Marc Blank
3ab4a99679 Synchronize getAccountById on sAccountList
* This fixes a ConcurrentModificationException seen in monkey
  testing

Bug: 2586524
Change-Id: I3634678218827d5cffeef20c154b3826f9e5f36f
2010-04-10 10:30:41 -07:00
Marc Blank
0cd9cbf088 Add organizer to Attendees before handling exceptions
* Exceptions take a copy of Attendees when they are created, but
  we weren't adding the organizer to Attendees before exceptions
  were parsed
* Fix this by adding the organizer just before exception parsing
* If there aren't any exceptions, we add the organizer as before

Bug: 2585817
Change-Id: Ie894682977e38a55d975135c8fc2fd8f2d4b1365
2010-04-10 09:58:50 -07:00
Marc Blank
232b2dd9dc Merge "Handle exception deletion properly" into froyo 2010-04-09 16:08:22 -07:00
Marc Blank
1b2ed80da7 Handle exception deletion properly
* First, make sure we catch the cases of DELETED=1 and eventStatus=cancelled
* Second, only send email updates if the user is the organizer

Bug: 2583054
Change-Id: I886efa0f28931dc815bc31d4d6adb3d700f83c6b
2010-04-09 14:02:35 -07:00
Makoto Onuki
17a18d644a Merge "Fix NPE caused by I34451000" into froyo 2010-04-09 10:32:23 -07:00
Marc Blank
ce3aabde3a am 66bbd95a: Merge "Fix GAL lookup for provisioned EAS accounts" into froyo
Merge commit '66bbd95a016803133f74a7372c29acc3a20c72c4' into froyo-plus-aosp

* commit '66bbd95a016803133f74a7372c29acc3a20c72c4':
  Fix GAL lookup for provisioned EAS accounts
2010-04-08 22:38:42 -07:00
Marc Blank
8ee5858cb8 am f2b733de: Merge "Fix auto-send of invites when attendee status changes" into froyo
Merge commit 'f2b733de0f2e6f699711d7133c86834a6ec45615' into froyo-plus-aosp

* commit 'f2b733de0f2e6f699711d7133c86834a6ec45615':
  Fix auto-send of invites when attendee status changes
2010-04-08 22:38:40 -07:00
Marc Blank
66bbd95a01 Merge "Fix GAL lookup for provisioned EAS accounts" into froyo 2010-04-08 17:29:00 -07:00
Marc Blank
f2b733de0f Merge "Fix auto-send of invites when attendee status changes" into froyo 2010-04-08 17:28:50 -07:00
Marc Blank
b6cbf52656 Fix auto-send of invites when attendee status changes
* Use AS_SYNC_ADAPTER flag when changing attendee information in
  downsyncs
* Allow DTSTAMP to come before new attendee information in the case
  in which only attendees are changing
* Add _SYNC_DATA of "0" for all newly synced events

Bug: 2582513
Change-Id: Iacde0ddf3f2a99d108e00ef1991edfc34613f5c7
2010-04-08 17:26:06 -07:00
Marc Blank
ea816ef206 Fix GAL lookup for provisioned EAS accounts
Bug: 2582551
Change-Id: I316a2f9105ae4c693c401ad5e79922f4de1881b6
2010-04-08 17:05:11 -07:00
Makoto Onuki
0050fc2883 am 75e31dc1: Fix layout issue introduced with I5b680418
Merge commit '75e31dc17b97bfb9763d35cd791f5f85fc9ddca7' into froyo-plus-aosp

* commit '75e31dc17b97bfb9763d35cd791f5f85fc9ddca7':
  Fix layout issue introduced with I5b680418
2010-04-08 16:28:35 -07:00
Makoto Onuki
75e31dc17b Fix layout issue introduced with I5b680418
I shouldn't have changed the layout_height.
I changed it as a trial, and the final version of the fix didn't require this.

Bug 2581421

Change-Id: Ie06f813ed6d65a128381a99b9efeaa8d9275b5bf
2010-04-08 15:00:35 -07:00
Makoto Onuki
78e06eb894 Fix NPE caused by I34451000
It's unfortunate but some of the fields we cleared in I34451000 are accessed
in BG threads or after the activity is destroyed.  We could add != null checks
everywhere, but it'll be a mess.  I also think it's safer to simply remove
the "= null" lines.

On the other hand, clearing AsyncTasks are relatively safer because they are
kept only so that we can cancel them afterwards, so I kept them.  But let me
know if you want to revert the original CL.

Bug 2570603

Change-Id: I04a10dd7382bfcceb686c3e9af92f8949caf619e
2010-04-08 11:57:26 -07:00
The Android Open Source Project
5b20f95e57 merge from open-source master
Change-Id: Ia4e9b4a8055c02b87352fc214dc989f4681e8922
2010-04-08 10:47:46 -07:00
Andrew Stadler
3839dc981f Merge "Improve MIME & SMTP compliance on outbound messages" into froyo 2010-04-08 09:57:01 -07:00
Andrew Stadler
6bcccf6284 Improve MIME & SMTP compliance on outbound messages
* Write MIME-Version: 1.0 in all outbound messages, not just those
  with multiparts.  This is required by RFC 2045.
* Unit tests

Bug: 1678296
Change-Id: Icf37d93b8b0150f490791792499865a60744adea
2010-04-07 21:46:15 -07:00
Marc Blank
60ee205963 Merge "Fix bug #2551196" into froyo 2010-04-07 16:57:25 -07:00
Makoto Onuki
28153d0443 Merge "Increase usability of invite components in MessageView" into froyo 2010-04-07 16:57:04 -07:00
Makoto Onuki
9623a4ce6f Increase usability of invite components in MessageView
* Make yes, no, maybe, etc. larger (easier to touch)
  (bug #2561772)
* Make the accept/decline/maybe buttons focusable
  Make the "View in Calender" a button
  (bug #2561767)

Change-Id: I5b68041835e9d85e5290a30fe7910837b577c003
2010-04-07 16:45:23 -07:00
Marc Blank
0cf741bb0a Fix bug #2551196
* Handle the case in which a Mailbox to be synced doesn't have
  a serverId (rare case which happened to a Zimbra user)
* Tweak logging to improve debugability of similar issues

Bug: 2551196
Change-Id: Id61cee5c4b33eb2f87455fbae0899fec8ff3748f
2010-04-07 15:57:00 -07:00
Makoto Onuki
59cf1d05c1 Clear references to inner classes in onDestroy().
Also
- Made inner classes private if possible.
- Made some members final.

Bug 2570603

Change-Id: I34451000f2540c67e1039ea9dc4839dbec5ffab7
2010-04-07 11:54:57 -07:00
Marc Blank
c94c077a66 Merge "Send busy_status = 2 on all upsync's" into froyo 2010-04-07 11:09:31 -07:00
Marc Blank
f1bbf05380 Send busy_status = 2 on all upsync's
* Right now, we only send this for 2.5 (where it's required)
* If we don't send this for 12.0 and later, the status will be
  set to "free", which is almost always going to be wrong
* So always send busy status = 2 (we can't know differently, as
  we don't track free/busy)

Bug: 2575611
Change-Id: I11d952b68ac0ef7a022b030037ce6408f72d4a90
2010-04-07 09:44:09 -07:00
Andrew Stadler
856e09d76a Properly reset security policy when device admin revoked
* Simplify the logic in the onDisabled() receiver.  Make sure
  security policy keys are *always* disabled.
* Eliminate unused variable and unused receiver.

Bug: 2576145
Change-Id: I3665a1d300edfb77e02737c08aee22bc977f4968
2010-04-06 22:56:26 -07:00
Andrew Stadler
be4287970b Merge "Show a less-generic error message for security errors" into froyo 2010-04-06 22:50:06 -07:00
Makoto Onuki
af6724527e Added a test for IMAP APPEND
It's a preliminary change for IMAP bug fixes.

Also,
- Fixed a potential bug in ImapFolder.setFlags where it'd throw
  StringIndexOutOfBoundsException if flags is empty.

- Added a generic flag to proguard.flags so that now all methods with
  the "ForTest" sufix are automatically preserved.
  Turned out it wasn't needed for this CL, but it should come in handy
  someday.

Bug 2538076
Change-Id: I49a08afc196c7b7f1f30477dfc38ac5381045d84
2010-04-06 14:33:43 -07:00
Andrew Stadler
dc0753373e DO NOT MERGE. Handle STARTTLS when last line in EHLO response.
When receiving the EHLO response from the SMTP server, the multiline
answer has "-" prefix in all lines except the last line, where the
prefix is a blank. This is according to RFC 2821 section 4.2.1. This has
also been reported as issue 2309 at code.google.com.

Bug: 1744768

Change-Id: I3feccabed30767d2fa5b06352cd7d1c803e8d59c
2010-04-06 10:50:11 -07:00
Andrew Stadler
624af658ff Merge "Partial solution to make EAS setup respect "manual"" into froyo 2010-04-06 09:38:32 -07:00
Andrew Stadler
63ab9de1b8 Partial solution to make EAS setup respect "manual"
* Track whether the user clicked "manual" vs. clicking next (and falling
  into "manual" because the account is not found in the providers list.
  Convert this into an "allowAutoDiscover" parameter.
* Pass "allowAutoDiscover" down into AccountSetupAccountType and through
    into AccountSetupExchange.  (Note, it's unused/ignored for POP & IMAP
    accounts and should not affect them.)
* In AccountSetupExchange, use the existing EXTRA_DISABLE_AUTO_DISCOVER
    (previously only for testing) to suppress autodiscover in manual mode.

Bug: 2570919
Change-Id: I2583e00d1e6cc26bbd4b85134eddae8cc3a1f91e
2010-04-05 19:08:05 -07:00
Marc Blank
f7d9f65961 Merge "MessageView: on answering invitation move in only one direction." into froyo 2010-04-05 15:34:06 -07:00
Marc Blank
9991e71413 Fix remote wipe (which probably never worked)
Bug: 2567641
Change-Id: Iceeebbc5f5bb93d72ab349cc1c0a71c1bd5f5387
2010-04-05 12:36:12 -07:00
Marc Blank
0a3b5b0741 Add timeout/watchdog to autodiscover network calls
* Split out network operations w/ timeout and watchdog from send HttpClientPost
* Use this in autodiscover calls
* Add logging to help debug this issue, in case there are additional problems

Bug: 2568077
Change-Id: I2a2e1abca2c4dab02c8e04c304f67db2a7b4cb22
2010-04-04 12:18:25 -07:00
Michael Wilson
3988c288fa If STARTTLS is on last EHLO response line, accept space prefix.
When receiving the EHLO response from the SMTP server, the multiline
answer has "-" prefix in all lines except the last line, where the
prefix is a blank. This is according to RFC 2821 section 4.2.1. This has
also been reported as issue 2309 at code.google.com.

Change-Id: I3feccabed30767d2fa5b06352cd7d1c803e8d59c
2010-04-04 10:25:16 -04:00
Andrew Stadler
605371e793 Show a less-generic error message for security errors
* In Controller, map EmailServiceStatus.SECURITY_FAILURE
    to MessagingException.SECURITY_POLICIES_REQUIRED
* In MessageList, map MessagingException.SECURITY_POLICIES_REQUIRED
    to string account_setup_failed_security

Bug report will be forwarded to next release to get a more specific
string with proper translation.

Bug: 2563988
Change-Id: Ia1e6e947e3c0c7e6bd37301de2ea8ef4d641ef14
2010-04-03 23:55:38 -07:00
Andrew Stadler
a843d40ba1 Improve handling of unsupported security policies
* If the server asks for more than we can support, don't throw
  and error from PolicySet creation.  Let isSupported() do that.
* Overlong password lengths cannot be supported and isSupported is false.
* Overlong timeouts & max wipes can be reduced to supported
  amount (this actually increases security) and isSupported is true.
* Clean up an obsolete comment
* Unit tests

Bug: 2567804
Change-Id: I2d664a7f2a315b9f9bdcb867fe2cd98f74de6f66
2010-04-02 22:05:12 -07:00
satok
abed4c04c9 Close Cursor onDestroy
Bug:2557401
- set Cursor of ListAdapter null

Change-Id: I7d762c4ccdf6165d748136f5cf0e15b4a36b24a7
2010-04-02 20:08:17 +09:00
Marc Blank
802459f4d8 Don't show "Where: " in invite text if there's no location
Bug: 2563275
Change-Id: I2e978bc46b2ef292d749138500b53d61aefc4672
2010-04-01 19:14:02 -07:00