Commit Graph

2301 Commits

Author SHA1 Message Date
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
Marc Blank
0055f37a82 Merge "Fix bug with meeting responses" 2010-02-17 09:44:36 -08:00
Makoto Onuki
f75571dd29 Merge "Remove hardcoded package name." 2010-02-17 09:33:09 -08:00
Marc Blank
0f17557c46 Fix bug with meeting responses
* We were sending the wrong collectionId to the server, resulting
  in a failure (status == 2)

Change-Id: I02ef4039a4ecfbc54ab5cdac2c36e39aea5d7170
2010-02-17 08:53:46 -08:00
Mihai Preda
1575e7860d MessageCompose: fix delete quoted on reply/forward for EAS.
Also fix display of quoted html text for a draft (Exchange 2007).

Bug 2363249
Bug 2444496
2010-02-17 15:28:25 +01:00
satok
820d4830cc Show hidden message when the pop-up menu is shown.
Bug: 2239403

- added animation listener
- change the position of a message when the message is hidden by the pop-up menu.
2010-02-17 16:46:31 +09:00
Andy Stadler
5cb0ccc25b Merge "Placeholder invite-accept UI" 2010-02-16 22:05:55 -08:00
Andrew Stadler
643ca675b6 Placeholder invite-accept UI
This is a lightweight placeholder so calendar functionality can be
tested.  Simply presents a message about the invitation, and a set of
yes/maybe/no buttons to click.

The UI is shown whenever the message appears to contain an invite.

There are many elements left to be done here:
TODO: response code (EAS protocol) doesn't seem to work
TODO: use real assets & design
TODO: provide a click-link into calendar event
TODO: show calendar icon in messagelist too
TODO: (if possible) persist user's response in button state?
2010-02-16 22:02:50 -08:00
Makoto Onuki
ea1eb7a231 Merge "Use SSLCertificateSocketFactory to generate "insecure" ssl socket." 2010-02-16 18:19:47 -08:00
Makoto Onuki
c5912e4920 Use SSLCertificateSocketFactory to generate "insecure" ssl socket.
Use SSLCertificateSocketFactory.getDefault() to get an SSLSocketFactory
which performs SSL certificate checks, and getInsecure() to get one
which doesn't (for "accept all certificates").

Bug 2226160
2010-02-16 17:23:20 -08:00
Makoto Onuki
0fef1f14b3 Remove hardcoded package name.
Removed the hardcoded package name in account_preferences.xml.  Now we launch
the PreferenceScreen with only the action.  Added an intent-filter to the
preference screen to catch it.

Bug 2447903
2010-02-16 17:05:23 -08:00
Andrew Stadler
af55e3e436 Respond to loss of device admin status
If the user revokes device admin status, reset our internal state and
the state of any accounts that might have been depending on it.  This
halts syncing immediately and rewinds the security/provisioning state
of any such accounts to a known state (as if the account had just been
created.)

Bug: 2387961
2010-02-16 14:33:08 -08:00
Andrew Stadler
105c1786f7 Replace limit-unlock with force-lock.
Followup to 9fc7996adbb5d1d933fecde3cb9393877bc1915d
2010-02-16 13:40:20 -08:00
Marc Blank
4284bc07fb Fix #2321966 (handle EAS version upgrade)
* Add code to recheck protocol version at least once a day

Bug: 2321966
Change-Id: I938a23e1330b7ccfc2149c2988b53462f6a9d7d1
2010-02-16 10:20:38 -08:00
Marc Blank
70859ecb4e Merge "Add meetingInfo column to Message; use for meeting invites" 2010-02-16 10:19:29 -08:00
Marc Blank
4006e5fc22 Add meetingInfo column to Message; use for meeting invites
* Added a meetingInfo column to the Message database
* When a meeting invite is received, the start time is stored here
  in ms from start of epoch.  Note that this field is defined to be
  a String, for extensibility
* Update ProviderTests

Change-Id: If44892d27ccc5ebdc1f8667befafb8b8a27a2cf4
2010-02-16 10:18:33 -08:00
Makoto Onuki
83457b0235 Preparing for renaming package.
- Made tests use the new package-name-free constructor of ActivityInstrumentationTestCase2.

Bug 2226160
2010-02-16 09:16:15 -08:00
Doug Zongker
33c972e0c6 use the framework Base64 instead of android-common
Change-Id: Ib4f75f66fe8acb1bb5de614bb10e8c938b1d27ef
2010-02-16 09:10:18 -08:00
Marc Blank
d0377b8bb3 Merge "Add support for Exchange 2003 provisioning" 2010-02-15 19:47:42 -08:00
Marc Blank
ea0aa9343e Add support for Exchange 2003 provisioning
* Provisioning for Exchange 2003 and Exchange 2007 now supported
* Added end-to-end test of Exchange 2003 provisioning parser

Change-Id: I1f86f2909351a8220b963551cd33fecdf59a7e26
2010-02-15 19:46:40 -08:00
Satoshi Kataoka
63647d7870 Merge "Make "Message deleted" be plural" 2010-02-15 18:06:24 -08:00
Marc Blank
cf7581c51c Add support for UNTIL in recurrences
Change-Id: I983e1bcb209e794b462ec43efaccefe95bf9bd9d
2010-02-15 13:48:57 -08:00
satok
dffe2f486d Make "Message deleted" be plural
Bug: 2264751
2010-02-15 15:31:30 +09:00
Satoshi Kataoka
c1cea617cc Merge "Add Signature to Email Composer" 2010-02-13 18:44:36 -08:00