Commit Graph

4294 Commits

Author SHA1 Message Date
Marc Blank
610bbaee42 Merge "Fix NPE in SecurityPolicy.policiesRequired" into honeycomb 2011-01-26 21:39:47 -08:00
Marc Blank
844b14f851 Fix NPE in SecurityPolicy.policiesRequired
* Add check for null Account, as this method can be called from a
  background thread, and the Account might have been deleted by the
  time we're called

Bug: 3396365
Change-Id: Ie125ed714c73d51beaedc818b6b731cea941666f
2011-01-26 18:18:45 -08:00
Todd Kennedy
a7f49a7c0b Update icons with latest drop from UI
Change-Id: Ic23f1bee28c8aef1974225f9c03edc92c845f8c7
2011-01-26 17:43:03 -08:00
Dianne Hackborn
b672234a0d Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-26 17:37:32 -08:00
Makoto Onuki
199a0601ae Merge "Fix bug where mailbox list won't update in combined view" into honeycomb 2011-01-26 17:31:51 -08:00
Eric Fischer
5d0a9b5dd7 Import revised translations. DO NOT MERGE
Change-Id: Iaa2876f8671e7a8ede38a076f39260a8be457f72
2011-01-26 16:34:09 -08:00
Andy Stadler
382478547e Merge "Protect against threading issues in AttachmentDownloadService" into honeycomb 2011-01-26 16:06:54 -08:00
Marc Blank
ed9938cd9c Protect against threading issues in AttachmentDownloadService
Bug: 3391148
Change-Id: I513b5678815db262ea5660661336432f1e203c9e
2011-01-26 16:04:28 -08:00
Makoto Onuki
3fd2513a18 Merge "Make the "refreshing" progress icon smaller" into honeycomb 2011-01-26 15:02:19 -08:00
Makoto Onuki
3735cd4256 Merge "Make account name on action bar narrower" into honeycomb 2011-01-26 15:01:10 -08:00
Makoto Onuki
75ebb59c71 Make the "refreshing" progress icon smaller
Bug 3388138

Change-Id: I0c329de5c2d2e39f34262df15363399ed2fd99e8
2011-01-26 13:49:11 -08:00
Makoto Onuki
d0ee1e404d Fix bug where mailbox list won't update in combined view
The problem was that CombinedMailboxesLoader used the cursor returned by
super.loadInBackground() (which contains accounts), to build a matrix
cursor (which contains special mailboxes and accounts and will be returned),
and *it closed the first cursor* after building the matrix cursor.

However, because this first cursor is the one that CursorLoader sets an
observer, it shouldn't be closed until the returned matix cursor closes.
In other words the two cursors should have the same lifecycle.

Fixed it by using ClosingMatrixCursor that used by AccountsLoader, which
is doing a similar thing, but properly.

Bug 3387730

Change-Id: I554ade001dc25afa869eefb4dcf9887495e6753e
2011-01-26 13:40:53 -08:00
Makoto Onuki
3af94be477 Make account name on action bar narrower
... to give the mailbox name more space.  Otherwise it can be too
small in portrait.

Bug 3387730

Change-Id: I0301fd696dc2c4dfa3654a235b9e95aa7db4b885
2011-01-26 13:26:14 -08:00
Andy Stadler
f020910461 Fix Account Manager integration
* Rework the interaction with the Account Manager
* Remove unneeded call to response.onRequestContinued()
* Store response in SetupData so it can survive the entire account
  setup flow.
* Explicitly report exit status to acct mgr at known exit points:
  * AccountSetupBasics.finish() (fail/cancel)
  * AccountSetupOptions.finish() (fail/cancel)
  * AccountSetupOptions.optionsComplete() (success)

Bug: 3335128
Change-Id: Ia55724eb1e938f2633c5ff7afb719a879be16a1b
2011-01-26 11:16:56 -08:00
Justin Ho
b0c0673342 Merge "New stat_notify icons for Email" into honeycomb 2011-01-26 08:47:52 -08:00
Justin Ho
f81e133d7a New stat_notify icons for Email
Change-Id: I9308a4c526f6a726b05aa6be08bdbab540c16d8d
2011-01-26 07:59:03 -08:00
Andy Stadler
a97faa25ac Discard result of Dupe Account check if paused
Fixes a potential race condition with a slow DB lookup and a
fast user (or monkey).

Bug: 3384992
Change-Id: I0602820e1d9f49eb01b09c9d78db3d0fc47ccfb1
2011-01-25 23:18:45 -08:00
Makoto Onuki
da75871620 Merge "Make the refresh button animate in-place." into honeycomb 2011-01-25 21:41:58 -08:00
Marc Blank
51c8228093 Merge "Ensure that EAS reconciler uses current account list" into honeycomb 2011-01-25 19:45:58 -08:00
Makoto Onuki
484d220b6e Make the refresh button animate in-place.
Turn the refresh button into an indeterminate progress icon
while refreshing.

Bug 3388138

Change-Id: Ic0406ff5b857243c3e1e475ddb8b305441eddbb0
2011-01-25 19:09:32 -08:00
Justin Ho
34d178b0c9 Merge "Updated contact picture" into honeycomb 2011-01-25 18:32:02 -08:00
Justin Ho
c2cc179a04 Updated contact picture
Change-Id: Ie1def88c913dd8893cac1ef66f376287ba5ab6a8
2011-01-25 18:25:11 -08:00
Makoto Onuki
c850485269 Remove STOPSHIPs
action_bar_current_mailbox: We'll ship with the current design.
colors.xml: Obsolete STOPSHIP.

Bug 3335095

Change-Id: Ic45ef3d0cafb55761b720e1e74c0633012f87e98
2011-01-25 16:37:40 -08:00
Makoto Onuki
2d0e44f201 Fix NPE in AttachmentDownloadService
Initialize mConnectivityManager before starting the thread.

Bug 3389701

Change-Id: If616721ad3b3bec81c5d6920f4a5d91b06f937fb
2011-01-25 15:30:15 -08:00
Marc Blank
da0225cfd9 Ensure that EAS reconciler uses current account list
Bug: 3369380
Change-Id: I00f18f0848232ea90149fb6e243f147d0e6f5c0f
2011-01-25 15:26:28 -08:00
Makoto Onuki
61e63111ba Show account name on error banner
For now just show the account name in parens.   I'll ask the design
team for a better layout.
(I don't want to change code too much at this point, so didn't add a
new view for the account name.)

Bug 3366546

Change-Id: I3a5314be4bdfacc2720093511eb03571e91fa963
2011-01-25 13:21:04 -08:00
Todd Kennedy
adbd22c9be Merge "Infer attachment's mime type if it's text/plain" into honeycomb 2011-01-25 10:36:36 -08:00
Makoto Onuki
5cba725940 Merge "Remove STOPSHIP for error banner" into honeycomb 2011-01-25 10:33:43 -08:00
Makoto Onuki
931370a340 Remove STOPSHIP for error banner
We'll go with the current design for now.

Bug 3335095

Change-Id: Iaac0e5933fb534d547ebbf90315cea628e8f49cc
2011-01-25 10:19:03 -08:00
Todd Kennedy
b3740d227e Merge "Only show loaded messages in widget" into honeycomb 2011-01-25 10:06:51 -08:00
Todd Kennedy
34212cc7df Infer attachment's mime type if it's text/plain
If the server reports an attachment's mime type as either text/plain or
application/octet-stream, we will try to infer the real mime type using
the attachment's extension. If one cannot be found, we either synthesize
it (if original mime type is application-octet-stream), or, we use the
server specified mime type (if the original is text/plain).

bug 3379416

Change-Id: I331e767ed36e4e17756025cc816bdb7b5a8f0868
2011-01-25 09:55:15 -08:00
Todd Kennedy
543953ad87 Only show loaded messages in widget
The various selection strings were missing a test to only show messages that
have been loaded. This is only important for POP3 accounts.

bug 3377041

Change-Id: I3efe366d09dd547878dc0bf57dff58f76de5cca9
2011-01-25 09:42:04 -08:00
Andy Stadler
9128217da1 Merge forward small bug found in password storage
While fixing bug 2981433 in Gingerbread, I discovered one additional
place where passwords were being trimmed.  This brings the fix forward
into honeycomb, as well as a new unit test for the fix.

Bug: 2981433
Change-Id: I566f5c0c6693ca7c0069bca9e74f320fca48e600
2011-01-24 20:13:11 -08:00
Andy Stadler
24a81185d1 Merge "Catch base64 errors and handle in-place" into honeycomb 2011-01-24 19:33:18 -08:00
Marc Blank
3ef8f54bae Prefetch respects "background data" setting and waits for connectivity
Bug: 3384997
Bug: 3384994
Change-Id: Id8338650b69666f2996837324e27c2e98c9261fe
2011-01-24 18:39:50 -08:00
Andy Stadler
980c2256f1 Catch base64 errors and handle in-place
Bug: 3362752
Change-Id: I63adb8663c90a7710176cc1c481bbfa5b4b859c4
2011-01-24 18:06:53 -08:00
Todd Kennedy
48be275bbb Merge "Prevent auto-download of attachments not in an inbox" into honeycomb 2011-01-24 14:20:37 -08:00
Eric Fischer
46e848ccad Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:52:21 -08:00
Todd Kennedy
751e4b2d95 Prevent auto-download of attachments not in an inbox
When creating the list of attachments to be automatically downloaded in the
background, exclude any attachments that are not in an inbox. Also added unit
tests to ensure the query URIs behave as expected.

NOTE: This is a partial fix for general background attachment downloading issues

bug 3373982

Change-Id: I13ef56cd280c028fa966ab9e655acce28b0b9b91
2011-01-24 13:43:14 -08:00
Eric Fischer
d71bb44960 Import revised translations. DO NOT MERGE
Change-Id: I9bfa9efb92f8051335f55bc5a898eff8ffe9c7fe
2011-01-24 12:38:12 -08:00
Andy Stadler
4fd1ebdcc3 Fix multiline mode in signature
* Add multiline flag to preference xml
* Also, remove display of actual signature in summary, as it
  does not properly handle long or multiline signatures.

Bug: 3379235
Change-Id: I84894dbdccee2cd8a8ece05d0b8f7fdcf7b92406
2011-01-24 12:01:43 -08:00
Andy Stadler
3dc2fcaac3 Merge "Rework account security bootstrap procedure" into honeycomb 2011-01-24 11:18:12 -08:00
Andy Stadler
45bfac00e5 Rework account security bootstrap procedure
* Bug to fix was that it was looping if the user canceled
  password or encryption setup (instead of simply re-notifying.)
* Solution was to refactor all code into a single sequence of checks,
  rerun the sequence each time, and set markers to prevent looping.
* Rework needed after the changes in I54f39bc9 which added
  encryption support but introduced the looping behavior.
* Removed a UI-thread DB access

Bug: 3346641
Change-Id: I0791d7a16287efecc7121b5ffa0db26ca2b05151
2011-01-24 11:08:31 -08:00
Todd Kennedy
819db01ead Limit attachment background download attempts
Do not retry downloading attachments infinitely. After some number of failures,
black list the attachment and move on. The black list is not persisted, so,
restarting the app will again try to fetch the attachments. In this way, any
transient network failures will not permanently affect the ability to download
attachments in the background

NOTE: This is a partial fix for general background attachment downloading issues

bug 3373982

Change-Id: I7f3ad9667ebebb95fbba95278b62bf40c5fce67c
2011-01-24 10:19:46 -08:00
Marc Blank
5150d0e818 Merge "Don't require sSyncLock for sync error map" into honeycomb 2011-01-23 15:04:30 -08:00
Marc Blank
d6fbab1e7a Merge "Prevent logging about "attachment with null contentUri"" into honeycomb 2011-01-23 15:03:10 -08:00
Dianne Hackborn
2b59ecaebc Remove use of old theme name.
Change-Id: I0a08171b3068abeb57c973074b37aaf3c87ff001
2011-01-23 13:06:41 -08:00
Makoto Onuki
04cf5e4bdf Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb 2011-01-23 11:32:28 -08:00
Marc Blank
1264651c69 Prevent logging about "attachment with null contentUri"
Bug: 3373982
Change-Id: I41b655041d5c244484435fe5bab7649d9ca569eb
2011-01-22 13:55:14 -08:00
Marc Blank
2fabab32b9 Don't require sSyncLock for sync error map
* Use ConcurrentHashMap; check that this provides enough protection
  for all uses
* This resolves known deadlock issues in ExchangeService

Bug: 3371039

Change-Id: Ie4ccbe7cdfe8c3d4ec7a0f789409126c8c09f8c4
2011-01-21 18:14:04 -08:00