Commit Graph

2266 Commits

Author SHA1 Message Date
The Android Open Source Project
f19a02ac69 am eaf951c5: am 75753107: reconcile main tree with open-source eclair
Merge commit 'eaf951c59631829c84ac71b413cf7b2ff186be17'

* commit 'eaf951c59631829c84ac71b413cf7b2ff186be17':
  android-2.1_r1 snapshot
2010-02-05 14:10:23 -08:00
Marc Blank
518a562de3 Merge "Initial implementation of EAS security" 2010-02-05 13:44:38 -08:00
Marc Blank
a1c708670b Merge "Fix #2422815 (Exception in EAS calendar upsync)" 2010-02-05 12:34:25 -08:00
Marc Blank
72a5e7d7c1 Initial implementation of EAS security
* This first implementation integrates with early CLs for
  Email app integration with device security
* Check for policies added to validation process
* If the server has no policy requirements, there is no change
  to the existing process
* We automatically declare a set of policies to be unsupported
  if any are known to the sync adapter to be unsupported
  (e.g. no attachments or password history)
* We call isSupported (PolicySet) to determine whether other
  policies use values that the OS can support (e.g. password length,
  inactivity time, etc.)
* Depending on whether the server's policies are unsupported or
  supported, we throw the proper exception back to the caller

Change-Id: I704cb2151dd87f54c83c2aa23976a8ac8e2c501a
2010-02-05 12:33:07 -08:00
Marc Blank
204b7a3bf4 Fix #2422815 (Exception in EAS calendar upsync)
* Exception is due to the presence of values in ContentValues that
  are null (would normally expect those fields to be absent)
* Fix all relevant cases that might produce an NPE in this case

Bug: 2422815
Change-Id: I637a21307c2d518912edce093de90a06d94614e5
2010-02-05 11:59:22 -08:00
Andrew Stadler
3d2b3b3b35 Logic to move phone into security-admin mode
* Create notification to display when syncs fail due to security
* Create psuedo-activity (no UI) to manage device admin state transitions
* Clean up and flesh out SecurityPolicy APIs'
* Add placeholders in EasSyncService showing how to react when policies
    are not met and sync cannot continue.

Note:  There are some STOPSHIP todo's at the top of SecurityPolicy.java.
These should explain any code that you might think is "missing".
2010-02-05 11:10:39 -08:00
The Android Open Source Project
eaf951c596 am 75753107: reconcile main tree with open-source eclair
Merge commit '75753107afb6a66c237f6874cc52eb48bf1d3cdf' into eclair-plus-aosp

* commit '75753107afb6a66c237f6874cc52eb48bf1d3cdf':
  android-2.1_r1 snapshot
2010-02-05 08:40:02 -08:00
The Android Open Source Project
75753107af reconcile main tree with open-source eclair 2010-02-05 08:09:39 -08:00
Marc Blank
4d2a701844 Merge "Fix #2420732 (crash in Google Services Framework)" 2010-02-04 17:31:14 -08:00
Marc Blank
0bbe34bce5 Fix #2420732 (crash in Google Services Framework)
* Exchange calendar sync created Event records for exceptions
  that didn't have a _sync_id
* This caused google calendar sync to try to upload these
  Events as new, which caused an Exception to be thrown
* Fixed EAS calendar sync adapter to generate a _sync_id for
  exceptions in the form <parentId>_<exception start time>

Bug: 2420732
Change-Id: I46769175ca89ffa4cec4fe8b0c35ef2242536185
2010-02-04 15:23:09 -08:00
Andrew Stadler
a1550678af Integrate policies into account setup process
* Rename SECURITY_POLICIES_REQUIRED to SECURITY_POLICIES_UNSUPPORTED
* Create new pathway for SECURITY_POLICIES_REQUIRED, making it advisory
* Cleaned up strings for account setup error dialogs
* Refactored AccountSetupExchange.onActivityResult() to split up the
  three primary use cases, making them more readable.
* Always finish() in AcccountSetupAccountScreen, because it's usually
  cleaner to return to the previous screen (enter username & password).
2010-02-04 15:04:48 -08:00
Makoto Onuki
182ccb5002 Merge "Remove exchange readme and update script" 2010-02-04 14:42:17 -08:00
Makoto Onuki
217466edce Remove exchange readme and update script 2010-02-04 13:09:34 -08:00
Marc Blank
48e20b81e6 Fix #2415185 (Email disappears after a while)
* Exchange account validation tests security policies by sending a
  FolderSync command and determining whether this generates an
  error
* Unfortunately, we use the real deviceId when sending the command
  and this causes the next real sync to fail such that all data is
  wiped and reloaded (the bug)
* The fix is to use a false device id while doing validation

Bug: 2415185
Change-Id: Ibe577e36f770d737ba5952b347aa0d73bda3568a
2010-02-04 12:39:07 -08:00
Marc Blank
8f8179f07e Merge "Add calendar sync checkbox to account settings screen" 2010-02-04 12:24:52 -08:00
Makoto Onuki
0e4f9a834a Merge "Add a readme about removing exchange support." 2010-02-04 11:45:47 -08:00
Satoshi Kataoka
dd579f49d1 Merge "Change mdpi-icon for Email Application" 2010-02-04 11:22:51 -08:00
Marc Blank
0692ec4836 Fix #2414056 (NPE after delete account)
* Add check for deleted mailbox

Bug: 2414056
Change-Id: I20aea69b0ad2c2ad2eacb76febcafb881f9eecc3
2010-02-04 10:38:18 -08:00
Marc Blank
a1c997a2b6 Add calendar sync checkbox to account settings screen
Bug: 2414157
Change-Id: I60ead139552f3e7c86b113f8b8b10ef3cf57abbf
2010-02-04 10:28:37 -08:00
satok
f5c8acce72 Change mdpi-icon for Email Application 2010-02-03 22:03:11 -08:00
satok
d9080ed32e Add UI for Signature in Email Application
Bug: 1323618

- changed summary of signature to show hint if signature is not set
2010-02-04 10:28:55 +09:00
Makoto Onuki
235c8f6d35 Add a readme about removing exchange support. 2010-02-03 16:44:05 -08:00
Marc Blank
7c6c1fd519 Merge "Build proper TimeZoneInformation strings for upsync; fix bugs" 2010-02-03 14:42:23 -08:00
Marc Blank
6f3013b787 Build proper TimeZoneInformation strings for upsync; fix bugs
* Create full TZI strings for upload of events (previously, we
  omitted DST information)
* Add documentation to some unit tests
* Put in correct logic for determining if upload needed
* Fix problem w/ parsing empty tags

Change-Id: I268ce8a2db30b3cfdf0e44f6a78befd6bd933243
2010-02-03 14:41:45 -08:00
Makoto Onuki
91237e9dcb Adding script for building Email app without exchange.
remove-exchange-support.sh makes it possible to build the email app without
exchange support.

This script:
- removes all packages under com.android.exchange.
- removes all lines surrounded by EXCHANGE-REMOVE-SECTION-START and
  EXCHANGE-REMOVE-SECTION-END

And the resulting source should still build and run fine.

Bug: 2369784
2010-02-03 11:39:46 -08:00
Andrew Stadler
8bb0ee3b92 Fix auto-discover / account verification logic
New behavior:
 * There are two primary paths through this activity:
 *   Edit existing:
 *     Load existing values from account into fields
 *     When user clicks 'next':
 *       Confirm not a duplicate account
 *       Try new values (check settings)
 *       If new values are OK:
 *         Write new values (save to provider)
 *         finish() (pop to previous)
 *
 *   Creating New:
 *     Try Auto-discover to get details from server
 *     If Auto-discover reports an authentication failure:
 *       finish() (pop to previous, to re-enter username & password)
 *     If Auto-discover succeeds:
 *       write server's account details into account
 *     Load values from account into fields
 *     Confirm not a duplicate account
 *     Try new values (check settings)
 *     If new values are OK:
 *       Write new values (save to provider)
 *       Proceed to options screen
 *       finish() (removes self from back stack)
* Added unit test for new loadFields method

Bug: 2412300
2010-02-03 10:38:27 -08:00
Makoto Onuki
b854d05a89 Change EAS authenticator's label according to the vendor policy.
Our original plan was to disable both authenticators by default, and enable
one of then on boot.  However, it turned out existing exchange accounts will
be removed if there's no enabled authenticators for the account type.
So, instead, in this patch we initially enable only the default one, and switch
to the other one on boot if the vendor policy indicates so.

(If a device has a vendor policy apk, it should also have the email app
preloaded, so changing the label at boot time isn't too late.)

Bug: 2382710
2010-02-02 16:25:29 -08:00
Makoto Onuki
130988e49d Merge "Gather common exchange related methods into one place" 2010-02-02 13:48:04 -08:00
Andy Stadler
561e10d4c0 Merge "Clean up exception handling in VendorPolicyLoader" 2010-02-02 13:39:30 -08:00
Makoto Onuki
9fe51f6329 Gather common exchange related methods into one place
So that it'll be easier to remove exchange dependency.
2010-02-02 13:36:45 -08:00
Makoto Onuki
049509d10e Merge "Move Eas.ACCOUNT_MANAGER_TYPE out of the package." 2010-02-02 13:34:04 -08:00
Andrew Stadler
a6e6dd096c Clean up exception handling in VendorPolicyLoader
Per code review suggestions, clean up exception handling, and add
commentary to make intended behavior more explicit.

Followup to: 0434fef1f6
Bug: 2413388
2010-02-02 12:19:49 -08:00
Andrew Stadler
0434fef1f6 Fix crash in VendorPolicyLoader
* Create unit test to reproduce crash
* Fix handling of empty bundle (the default return value)
* Clean up some exception handling in the policy module loader, which
  reduces some unneeded logging.

Bug: 2413388
2010-02-02 10:41:56 -08:00
Marc Blank
cfbbb99c67 Merge "Handle upsync of multiple BYDAY values; add some unit tests" 2010-02-01 17:00:35 -08:00
Andrew Stadler
d62860821c Additional SecurityPolicy functionality
* Begin wiring into system DevicePolicyManager requirements
* Semi-real implementations of isSupported() & isActive()
* Added new API (placeholder) updatePolicies()
* Updated existing unit tests as needed

Bug: 2387961
2010-02-01 16:48:16 -08:00
Marc Blank
a825939459 Handle upsync of multiple BYDAY values; add some unit tests
Change-Id: If3be28df41ed88cb83edca2f6ea6ca1f734f506f
2010-02-01 16:44:16 -08:00
Andrew Stadler
ecb1af8041 Finish up IMAP ID implementation
* scrub all external strings to keep them compliant for IMAP protocol
* move Build.MODEL to x-android-device-model
* send x-android-mobile-net-operator
* send AGUID
* unit tests for above
* retrieve providers from VendorPolicyLoader

Bug: 2332183
2010-02-01 15:53:46 -08:00
Makoto Onuki
faed6178b1 Move Eas.ACCOUNT_MANAGER_TYPE out of the package.
Moved Eas.ACCOUNT_MANAGER_TYPE to Email.EXCHANGE_ACCOUNT_MANAGER_TYPE.

This constant is not related to the exchange protocol, and referred in
a lot of different places.  Moving it out of the package will make it a lot
simpler when removing exchange dependency.
2010-02-01 15:38:15 -08:00
Makoto Onuki
b89bc81f54 Merge "Fix confusing setup screen title." 2010-02-01 14:25:54 -08:00
Makoto Onuki
e5c3c98e9a Fix confusing setup screen title.
Change the title of the screen for adding an exchange account from "Set up email" to "Add an Exchange account".

Bug: 2159019
2010-02-01 14:24:38 -08:00
Marc Blank
31ac14aa51 Remove default EAS Calendar parser logging
Change-Id: Id05d9721b1f40242cb9f77ae21575bfef2d1b671
2010-02-01 14:12:59 -08:00
Marc Blank
7a2776a5b4 Further work on Exchange calendar sync; exception upsync
* Add code to upsync exceptions; debug same
* Use AccountManager to handle sync keys (as w/ Contacts)
* Add unit tests in next CL

Change-Id: Ib8526d70de33ed7e551b9713a3bbf1ad80612948
2010-02-01 13:10:41 -08:00
Marc Blank
0088918e4e Merge "Additional work on new Event upload to EAS server" 2010-01-31 09:18:27 -08:00
Marc Blank
dc6930c0b3 Additional work on new Event upload to EAS server
* Added support for reminders and recurrences
* Note that Duration class is copied from CalendarProvider with only
  formatting changes

Change-Id: Icf399df422f813ba8e7880646bfbc96a2156a204
2010-01-31 09:17:50 -08:00
Makoto Onuki
e853286713 Merge "Move non-exchange specific classes to com.android.email.service." 2010-01-29 16:22:23 -08:00
Makoto Onuki
8ee17c7012 Unifying dupe code in Debug.java and Email.java. 2010-01-29 15:44:56 -08:00
The Android Open Source Project
aaee7a460d reconcile android-2.1_r1 snapshot 2010-01-29 14:09:23 -08:00
Makoto Onuki
bb9b5163c1 Move non-exchange specific classes to com.android.email.service. 2010-01-29 10:37:39 -08:00
Marc Blank
d99dbf01fb Fix problem with Event creation by EAS calendar sync
* Turns out that DURATION is required by CalendarProvider, and
  DTEND has a different meaning than it does to EAS
* Fix downsync to create proper recurring events

Change-Id: Ibf85422de73579a93de89b2c27c13f96994bedc8
2010-01-28 12:31:36 -08:00
Marc Blank
f3fcb8929e Implement Exchange calendar sync support
What should be working:
* Events sync down from server and appear in calendar
* Recurrences and exceptions appear in calendar
* Changed events on server should be reflected in calendar
* Deletions on server should be reflected in calendar
* Push of new/changed/deleted events should work
* Changes on device are NOT synced back to server
* New, single events on device are synced back to server
  (no time zone, attendee, or recurrence support)
* Checkbox for syncing calendar added to setup flow
* System sync glue in manifest, etc.
* Bugs are to be expected
* A few unit tests; needs more

Change-Id: I7ca262eaba562ccb9d1af5b0cd948c6bac30e5dd
2010-01-28 09:18:48 -08:00