Commit Graph

2633 Commits

Author SHA1 Message Date
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
Andrew Stadler
8249155e42 am 1ec609e9: am 694fe3b0: Merge "Safer error handling in AccountNames" into froyo
Merge commit '1ec609e99e00957788f4cb5d1965b9d4659f46ff' into kraken

* commit '1ec609e99e00957788f4cb5d1965b9d4659f46ff':
  Safer error handling in AccountNames
2010-04-14 17:50:25 -07:00
Andrew Stadler
1ec609e99e am 694fe3b0: Merge "Safer error handling in AccountNames" into froyo
Merge commit '694fe3b0c7a1dd8759795edc3ffa440bdfd5ce37' into froyo-plus-aosp

* commit '694fe3b0c7a1dd8759795edc3ffa440bdfd5ce37':
  Safer error handling in AccountNames
2010-04-14 17:45:49 -07:00
Andrew Stadler
694fe3b0c7 Merge "Safer error handling in AccountNames" into froyo 2010-04-14 17:42:55 -07:00
Andrew Stadler
fa669234be Safer error handling in AccountNames
The error handling for (mAccount == null) would crash.  Use a simpler
path here and just abandon the setup process.

The root cause of this (the account being null) is probably solved
by 3ae84b247d, but still a good idea to
clean this up.

Bug: 2558344
Change-Id: I3167234f99e9d39844f2b56a4d94f25465c7c269
2010-04-14 17:41:28 -07:00
Makoto Onuki
cda014c16e am 8dffa087: am 162b0171: Change account colors to what aren\'t used in Calendar.
Merge commit '8dffa087db44e27e5f0e5672b19fdb6975e614a7' into kraken

* commit '8dffa087db44e27e5f0e5672b19fdb6975e614a7':
  Change account colors to what aren't used in Calendar.
2010-04-14 16:30:27 -07:00
Marc Blank
dd18cfa62a am 82e43ff2: am d8a4e4d2: Merge "Don\'t allow Exchange logger to recurse on failure" into froyo
Merge commit '82e43ff284eac3767f38e81bf15188021581a8e1' into kraken

* commit '82e43ff284eac3767f38e81bf15188021581a8e1':
  Don't allow Exchange logger to recurse on failure
2010-04-14 16:30:25 -07:00
Makoto Onuki
8dffa087db am 162b0171: Change account colors to what aren\'t used in Calendar.
Merge commit '162b017140464aea05a47e7540a666b10825a8dc' into froyo-plus-aosp

* commit '162b017140464aea05a47e7540a666b10825a8dc':
  Change account colors to what aren't used in Calendar.
2010-04-14 16:26:14 -07:00
Marc Blank
82e43ff284 am d8a4e4d2: Merge "Don\'t allow Exchange logger to recurse on failure" into froyo
Merge commit 'd8a4e4d25d9a1cbe87c729dfc05cfdc069d4004f' into froyo-plus-aosp

* commit 'd8a4e4d25d9a1cbe87c729dfc05cfdc069d4004f':
  Don't allow Exchange logger to recurse on failure
2010-04-14 16:26:11 -07:00
Makoto Onuki
162b017140 Change account colors to what aren't used in Calendar.
Bug 2535090

Change-Id: I252e04afa402303d226a56f1d7852f50dc26e2ec
2010-04-14 15:18:12 -07:00
Marc Blank
d8a4e4d25d Merge "Don't allow Exchange logger to recurse on failure" into froyo 2010-04-14 14:29:21 -07:00
Andrew Stadler
f14da10df8 am dc283b1b: am 5e354cd1: Exit most activities when accounts are deleted
Merge commit 'dc283b1b399da1543d57b8eae8ffcbc72f1deca0' into kraken

* commit 'dc283b1b399da1543d57b8eae8ffcbc72f1deca0':
  Exit most activities when accounts are deleted
2010-04-14 12:10:17 -07:00
Andrew Stadler
e2be72d390 am f9890942: am 383b7dd2: Merge "Final cleanup for account provisioning failures" into froyo
Merge commit 'f9890942bc4a61d14d65f38a16a8bb53bc979880' into kraken

* commit 'f9890942bc4a61d14d65f38a16a8bb53bc979880':
  Final cleanup for account provisioning failures
2010-04-14 12:10:15 -07:00
Marc Blank
da86f04c77 am 595ebceb: am 3fdaa329: Only set ORIGINAL_INSTANCE_TIME in exceptions
Merge commit '595ebcebfaf937434dd797f0423819dae147b0d6' into kraken

* commit '595ebcebfaf937434dd797f0423819dae147b0d6':
  Only set ORIGINAL_INSTANCE_TIME in exceptions
2010-04-14 12:10:12 -07:00
Andrew Stadler
dc283b1b39 am 5e354cd1: Exit most activities when accounts are deleted
Merge commit '5e354cd1db1baabad061032af5a0632cd0f58d1a' into froyo-plus-aosp

* commit '5e354cd1db1baabad061032af5a0632cd0f58d1a':
  Exit most activities when accounts are deleted
2010-04-14 12:03:36 -07:00
Andrew Stadler
f9890942bc am 383b7dd2: Merge "Final cleanup for account provisioning failures" into froyo
Merge commit '383b7dd29d9380442a0a560d8bdba7e23573b22d' into froyo-plus-aosp

* commit '383b7dd29d9380442a0a560d8bdba7e23573b22d':
  Final cleanup for account provisioning failures
2010-04-14 12:03:29 -07:00
Marc Blank
595ebcebfa am 3fdaa329: Only set ORIGINAL_INSTANCE_TIME in exceptions
Merge commit '3fdaa329692b29c0083008bcbb5c5aa62ae7b9fd' into froyo-plus-aosp

* commit '3fdaa329692b29c0083008bcbb5c5aa62ae7b9fd':
  Only set ORIGINAL_INSTANCE_TIME in exceptions
2010-04-14 12:02:58 -07:00
Andrew Stadler
5e354cd1db Exit most activities when accounts are deleted
This resolves cases like this:  You are in the inbox of an Exchange
account.  You click home, settings, accounts & sync, and you delete
the account.  Now re-enter the Email app.  You'll be left in a strangely
empty inbox, for an account that no longer exists.

* Set a flag any time the reconciler deletes an account
* Check that flag in onResume of any activity that depends on the account
    list and could be left in an "empty" state if account(s) are deleted.
* The Activities in which we check it are:
  * AccountFolderList
  * AccountSettings
  * MailboxList
  * MessageCompose
  * MessageList
  * MessageView
* Clear the flag any time we come in through Welcome, which will dispatch
    to other activities properly based on the number of accounts found.

Bug: 2563998
Change-Id: I00fc542581c2bed92d744a4c2e48a88f83737f11
2010-04-14 09:28:04 -07:00
Andrew Stadler
383b7dd29d Merge "Final cleanup for account provisioning failures" into froyo 2010-04-14 09:14:33 -07:00
Marc Blank
3fdaa32969 Only set ORIGINAL_INSTANCE_TIME in exceptions
* We were setting this for all events, but apparently CalendarProvider
  does not approve, and generates warnings
* Only set this for exceptions

Bug: 2550631
Change-Id: I8a7152eb0d4233432b1a5b5664da964d5433fbae
2010-04-14 08:41:38 -07:00
Marc Blank
3180ada550 am 1205deec: am 627006a8: Fix issue with deleted recurrence
Merge commit '1205deececdb99a23b45434568fac71fe3d50b8f' into kraken

* commit '1205deececdb99a23b45434568fac71fe3d50b8f':
  Fix issue with deleted recurrence
2010-04-14 08:39:13 -07:00
Andrew Stadler
c98b64c801 Final cleanup for account provisioning failures
* Now that we get proper callbacks on updateMailboxListCallback(),
    show the error banner if there's a problem
* Follow-on to 63186a5442

Bug: 2585159
Change-Id: I2b4f365d02b639bc3ceff9f8938333185d5ba693
2010-04-13 23:49:24 -07:00
Marc Blank
c89e1a8616 Don't allow Exchange logger to recurse on failure
Bug: 2594331
Change-Id: Ie5de4ac11259e5be30d4bf9812164823b9ca46ae
2010-04-13 20:34:13 -07:00
Marc Blank
e49a1e4b8b am 58f7daac: am c07cd159: Merge "Try a longer timeout for initial sync" into froyo
Merge commit '58f7daac64a105f0607bf0cf64dba9d2ad523b31' into kraken

* commit '58f7daac64a105f0607bf0cf64dba9d2ad523b31':
  Try a longer timeout for initial sync
2010-04-13 20:27:02 -07:00
Marc Blank
1205deecec am 627006a8: Fix issue with deleted recurrence
Merge commit '627006a8e3e098f249a93efd2d575b0f0e504340' into froyo-plus-aosp

* commit '627006a8e3e098f249a93efd2d575b0f0e504340':
  Fix issue with deleted recurrence
2010-04-13 20:27:01 -07:00
Marc Blank
627006a8e3 Fix issue with deleted recurrence
* It turns out that this bug is due to a bad rebase/merge for a previous CL
  in which the changed code appears in its new form AND old form
* Fixes change SHA c3aa318200 (CL 48406)
* Don't say it.

Bug: 2587775
Change-Id: I3f70a97e498db30345452b942909448049680fdf
2010-04-13 19:50:51 -07:00
Marc Blank
58f7daac64 am c07cd159: Merge "Try a longer timeout for initial sync" into froyo
Merge commit 'c07cd159d4151c8e75fc32972e2bed3e9aab2d01' into froyo-plus-aosp

* commit 'c07cd159d4151c8e75fc32972e2bed3e9aab2d01':
  Try a longer timeout for initial sync
2010-04-13 19:47:49 -07:00
Marc Blank
c07cd159d4 Merge "Try a longer timeout for initial sync" into froyo 2010-04-13 19:35:19 -07:00
Marc Blank
3093b61668 Try a longer timeout for initial sync
* We are still seeing an issue with at least one user on initial
  calendar sync.
* Increase the read timeout a great deal for initial sync, as it
  can a very long time for the server to respond

Bug: 2569162
Change-Id: I495c38dc58d9a80c5a21e40b6fc5d165d10a3c1a
2010-04-13 18:27:58 -07:00
Makoto Onuki
040f0e3c48 am 77275817: am 0f3d3601: Merge "Show device id on the exchange setting screen." into froyo
Merge commit '772758177e3dd4fcb1c9d534afec3007b59c8bf7' into kraken

* commit '772758177e3dd4fcb1c9d534afec3007b59c8bf7':
  Show device id on the exchange setting screen.
2010-04-13 17:32:00 -07:00
Makoto Onuki
772758177e am 0f3d3601: Merge "Show device id on the exchange setting screen." into froyo
Merge commit '0f3d36010df682602260bef1e7a59191c90e805e' into froyo-plus-aosp

* commit '0f3d36010df682602260bef1e7a59191c90e805e':
  Show device id on the exchange setting screen.
2010-04-13 17:29:59 -07:00
Makoto Onuki
0f3d36010d Merge "Show device id on the exchange setting screen." into froyo 2010-04-13 17:28:02 -07:00
Makoto Onuki
12b4bc9e80 Show device id on the exchange setting screen.
I've attached a screenshot on the referenced bug.

Also fixed a bug in SyncManager.getDeviceId() where sDeviceId cache wasn't
working.

Bug 2591124

Change-Id: I4b58517c095a96d47fb57179d70091b2c7af5249
2010-04-13 17:10:26 -07:00
Marc Blank
b19fd96eb2 am 77f820dc: am 0005eba7: Fix cancellation messages for deleted attendee
Merge commit '77f820dc0d120cfe28fc8a26bdc69ade92d68e5a' into kraken

* commit '77f820dc0d120cfe28fc8a26bdc69ade92d68e5a':
  Fix cancellation messages for deleted attendee
2010-04-13 15:11:12 -07:00
Marc Blank
77f820dc0d am 0005eba7: Fix cancellation messages for deleted attendee
Merge commit '0005eba750a10b9b3eda9f8cfb75bdc65c80a919' into froyo-plus-aosp

* commit '0005eba750a10b9b3eda9f8cfb75bdc65c80a919':
  Fix cancellation messages for deleted attendee
2010-04-13 15:09:17 -07:00
Marc Blank
0005eba750 Fix cancellation messages for deleted attendee
* We weren't sending a proper ics file for the deleted attendee, and
  this caused Exchange to send a message to the wrong people (the
  referenced bug)
* Split out code that adds attendees to outgoing mail
* Changed the optional last argument to createMessageForX to be a specified
  attendee, i.e. the only addressee to be used for the message

Bug: 2548465
Change-Id: I629fcfaffe621408ea460d42c9c7c283929f7e79
2010-04-13 13:37:51 -07:00
Marc Blank
4621489f99 am 14495c05: am 63186a54: Send callback if reloadFolderList fails w/ uninit\'ed account
Merge commit '14495c05f69db71311002b077280782ed4154fc4' into kraken

* commit '14495c05f69db71311002b077280782ed4154fc4':
  Send callback if reloadFolderList fails w/ uninit'ed account
2010-04-13 11:54:26 -07:00
Andrew Stadler
f02238ed2e am cccfb846: am a87f8d8b: Changes to improve security policy setup
Merge commit 'cccfb8464ed8c2221b70b61151ecd77945299d06' into kraken

* commit 'cccfb8464ed8c2221b70b61151ecd77945299d06':
  Changes to improve security policy setup
2010-04-13 11:53:44 -07:00
Marc Blank
14495c05f6 am 63186a54: Send callback if reloadFolderList fails w/ uninit\'ed account
Merge commit '63186a5442f8310b25602235622c3669a4e5b1ec' into froyo-plus-aosp

* commit '63186a5442f8310b25602235622c3669a4e5b1ec':
  Send callback if reloadFolderList fails w/ uninit'ed account
2010-04-13 10:48:11 -07:00
Marc Blank
63186a5442 Send callback if reloadFolderList fails w/ uninit'ed account
Bug: 2585159
Change-Id: I12d9dd84090d10675e3d403124e28dbb6bede3d8
2010-04-13 10:44:00 -07:00
Andrew Stadler
cccfb8464e am a87f8d8b: Changes to improve security policy setup
Merge commit 'a87f8d8bbc0b704974c4230f518cf23b7215fc55' into froyo-plus-aosp

* commit 'a87f8d8bbc0b704974c4230f518cf23b7215fc55':
  Changes to improve security policy setup
2010-04-13 09:26:43 -07:00
Andrew Stadler
a87f8d8bbc Changes to improve security policy setup
* SecurityPolicy:  Fix bug that prevents any notifications after the
    user hits "cancel all" from the notification pane.
* AccountSecurity: If the user cancels the device admin acceptance
    activity, repost the notification.
* MesageList:  Catch security hold condition when entering a mailbox, and
    launch security setup activity.

Bug: 2585159
Change-Id: I60d5d8c693cc5f00fe98a9cc69265802f5bee813
2010-04-13 02:15:37 -07:00
Marc Blank
cdc53cc4b2 am 1c9a47a4: am 0cd062eb: Merge "Fix acknowledgment of Exchange remote wipe" into froyo
Merge commit '1c9a47a424698ae899975afa1e0fe724545038f6' into kraken

* commit '1c9a47a424698ae899975afa1e0fe724545038f6':
  Fix acknowledgment of Exchange remote wipe
2010-04-12 18:03:48 -07:00
Marc Blank
1c9a47a424 am 0cd062eb: Merge "Fix acknowledgment of Exchange remote wipe" into froyo
Merge commit '0cd062ebd02fa9f3122ddc853cbc909be4c5d2db' into froyo-plus-aosp

* commit '0cd062ebd02fa9f3122ddc853cbc909be4c5d2db':
  Fix acknowledgment of Exchange remote wipe
2010-04-12 18:01:52 -07:00
Marc Blank
0cd062ebd0 Merge "Fix acknowledgment of Exchange remote wipe" into froyo 2010-04-12 17:59:40 -07:00
Marc Blank
2f194cefbb Fix acknowledgment of Exchange remote wipe
* The XML acknowledging the wipe was malformed

Bug: 2589695
Change-Id: I24428a21ce5b08f32c372dcbb50b24d6e6c42645
2010-04-12 17:48:17 -07:00
Marc Blank
a29e5e60da am 9edec647: am de302226: Always check serverId AND calendarId in queries
Merge commit '9edec6478cbb3cd3720077acfaaa950160eea128' into kraken

* commit '9edec6478cbb3cd3720077acfaaa950160eea128':
  Always check serverId AND calendarId in queries
2010-04-12 16:53:33 -07:00