Commit Graph

2124 Commits

Author SHA1 Message Date
Eric Fischer
ed4d09a614 Merge "Remove xliff tags that kept the word "deleted" from being translated." 2010-02-25 15:35:49 -08:00
Eric Fischer
ab02fcb3d3 Remove xliff tags that kept the word "deleted" from being translated.
Bug 2463678
2010-02-25 14:20:31 -08:00
Marc Blank
1270218f32 Merge "Fix some nasty bugs w/ Exchange calendar upsync" 2010-02-25 11:59:39 -08:00
Marc Blank
481ad6a3c5 Fix some nasty bugs w/ Exchange calendar upsync
* In #2469254, uploaded new events were rejected because the time zone was
  sent after dates; this doesn't matter to Exchange 2007, but it apparently
  does to Exchange 2003
* Also, I noticed that upsync was upsyncing all new events, regardless of
  whether the event belonged to the Calendar being synced!  So this is
  fixed as well.

Bug: 2469254
Change-Id: I651d591cf26e00b414f6da19897fddcdb840c97c
2010-02-25 11:59:04 -08:00
Dianne Hackborn
4c868ce21f Update to reflect android-common no longer in framework. 2010-02-25 10:57:59 -08:00
Makoto Onuki
5bdff23a56 Merge "Refactored out Account related methods into a new base class." 2010-02-25 09:26:49 -08:00
Marc Blank
d4dc57972d Fix #2469569 (Broken EAS calendar downsync)
* Category parsing switch statement was missing a break;

Bug: 2469569
Change-Id: If815300a2ef3824f837f5fa41f55b9421cac8d9b
2010-02-24 18:54:35 -08:00
Makoto Onuki
5570bc1570 Refactored out Account related methods into a new base class.
These will be useful for other tests too, and I'm planning to use some.
2010-02-24 17:34:50 -08:00
Marc Blank
cdf9dbfa28 Add logging for persistent wakelock behavior
* Temporarily add email logging for wakelock hold requests

Change-Id: I0233248c34138b3af63abe75e97171da3f4f0031
2010-02-24 15:56:43 -08:00
Marc Blank
89be77eaea Send replies to exchange meeting requests
* When the user selects accept/decline/tentative in MessageView, we now send
  an email to the organizer, with an iCalendar attachment indicating the reply
* Added a unit test for the reply case, but more tests to be added to handle
  other circumstances

Change-Id: Iff799d88a92b6546735bf4965b22febf3a82b56f
2010-02-24 15:13:57 -08:00
Marc Blank
438dfe64ec Fix visibility of meeting invite controls
* Was checking for any meeting related email
* Changed to look specifically for incoming meeting invites
* Bug noticed during debugging

Change-Id: I8f43d7a506939dbfc0504f96b249e5c17107bf47
2010-02-23 14:44:43 -08:00
Marc Blank
d12bb138b0 Merge "Fix bugs in SimpleIcsWriter" 2010-02-23 14:26:41 -08:00
Marc Blank
1f4b1b3bd1 Fix bugs in SimpleIcsWriter
* Guilty of failing to run the unit tests
* Fix the (obvious) issues

Change-Id: If12e02facce768ca2d410320bea68a2ca2c116c6
2010-02-23 14:25:18 -08:00
Makoto Onuki
ec88f04dee Merge "Patch for issue 2363606: Make EAS sync window default 3 days." 2010-02-23 12:29:42 -08:00
Makoto Onuki
353bdbc15a Merge "Remove LOCAL_SDK_VERSION. We haven't finished unbundling." 2010-02-23 12:28:26 -08:00
Makoto Onuki
6854a4f24a Patch for issue 2363606: Make EAS sync window default 3 days. 2010-02-23 12:25:25 -08:00
Makoto Onuki
94de6cdf29 Remove LOCAL_SDK_VERSION. We haven't finished unbundling. 2010-02-23 12:19:55 -08:00
Marc Blank
3b97e1769a Merge "Fix #2443881 (Don't display User name field for EAS account)" 2010-02-23 11:40:15 -08:00
Marc Blank
18d7222359 Send meeting invitations for new/updated Exchange events
* Wrote utility to create an ics file (iCalendar) based on a
  CalendarProvider Event.  This is a good first pass, but we need
  to consider whether to include alarms, etc.
* Use aforementioned utility and new convenience method to send
  meeting invitations to attendees of newly created meetings (events)
  when they are uploaded to the server via the CalendarSyncAdapter
* Overall, attempted to modify existing provider and rfc822 output
  code as little as possible.  Rfc822Output is actually very limited
  in its capabilities and should be made more robust in future

Change-Id: Ie20b9137df56dc414de6737d05fa40ec9cdf47e0
2010-02-23 11:37:18 -08:00
Mihai Preda
297b8aaae1 Merge "Email: remove unused strings and resources." 2010-02-23 08:47:09 -08:00
Andrew Stadler
5afa187791 Create a PackedString utility class
* We can use this for meeting request information which will start out with
  one or two pieces of information, but might grow in the future.
* Binary compatible with Address.pack() format, so we can eventually
  combine code.
2010-02-22 22:34:45 -08:00
Andy Stadler
4ce8150977 Merge "Remove ProGuard from tests, too." 2010-02-22 21:08:09 -08:00
Andrew Stadler
db8ef02fea Remove ProGuard from tests, too.
Follow-up to:  58fbf8c1af
2010-02-22 21:06:59 -08:00
Makoto Onuki
0faa9881dc Merge "Don't use hidden APIs" 2010-02-22 15:54:44 -08:00
Andy Stadler
eaf5bbcdff Merge "Disable ProGuard. It breaks debugging." 2010-02-22 13:59:53 -08:00
Andrew Stadler
58fbf8c1af Disable ProGuard. It breaks debugging. 2010-02-22 13:39:55 -08:00
Andy Stadler
35e5885e9e Merge "First part of Exchange meeting request/reply implementation" 2010-02-22 12:59:05 -08:00
Andrew Stadler
3aaba9eb87 First part of Exchange meeting request/reply implementation
* Added two columns to Attachment in EmailProvider
  content: content that is written directly as an attachment
  suppressDisposition: to suppress the content-disposition header
  All meeting invitation emails use these two columns; the first
  for ics attachment data (which is quite small, rarely over 1k),
  and the second to indicate NOT sending the content-disposition
  header; without this, Exchange will consider the ics as an
  attachment rather than an iMIP style message (rfc2447)
* Modified tests to include these columns; added upgrade code for
  new database version
* New columns and code are designed to be usable outside Exchange,
  although there are no other clients of the code at this point.
* Modified Rfc822Output to use the content field, if present, in
  lieu of retrieving attachment data via URL; added support for
  suppressing the Content-Disposition header
2010-02-22 12:57:33 -08:00
Mihai Preda
dc348ea94b Email: remove unused strings and resources.
Bug 2456796.
2010-02-22 21:53:50 +01:00
Makoto Onuki
8068c99945 Don't use hidden APIs
- The entire android.pim package is hidden.
  Use java.text.ParseException instead of android.pim.DateException.

- TelephonyManager.getDefault() is hidden.
  Use Context.getSystemService() instead.

- Use newly added Base64 in the framework.

Bug 2226160
2010-02-22 12:49:52 -08:00
Makoto Onuki
988981a9ad Follow up to I07496942.
- Now that reconcileAccountsWithAccountManager() is static, we don't need to
  instantiate SyncManager.

- Don't need to set mResolver.  reconcileAccountsWithAccountManager() doesn't
  use it.
2010-02-22 11:09:08 -08:00
Marc Blank
5b46171b83 Fix #2443881 (Don't display User name field for EAS account)
* Make the field and label GONE for EAS accounts
* Enable the "Done" button at all times for EAS accounts
* Add test case for this, and clean up bad formatting in tests

Bug: 2443881
Change-Id: Ic80b001e443fa37b7cfeb810b1f31edf22b065b9
2010-02-20 15:05:39 -08:00
Marc Blank
c98a613153 Merge "Fix #2457665 (Guests don't appear in Exchange events)" 2010-02-19 16:59:11 -08:00
Marc Blank
15036ca062 Fix #2457665 (Guests don't appear in Exchange events)
* The "hasAttendeeData" column needs to be set to 1 for all Exchange
  events (the case in which the value would be zero doesn't pertain
  to Exchange events)
* Also, move code for organizer attendee to the proper place

Bug: 2457665
Change-Id: I3260f883135bb222ce475ccbabf5ba151ab7f557
2010-02-19 16:58:09 -08:00
Andrew Stadler
074969426b Minor code-review cleanups to previous CL
Related: de7d21c10a
Bug: 2454870
2010-02-19 16:24:57 -08:00
Andrew Stadler
de7d21c10a Fix various problems with SyncManagerAccountTests
1.  Destructive of existing user accounts in device
2.  Can get confused (miscounting) due to existing user accounts
3.  Cleaned up use of context and mock context
4.  Disallow account backup and account security updates when testing
5.  Make account manager removeAccount() calls blocking, so the test
    does not proceed until the accounts are really deleted.

Bug: 2454870
2010-02-19 15:50:04 -08:00
Makoto Onuki
a8e1f88c05 Merge "Don't use hardcoded package name." 2010-02-19 10:07:31 -08:00
Marc Blank
2867bf775a Merge "Fix #2451630 (No calendar after upgrading Eclair->Froyo)" 2010-02-18 20:27:20 -08:00
Marc Blank
d3fba0a2d7 Fix #2451630 (No calendar after upgrading Eclair->Froyo)
* Initialization of CalendarProvider Calendar was being done at
  account creation time, but Eclair accounts won't have had this
  done.
* Move Calendar creation code into CalendarSyncAdapter where it
  will be created before the first sync.

Bug: 2451630
Change-Id: I74c669d99f4c8aae4c5847f5cb9b0ca7f44929e2
2010-02-18 20:26:32 -08:00
Makoto Onuki
d6d843a10b Don't use hardcoded package name.
Bug 2454892
2010-02-18 16:49:49 -08:00
Makoto Onuki
62a7b7fe76 Apply proguard to email.
Redoing I10a82fd8fdc16febcd880bfcf519843d5562f8e6 with more flags to keep test
only methods.
2010-02-18 16:47:19 -08:00
Makoto Onuki
4f1b4191d1 Revert "Enable Proguard."
This reverts commit c237ae8c85.

Reason: We need more flags for unit tests
2010-02-18 14:41:56 -08:00
Satoshi Kataoka
9687b174b8 Merge "Tiny fix of updateListPosition in MessageList" 2010-02-17 21:22:02 -08:00
satok
263f9bfcfb Tiny fix of updateListPosition in MessageList 2010-02-18 14:04:11 +09:00
Ying Wang
9fd4683238 Merge "Enable Proguard." 2010-02-17 20:38:32 -08:00
Ying Wang
c237ae8c85 Enable Proguard. 2010-02-17 19:08:10 -08:00
Satoshi Kataoka
13253154c2 Merge "Show hidden message when the pop-up menu is shown." 2010-02-17 18:10:44 -08:00
Marc Blank
0f88306db5 Merge "Make sure we always send an attendee name w/ email address" 2010-02-17 16:04:28 -08:00
Marc Blank
476ee8f790 Make sure we always send an attendee name w/ email address
* EAS requires an attendee name in addition to an address in upsynced
  Calendar items.

Change-Id: I9384dcba6fd2fff8be960e18297ef7f641e0abe7
2010-02-17 16:03:59 -08:00
Dianne Hackborn
4ae83c58b3 Fix issue #2420412: API review: DeviceAdmin API changes 2010-02-17 10:30:25 -08:00