Commit Graph

2779 Commits

Author SHA1 Message Date
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
Marc Blank
7e30b2e22f Properly decode a uid from the globalObjId in invites
* Meeting invitations in EAS include a globalObjId.  It turns out
  that this id is EITHER the actual uid (if Exchange created it)
  or a wrapper for the actual uid (if some other client created it)
* To find out which case we're dealing with, we have to look at
  the base64 decoded string for the magic "vCal-Uid" substring
* If it's there, we pull the real uid out of the decoded string
* Otherwise, we build a hex strong from the decoded bytes
* Write unit test for this process

Bug: 2598201
Change-Id: I1cc40af6d1e45be44c19465eb8a4c31851ec8157
2010-04-15 13:12:40 -07:00
Kenny Root
c6b13ab1f0 am 779c7408: am c4d1395d: Merge "Import revised translations" into froyo
Merge commit '779c7408f134bfbe3e3cd5681e93a9a2c46c1d53' into kraken

* commit '779c7408f134bfbe3e3cd5681e93a9a2c46c1d53':
  Import revised translations
2010-04-15 06:05:27 -07:00
Kenny Root
779c7408f1 am c4d1395d: Merge "Import revised translations" into froyo
Merge commit 'c4d1395d833e2a9bed8ced20e2446f3c46518ab5' into froyo-plus-aosp

* commit 'c4d1395d833e2a9bed8ced20e2446f3c46518ab5':
  Import revised translations
2010-04-15 05:59:41 -07:00
Kenny Root
c4d1395d83 Merge "Import revised translations" into froyo 2010-04-15 05:55:49 -07:00
Andrew Stadler
fa6d2b7b61 am 1bf66bb8: am 186aa619: Cleanup probable causes of close cursor access
Merge commit '1bf66bb8fcb4fcb74706d8e0917b7ac9f62d6710' into kraken

* commit '1bf66bb8fcb4fcb74706d8e0917b7ac9f62d6710':
  Cleanup probable causes of close cursor access
2010-04-15 00:22:49 -07:00
Andrew Stadler
1bf66bb8fc am 186aa619: Cleanup probable causes of close cursor access
Merge commit '186aa619dca002790c38b4dd8649bfe2b3a96f6e' into froyo-plus-aosp

* commit '186aa619dca002790c38b4dd8649bfe2b3a96f6e':
  Cleanup probable causes of close cursor access
2010-04-15 00:18:40 -07:00
Andrew Stadler
186aa619dc Cleanup probable causes of close cursor access
* Monkey is hitting this fairly often
* Multiple fixes that are all good
  * We were launching LoadAccountsTask twice
  * Don't use a managed cursor for the inner accounts cursor - always
      close it manually by calling changeCursor(null) and letting the
      MergeCursor handle its sub-cursors.
  * Add isCancelled() check
  * When replacing adapter, be sure to close cursor

Bug: 2524465
Change-Id: I2309e033d65430810f2856285c1fa9bf2f8fb5e3
2010-04-14 23:51:35 -07:00
Andrew Stadler
0b589c403a am a55d27ba: am 3b3b5b0f: Run the account reconciler every time we start SyncManager
Merge commit 'a55d27bae112429348090be7fa262d7acc1b69e8' into kraken

* commit 'a55d27bae112429348090be7fa262d7acc1b69e8':
  Run the account reconciler every time we start SyncManager
2010-04-14 22:53:17 -07:00
Andrew Stadler
a55d27bae1 am 3b3b5b0f: Run the account reconciler every time we start SyncManager
Merge commit '3b3b5b0f2b65bf7efb9474ece2d8d2821beeadc2' into froyo-plus-aosp

* commit '3b3b5b0f2b65bf7efb9474ece2d8d2821beeadc2':
  Run the account reconciler every time we start SyncManager
2010-04-14 22:49:17 -07:00
Makoto Onuki
6f83fe6317 am ad383ff1: am d2a0d233: Use consistent device-id even the device is wiped.
Merge commit 'ad383ff1231319c6ded4077b0d1415bf77bec70b' into kraken

* commit 'ad383ff1231319c6ded4077b0d1415bf77bec70b':
  Use consistent device-id even the device is wiped.
2010-04-14 22:22:18 -07:00
Makoto Onuki
ad383ff123 am d2a0d233: Use consistent device-id even the device is wiped.
Merge commit 'd2a0d23380a2751d82f9d1f955a812f94a301e2a' into froyo-plus-aosp

* commit 'd2a0d23380a2751d82f9d1f955a812f94a301e2a':
  Use consistent device-id even the device is wiped.
2010-04-14 22:19:30 -07:00
Andrew Stadler
3b3b5b0f2b Run the account reconciler every time we start SyncManager
* This takes care of *some* of the race conditions where the
  account DB is blown away but the Email app is not running, so we
  don't get any notification of a change;  We have to try and
  sort this out early.
* SyncManager is started by Welcome, so this catches many cases of
  entering the email app.

Bug: 2567986
Change-Id: I76bea5b636802ba5c1677d8b1825fb3c61f7b2d9
2010-04-14 22:18:14 -07:00
Makoto Onuki
d2a0d23380 Use consistent device-id even the device is wiped.
Use hash of device id (TelephonyManager.getDeviceId()) instead of a random
value.

Bug 2596537

Change-Id: I22303f7287ee6e9edccec349d03f14adbd33f6f7
2010-04-14 21:39:18 -07:00
Andrew Stadler
16fa3af652 am bd9f4ab3: am 79ef52cf: Improve handling of UI reset cases
Merge commit 'bd9f4ab329b4d01493c84b3d93d678c9d5a594fe' into kraken

* commit 'bd9f4ab329b4d01493c84b3d93d678c9d5a594fe':
  Improve handling of UI reset cases
2010-04-14 20:36:26 -07:00
Kenny Root
4aff10da4a Import revised translations
Change-Id: I648e39b3c3295325bfbb967fa193187869ee562a
2010-04-14 20:33:06 -07:00
Andrew Stadler
bd9f4ab329 am 79ef52cf: Improve handling of UI reset cases
Merge commit '79ef52cfb33e9fb2a2e71d31e0b3810ed1babea5' into froyo-plus-aosp

* commit '79ef52cfb33e9fb2a2e71d31e0b3810ed1babea5':
  Improve handling of UI reset cases
2010-04-14 20:32:46 -07:00
Andrew Stadler
79ef52cfb3 Improve handling of UI reset cases
* When account disappears (e.g. delete from Accounts & Sync) the Welcome
   activity should launch with FLAG_ACTIVITY_CLEAR_TOP to remove any
   stacked activities as well.
* When account disappears entering AccountSetupNames, don't fall out
   of Eas Flow Mode.
* Followup to 5e354cd1db

Bug: 2563998
Change-Id: Ifbe086e26205bb28c2514f84cb28e839888b1eb0
2010-04-14 19:16:46 -07:00