Commit Graph

2547 Commits

Author SHA1 Message Date
Makoto Onuki
b0690302bf am 1fe0aa19: Merge "Set CLEAR_WHEN_TASK_RESET flag when launching Calendar" into froyo
Merge commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73' into froyo-plus-aosp

* commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73':
  Set CLEAR_WHEN_TASK_RESET flag when launching Calendar
2010-04-12 13:30:06 -07:00
Makoto Onuki
1fe0aa19bf Merge "Set CLEAR_WHEN_TASK_RESET flag when launching Calendar" into froyo 2010-04-12 13:27:15 -07:00
Makoto Onuki
f793cd93b9 Set CLEAR_WHEN_TASK_RESET flag when launching Calendar
and Contacts, so that when you relaunch Email from Home, you always see
the Email app, not Calendar/Contacts.

Note as stated in the corresponding bug, this CL itself won't fix the issue,
because CLEAR_WHEN_TASK_RESET will be lost when Contacts/Calendar apps handle
the intent.
There's a feature request against the framework (bug 2586404) which should fix
this losing flag problem.

Bug 2584792

Change-Id: I34ac3707b99926fc07529ea2229f2a6b3c4f93e4
2010-04-12 13:09:56 -07:00
Andrew Stadler
ef01261a89 am 9cc6f46b: Merge "Try TOP even on POP servers that fail to report CAPA" into froyo
Merge commit '9cc6f46b05cdb1678b0ef73daf268c5728e96208' into froyo-plus-aosp

* commit '9cc6f46b05cdb1678b0ef73daf268c5728e96208':
  Try TOP even on POP servers that fail to report CAPA
2010-04-12 11:31:04 -07:00
Andrew Stadler
9cc6f46b05 Merge "Try TOP even on POP servers that fail to report CAPA" into froyo 2010-04-12 11:27:25 -07:00
Andrew Stadler
645fc28301 Try TOP even on POP servers that fail to report CAPA
* Ignore the results of CAPA and always try TOP
* If TOP returns -ERR simply fall back to (bad old slow) RETR
* Unit tests for positive & failure cases

Bug: 2588432
Change-Id: Ife4b551217de1025e14efc46074f16ef4ae99c6f
2010-04-12 10:56:55 -07:00
Marc Blank
ab99976d18 am c3aa3182: Send email to organizer if attendee deletes event/exception
Merge commit 'c3aa31820003bd62a863dc28d699cebdbcead228' into froyo-plus-aosp

* commit 'c3aa31820003bd62a863dc28d699cebdbcead228':
  Send email to organizer if attendee deletes event/exception
2010-04-12 10:26:22 -07:00
Marc Blank
c3aa318200 Send email to organizer if attendee deletes event/exception
* There are two cases, event and exception and both are fixed in this CL

Bug: 2587775
Change-Id: Id325c4877a77074ca6edd4d7fbeb54971d4cf984
2010-04-12 10:12:46 -07:00
Marc Blank
dc0f9ee7ed am 536a3655: Merge "Always add changed exceptions to the upload list" into froyo
Merge commit '536a36555b2a03eb852e2e54afedca7281f67f91' into froyo-plus-aosp

* commit '536a36555b2a03eb852e2e54afedca7281f67f91':
  Always add changed exceptions to the upload list
2010-04-12 10:00:48 -07:00
Marc Blank
536a36555b Merge "Always add changed exceptions to the upload list" into froyo 2010-04-12 09:57:57 -07:00
Marc Blank
c5c5bf7da7 Always add changed exceptions to the upload list
* We were adding deleted exceptions to the "deleted" list; this is bad,
  because the exception then gets deleted from the database after the
  sync.  The symptom is that the deleted exception reappears on the
  calendar.

Bug: 2587837
Change-Id: If497f82ba0b2b817d1cef6165ded23d19876528f
2010-04-11 15:33:39 -07:00
Marc Blank
605433f78d am 3b19278a: Only allow the account mailbox to attempt provisioning
Merge commit '3b19278a24ec6f1062d3c5e38580fe9fb20326cf' into froyo-plus-aosp

* commit '3b19278a24ec6f1062d3c5e38580fe9fb20326cf':
  Only allow the account mailbox to attempt provisioning
2010-04-11 11:55:37 -07:00
Marc Blank
3b19278a24 Only allow the account mailbox to attempt provisioning
* We were allowing all sync services to attempt provisioning, but this
  could potentially lead to a race condition in which two different
  policy keys are created on the server (this is speculative)
* Change to allow only the account mailbox to attempt provisioning
* Log policy keys when verbose exchange logging is enabled
* We'll see if this solves the referenced bug

Bug: 2569162
Change-Id: I36c60098a4866882a8f9f4c288da54ea378d9aee
2010-04-11 09:45:49 -07:00
Marc Blank
6155bc2b10 am 6a4eae5f: Fix upload of multi-day all day events
Merge commit '6a4eae5f4104599cddfea67705cc4d594ee7d47f' into froyo-plus-aosp

* commit '6a4eae5f4104599cddfea67705cc4d594ee7d47f':
  Fix upload of multi-day all day events
2010-04-11 09:45:01 -07:00
Marc Blank
6a4eae5f41 Fix upload of multi-day all day events
* We were assuming a single day for all-day events
* Use the actual end date
* Make sure we send date/time back to server in local TZ
* Also fixes #2500863

Bug: 2578776
Change-Id: I58767a574248935b9840ce93e634a24e54abe62f
2010-04-10 18:03:39 -07:00
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