Commit Graph

2796 Commits

Author SHA1 Message Date
Andrew Stadler
da0fb1784c am 5ac8a35c: Merge "Fix uncommanded exit from MessageList with 2+ accounts" into froyo
Merge commit '5ac8a35c4290d9e3ce22eb28341214189a40fc6c' into froyo-plus-aosp

* commit '5ac8a35c4290d9e3ce22eb28341214189a40fc6c':
  Fix uncommanded exit from MessageList with 2+ accounts
2010-04-23 13:34:23 -07:00
Andrew Stadler
5ac8a35c42 Merge "Fix uncommanded exit from MessageList with 2+ accounts" into froyo 2010-04-23 13:30:48 -07:00
Marc Blank
169e33789b am 819de68b: am de3ae172: Merge "Add additional test for likely NAT timeout" into froyo
Merge commit '819de68b01ec9f8d44e4fa1e16bf4900abf90b16' into kraken

* commit '819de68b01ec9f8d44e4fa1e16bf4900abf90b16':
  Add additional test for likely NAT timeout
2010-04-23 12:49:23 -07:00
Marc Blank
819de68b01 am de3ae172: Merge "Add additional test for likely NAT timeout" into froyo
Merge commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d' into froyo-plus-aosp

* commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d':
  Add additional test for likely NAT timeout
2010-04-23 12:45:55 -07:00
Marc Blank
de3ae17246 Merge "Add additional test for likely NAT timeout" into froyo 2010-04-23 12:42:30 -07:00
Andrew Stadler
88fb7f7cd0 Fix uncommanded exit from MessageList with 2+ accounts
* When you have 2 or more accounts configured, MessageList gets confused.
* If you are viewing a mailbox from account A, and account B does a
  background sync, MessageList gets confused by the reports coming back
  from the Controller.  It gives up and returns to the Accounts list.
* This change adds a check for the current account and ignores the
  MessageList updates if we weren't actually waiting for them.
* To test the positive case for this code (make sure we didn't break it),
  verify that the inbox on an IMAP account is displayed properly
  immediately after you add it.

Bug: 2619513
Change-Id: Ib31254b4099ba6b7922b06d42e2b7928551e4fb2
2010-04-23 12:17:43 -07:00
Marc Blank
bc27894815 Add additional test for likely NAT timeout
* This prevents unnecessary delays in receiving push mail
* At present, there is a likely 5 minute delay on receiving new pushed
  mail on the network displaying the behavior we're testing for

Bug: 2615293
Change-Id: Ic42e576fa683790f96434fcbad5ee873d0730f6d
2010-04-23 10:53:21 -07:00
Marc Blank
8a19af3739 Fix upload/download of attendee status
* It turns out that the UI uses selfAttendeeStatus and the attendee's status
  from the Attendees table in confusing and undocumented ways
* selfAttendeeStatus is used in the UI, but only in certain cases. Generally speaking,
  the Attendees table status is definitive.  However, when the user sets his status
  from the UI, this data is reflected in the event's selfAttendeeStatus, since for EAS,
  the user is always the owner of his calendar
* On downsync,  we'll put the user's busy status into the Attendees table
* On upsync, we'll send busy status based on the user's attendee status in the
  Attendees table
* We'll use selfAttendeeStatus only to determine whether the user has manually changed
  his status via the UI (as before)

Bug: 2615586
Change-Id: I3a82474cfd07cbf5aa595e5214807cb55005cefa
2010-04-23 09:07:53 -07:00
Marc Blank
f44b9440d8 Add checks for null in SyncManager
Bug: 2619723
Change-Id: Iea3c3258274bdf86784e232922290841ad0d9d36
2010-04-22 17:43:30 -07:00
Makoto Onuki
3844bbcaaf am 2ca8d734: am 6cfa8001: Merge "Fix failing unit tests" into froyo
Merge commit '2ca8d7347db3975746ad87347de57fd5800bf5d4' into kraken

* commit '2ca8d7347db3975746ad87347de57fd5800bf5d4':
  Fix failing unit tests
2010-04-22 13:24:40 -07:00
Marc Blank
0acd7e9c77 am d764ce7e: am 1880ad6a: Send correct busy status information in upsyncs to EAS
Merge commit 'd764ce7e4442b0027a891582cbdd728487a49f97' into kraken

* commit 'd764ce7e4442b0027a891582cbdd728487a49f97':
  Send correct busy status information in upsyncs to EAS
2010-04-22 13:23:55 -07:00
Makoto Onuki
2ca8d7347d am 6cfa8001: Merge "Fix failing unit tests" into froyo
Merge commit '6cfa8001a8f352fa2a51925c7552f772796d9cd1' into froyo-plus-aosp

* commit '6cfa8001a8f352fa2a51925c7552f772796d9cd1':
  Fix failing unit tests
2010-04-22 09:53:58 -07:00
Makoto Onuki
6cfa8001a8 Merge "Fix failing unit tests" into froyo 2010-04-22 09:51:21 -07:00
Makoto Onuki
25d55ed266 Fix failing unit tests
Bug 2614782

Change-Id: I7ed7bf61a567429017f64d9049577ec076331bb2
2010-04-22 09:18:42 -07:00
Marc Blank
d764ce7e44 am 1880ad6a: Send correct busy status information in upsyncs to EAS
Merge commit '1880ad6a83120b89ed239858d27d3e63242160e6' into froyo-plus-aosp

* commit '1880ad6a83120b89ed239858d27d3e63242160e6':
  Send correct busy status information in upsyncs to EAS
2010-04-21 23:00:56 -07:00
Marc Blank
1880ad6a83 Send correct busy status information in upsyncs to EAS
* Fix unit test that was failing

Bug: 2615382
Change-Id: I54c7bdd982d57528f55ce4f4c6804c9f532293fb
2010-04-21 18:25:16 -07:00
Andrew Stadler
d729ff891a am 151b9aa8: am 5d5d7854: Harden UpgradeAccounts against runtime errors (e.g. NPE)
Merge commit '151b9aa8dff6350c9e247579599bf70e1c55eea1' into kraken

* commit '151b9aa8dff6350c9e247579599bf70e1c55eea1':
  Harden UpgradeAccounts against runtime errors (e.g. NPE)
2010-04-21 18:19:27 -07:00
Andrew Stadler
151b9aa8df am 5d5d7854: Harden UpgradeAccounts against runtime errors (e.g. NPE)
Merge commit '5d5d7854c247487c3f8fa1f700c6e9d46aff497d' into froyo-plus-aosp

* commit '5d5d7854c247487c3f8fa1f700c6e9d46aff497d':
  Harden UpgradeAccounts against runtime errors (e.g. NPE)
2010-04-21 18:15:28 -07:00
Andrew Stadler
5d5d7854c2 Harden UpgradeAccounts against runtime errors (e.g. NPE)
* Harden each of the major upgrade steps so any errors (e.g. NPE) are
  caught and that account goes into error state.
* Make sure that any account in error state is abandoned properly - all
  steps skipped except the final delete/cleanup.
* Bugfix: The variable that indicates that an account has gone into an
  error state (upgrade failed) state was being set in the UI thread and
  tested in the worker thread, so it was not properly stopping the
  upgrade of any given account.  Split that variable into two, one for the
  UI thread (set/read by the handler) and one for the worker thread.
* Bugfix: Report errors against the correct account, when 2+ accounts are
  being upgraded.

Bug: 2608483
Change-Id: I571078ae7123b601b53096104c4c5f4ef20da031
2010-04-21 16:27:09 -07:00
Marc Blank
fc08120213 am a0c71419: am 21c04fe3: Merge "Further harden getListOrNull" into froyo
Merge commit 'a0c71419cedaa0f84d12da61e415642b79cc0a9c' into kraken

* commit 'a0c71419cedaa0f84d12da61e415642b79cc0a9c':
  Further harden getListOrNull
2010-04-21 08:18:04 -07:00
Marc Blank
a0c71419ce am 21c04fe3: Merge "Further harden getListOrNull" into froyo
Merge commit '21c04fe31c978fc68c473a5bef5c93b20363fe8e' into froyo-plus-aosp

* commit '21c04fe31c978fc68c473a5bef5c93b20363fe8e':
  Further harden getListOrNull
2010-04-21 08:15:04 -07:00
Marc Blank
21c04fe31c Merge "Further harden getListOrNull" into froyo 2010-04-21 08:10:14 -07:00
Marc Blank
07fb9f8bea Further harden getListOrNull
* Add a bounds check
* Add a test for ImapList

Bug: 2611022
Change-Id: I3ad88fbc8d3145298731ab19ef7ff68d4011bb00
2010-04-20 19:31:29 -07:00
Marc Blank
7fef3f620d am 9c85a39b: am bb11c911: Fix NPE sending mail on servers without Outbox folders
Merge commit '9c85a39b82d0691f3c057dc00dbab87a2b68452e' into kraken

* commit '9c85a39b82d0691f3c057dc00dbab87a2b68452e':
  Fix NPE sending mail on servers without Outbox folders
2010-04-20 11:56:37 -07:00
Marc Blank
9c85a39b82 am bb11c911: Fix NPE sending mail on servers without Outbox folders
Merge commit 'bb11c91175a4beee207324d67b913b91a41bbea7' into froyo-plus-aosp

* commit 'bb11c91175a4beee207324d67b913b91a41bbea7':
  Fix NPE sending mail on servers without Outbox folders
2010-04-20 11:53:07 -07:00
Marc Blank
bb11c91175 Fix NPE sending mail on servers without Outbox folders
* stopPing (in SyncManager) assumes that every mailbox has a serverId
  but this is not the case on some servers, in which case we hit an
  NPE during a check for the account mailbox
* Check for a null serverId when testing for the account mailbox

Bug: 2606385
Change-Id: Idfa8abd8ef9e2c0a2ac01d0b168a21c934f6fdf3
2010-04-19 21:19:49 -07:00
Marc Blank
36d6817cb5 am 51a54f84: am 075d3494: Add admin check before trying a remote wipe
Merge commit '51a54f84f158cd9c18960170197f74a56b54fcd1' into kraken

* commit '51a54f84f158cd9c18960170197f74a56b54fcd1':
  Add admin check before trying a remote wipe
2010-04-19 11:43:21 -07:00
Marc Blank
51a54f84f1 am 075d3494: Add admin check before trying a remote wipe
Merge commit '075d34947fe2ed402997828794bdd99b59bc79ac' into froyo-plus-aosp

* commit '075d34947fe2ed402997828794bdd99b59bc79ac':
  Add admin check before trying a remote wipe
2010-04-19 11:40:09 -07:00
Marc Blank
075d34947f Add admin check before trying a remote wipe
* The code assumed that if we asked for a remote wipe, that it would
  be executed.  This isn't the case, however, if we're not a device
  admin at that time
* Test for Email app as device administrator before trying remote wipe

Bug: 2603931
Change-Id: I09dcff00e77bcf1e40c742c9dee923e6e07eecae
2010-04-18 23:08:28 -07:00
Marc Blank
6c1971f825 am 5e80b90e: am a90bb03c: Merge "Use METHOD_ALERT instead of METHOD_DEFAULT for reminders" into froyo
Merge commit '5e80b90e399b70c6dd93ddd7f5b66279277cf861' into kraken

* commit '5e80b90e399b70c6dd93ddd7f5b66279277cf861':
  Use METHOD_ALERT instead of METHOD_DEFAULT for reminders
2010-04-17 15:00:56 -07:00
Marc Blank
5e80b90e39 am a90bb03c: Merge "Use METHOD_ALERT instead of METHOD_DEFAULT for reminders" into froyo
Merge commit 'a90bb03c259a9cf2e1ca15ef90b00759cd555987' into froyo-plus-aosp

* commit 'a90bb03c259a9cf2e1ca15ef90b00759cd555987':
  Use METHOD_ALERT instead of METHOD_DEFAULT for reminders
2010-04-17 14:58:43 -07:00
Marc Blank
a90bb03c25 Merge "Use METHOD_ALERT instead of METHOD_DEFAULT for reminders" into froyo 2010-04-17 14:54:55 -07:00
Marc Blank
f749f77a81 am 6d09bd24: am 17e8ba7e: Merge "Speed up provision notification after security failure" into froyo
Merge commit '6d09bd247b0b5bf48a88bafc2ef28e25d0148bb7' into kraken

* commit '6d09bd247b0b5bf48a88bafc2ef28e25d0148bb7':
  Speed up provision notification after security failure
2010-04-16 18:23:33 -07:00
Marc Blank
6d09bd247b am 17e8ba7e: Merge "Speed up provision notification after security failure" into froyo
Merge commit '17e8ba7eda1cabf72ac650408abd94f1145397e9' into froyo-plus-aosp

* commit '17e8ba7eda1cabf72ac650408abd94f1145397e9':
  Speed up provision notification after security failure
2010-04-16 18:19:30 -07:00
Marc Blank
17e8ba7eda Merge "Speed up provision notification after security failure" into froyo 2010-04-16 18:16:17 -07:00
Marc Blank
849ba0285c Use METHOD_ALERT instead of METHOD_DEFAULT for reminders
* Exchange has been using METHOD_DEFAULT for reminders, but it turns out
  that this doesn't work.
* Changed to use METHOD_ALERT

Bug: 2604156
Change-Id: Ia76bb2fc150202de9c49af9ab8caf86c9bda775f
2010-04-16 17:48:14 -07:00
Marc Blank
64bd62f46f am 401ae927: am a8f7b3e1: Store all day events w/ UTC timezone
Merge commit '401ae927e62a237f76c7dd1dde83f4ff8f27be91' into kraken

* commit '401ae927e62a237f76c7dd1dde83f4ff8f27be91':
  Store all day events w/ UTC timezone
2010-04-16 16:37:09 -07:00
Marc Blank
401ae927e6 am a8f7b3e1: Store all day events w/ UTC timezone
Merge commit 'a8f7b3e16e97ef8e6d9fb47ae9359f2db5676c94' into froyo-plus-aosp

* commit 'a8f7b3e16e97ef8e6d9fb47ae9359f2db5676c94':
  Store all day events w/ UTC timezone
2010-04-16 16:33:51 -07:00
Marc Blank
a8f7b3e16e Store all day events w/ UTC timezone
* All day events are supposed to be stored w/ UTC as the time zone
* We already zero out hour, minute, and day
* Use DTEND for non-recurring and DURATION for recurring all day events

Bug: 2440161
Change-Id: I31f2e5a355b721c06b4022b57ccc8a29b288a5d9
2010-04-16 15:11:43 -07:00
Marc Blank
23a88a8044 Speed up provision notification after security failure
Bug: 2591899
Change-Id: I038e0b96f03c7dd24e11ee36f3c9464c84fb2930
2010-04-16 14:36:55 -07:00
Marc Blank
5ff98ba1ec am 825999f8: am 095eee41: Set selfAttendeeStatus and busyStatus properly on downsync/upsync
Merge commit '825999f815979519d8d80334a8c1ce0223a89ef2' into kraken

* commit '825999f815979519d8d80334a8c1ce0223a89ef2':
  Set selfAttendeeStatus and busyStatus properly on downsync/upsync
2010-04-16 13:55:04 -07:00
Marc Blank
825999f815 am 095eee41: Set selfAttendeeStatus and busyStatus properly on downsync/upsync
Merge commit '095eee41565900a2509256ffcbf6cd67a4c4e345' into froyo-plus-aosp

* commit '095eee41565900a2509256ffcbf6cd67a4c4e345':
  Set selfAttendeeStatus and busyStatus properly on downsync/upsync
2010-04-16 13:52:30 -07:00
Marc Blank
095eee4156 Set selfAttendeeStatus and busyStatus properly on downsync/upsync
* Set selfAttendeeStatus on download from busy status
* Set busyStatus on upload from selfAttendeeStatus

Bug: 2587076

Change-Id: I34eaa0d3861bcec0cbfd51761b31965e44f5162b
2010-04-16 13:39:51 -07:00
Andrew Stadler
901c23032b am a126a168: am ce592f32: Merge "Remove incorrect error reporting in MessageList" into froyo
Merge commit 'a126a168b6d70143e6cc94531f20ff889b15357b' into kraken

* commit 'a126a168b6d70143e6cc94531f20ff889b15357b':
  Remove incorrect error reporting in MessageList
2010-04-15 15:14:20 -07:00
Andrew Stadler
a126a168b6 am ce592f32: Merge "Remove incorrect error reporting in MessageList" into froyo
Merge commit 'ce592f32f93ab0c682a5bf9582d0abd4c987cbbf' into froyo-plus-aosp

* commit 'ce592f32f93ab0c682a5bf9582d0abd4c987cbbf':
  Remove incorrect error reporting in MessageList
2010-04-15 15:11:47 -07:00
Andrew Stadler
ce592f32f9 Merge "Remove incorrect error reporting in MessageList" into froyo 2010-04-15 15:08:12 -07:00
Andrew Stadler
54607e872d Remove incorrect error reporting in MessageList
* Previously I added a call to updateBanner() during the sequence where
    we update the mailboxlist (searching for the requested mailbox to
    display.)  This was an attempt to provide some error information
    for certain corner case security configuration problems.
* This was misfiring during legitimate connections (specifically, initial
    sync of valid EAS accounts) and causing a Connection Error message
    when none was intended.
* Rather than continue hacking, I'm simply removing the error banner
    from updateMailboxList.
* This is essentially a direct rollback of change
    c98b64c801, although I've added
    a bit more commentary than there was originally.
* The long-term solution, rather than continue band-aiding this, is to
    move most of this logic into a service independent of the UI, and
    provide more organized error reporting.

Bug: 2585159
Bug: 2599377
Change-Id: I99b7b1c8a7cfaa3fd3ff9b578d5721f05133d88a
2010-04-15 14:53:56 -07:00
Marc Blank
ce2e1260bc am b8ef8a2c: am a97d8501: Merge "Properly decode a uid from the globalObjId in invites" into froyo
Merge commit 'b8ef8a2c1d18421a7d537dbc8d1ea88ffca95898' into kraken

* commit 'b8ef8a2c1d18421a7d537dbc8d1ea88ffca95898':
  Properly decode a uid from the globalObjId in invites
2010-04-15 13:48:03 -07:00
Marc Blank
b8ef8a2c1d am a97d8501: Merge "Properly decode a uid from the globalObjId in invites" into froyo
Merge commit 'a97d85014f3849fe4ab05758857eb7552caaa856' into froyo-plus-aosp

* commit 'a97d85014f3849fe4ab05758857eb7552caaa856':
  Properly decode a uid from the globalObjId in invites
2010-04-15 13:44:06 -07:00
Marc Blank
a97d85014f Merge "Properly decode a uid from the globalObjId in invites" into froyo 2010-04-15 13:41:04 -07:00