Todd Kennedy
df67c5d8a0
am 48be275b
: Merge "Prevent auto-download of attachments not in an inbox" into honeycomb
...
* commit '48be275bbb05dcb9a60504b26e89648b5b98c5f5':
Prevent auto-download of attachments not in an inbox
2011-01-24 14:22:57 -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
7ec5d58d40
am 46e848cc
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '46e848ccadf6217e365916d07c9b715dac9beabb':
Import revised translations. DO NOT MERGE
2011-01-24 13:58:17 -08:00
Eric Fischer
46e848ccad
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:52:21 -08:00
Andy Stadler
3ac11f1e65
am 4fd1ebdc
: Fix multiline mode in signature
...
* commit '4fd1ebdcc3b8b1389c65e485d73cd5a98616cf17':
Fix multiline mode in signature
2011-01-24 13:44:10 -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
d27516d856
am 3dc2fcaa
: Merge "Rework account security bootstrap procedure" into honeycomb
...
* commit '3dc2fcaac356d2e3866c860199e1d51a8a087f98':
Rework account security bootstrap procedure
2011-01-24 11:20:59 -08:00
Andy Stadler
3dc2fcaac3
Merge "Rework account security bootstrap procedure" into honeycomb
2011-01-24 11:18:12 -08:00
Todd Kennedy
eeabcedbbc
am 819db01e
: Limit attachment background download attempts
...
* commit '819db01eadc3a95b02b2f820b483056b68c631f0':
Limit attachment background download attempts
2011-01-24 11:16:11 -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
c93cf5d679
am 5150d0e8
: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
...
* commit '5150d0e818174453656069eeb4f282b6293b0abc':
Don't require sSyncLock for sync error map
2011-01-23 15:07:11 -08:00
Marc Blank
2d9a2186b8
am d6fbab1e
: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
...
* commit 'd6fbab1e7a51852f13c343e8a0325f81c19d98c5':
Prevent logging about "attachment with null contentUri"
2011-01-23 15:05:14 -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
f5adc3955c
am 2b59ecae
: Remove use of old theme name.
...
* commit '2b59ecaebcc8012d307080f3f345692fa94e679e':
Remove use of old theme name.
2011-01-23 14:41:35 -08:00
Dianne Hackborn
2b59ecaebc
Remove use of old theme name.
...
Change-Id: I0a08171b3068abeb57c973074b37aaf3c87ff001
2011-01-23 13:06:41 -08:00
Makoto Onuki
2aee3a1002
am 04cf5e4b
: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb
...
* commit '04cf5e4bdf091f490f2e3bfb40f80bab44a05e25':
AttachmentProvider: Always return mime-types in lowercase
2011-01-23 11:38:28 -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
Andy Stadler
a01c510146
am 5211161a
: (-s ours) am ecffd551
: DO NOT MERGE Remove all password trim() calls
...
* commit '5211161a887c6a446a275e44eb76b4207b18122e':
DO NOT MERGE Remove all password trim() calls
2011-01-21 17:41:21 -08:00
Todd Kennedy
c8e5a4bc61
am f92dd2bf
: Don\'t display toast for background download failures
...
* commit 'f92dd2bf3ea445db9b9a0eb9a447b5cbdb1a6e05':
Don't display toast for background download failures
2011-01-21 15:35:38 -08:00
Todd Kennedy
f92dd2bf3e
Don't display toast for background download failures
...
When downloading attachments in the background, do not display any errors
on the display.
NOTE: This is a partial fix for general background attachment downloading issues
bug 3373982
Change-Id: I874ed902bde293303e10308f38b992b2bb15b6aa
2011-01-21 15:17:29 -08:00
Makoto Onuki
6833fd5ab6
AttachmentProvider: Always return mime-types in lowercase
...
Intent-filter's mime-type matching is case-sensitive. We should always use
lowercase letters.
Bug 3375709
Change-Id: Idd4abb41f94c816a5b9150aef5859dd75487a042
2011-01-21 14:56:01 -08:00
Makoto Onuki
ebd4121f7a
am d5c6717e
: Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb
...
* commit 'd5c6717eeb816fac19fbab0fe900cb78ca18ae63':
Compose: Make sure to unhide CC if not empty for reply-all
2011-01-21 13:51:57 -08:00
Makoto Onuki
d5c6717eeb
Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb
2011-01-21 13:50:00 -08:00
Marc Blank
4fad1dd6a3
am 0a7d214b
: Merge "Delete attachment if there\'s no corresponding message" into honeycomb
...
* commit '0a7d214b27ff9a7ef2c1aa9348c65c7959db6dcb':
Delete attachment if there's no corresponding message
2011-01-21 11:28:54 -08:00
Marc Blank
0a7d214b27
Merge "Delete attachment if there's no corresponding message" into honeycomb
2011-01-21 11:10:09 -08:00
Makoto Onuki
3784b28aa6
Compose: Make sure to unhide CC if not empty for reply-all
...
Bug 3376821
Change-Id: Ieec04881843717fea55cec8efbf35757042c8d2a
2011-01-21 10:26:07 -08:00
Marc Blank
2ac1833943
Delete attachment if there's no corresponding message
...
Bug: 3372440
Change-Id: I5c3653c5f27e0aa7bab52ca0d979e14bb6bafc34
2011-01-20 20:32:56 -08:00
Andy Stadler
5211161a88
am ecffd551
: DO NOT MERGE Remove all password trim() calls
...
* commit 'ecffd551cc2a9dc6813effbfc9d21f2b3825a5b5':
DO NOT MERGE Remove all password trim() calls
2011-01-20 17:41:37 -08:00
Makoto Onuki
71349b64dc
am 7093746d
: Don\'t modify content URI to non-email providers
...
* commit '7093746dd5017b1dacb726eb7b083922de15612e':
Don't modify content URI to non-email providers
2011-01-20 17:14:23 -08:00
Makoto Onuki
92039f9e42
am 092ff131
: Merge "Expand Reply/Forward/etc buttons for easier tap" into honeycomb
...
* commit '092ff131afa6b6b0724bc784086ece87b0c01006':
Expand Reply/Forward/etc buttons for easier tap
2011-01-20 17:07:25 -08:00
Marc Blank
b10f7c0ad8
am 554ad344
: Merge "Respect email sync setting" into honeycomb
...
* commit '554ad3447570751a2b311624a7ddfbae86253f97':
Respect email sync setting
2011-01-20 17:06:26 -08:00
Marc Blank
4904e213cd
am 6c9911e3
: Merge "Strip content of the "head" tag" into honeycomb
...
* commit '6c9911e3fbea6b975ecbd276c879e150efc29a8a':
Strip content of the "head" tag
2011-01-20 17:06:20 -08:00
Roy West
d6f89cdde5
am 41f3170c
: Merge "Remove erroneous extra space char." into honeycomb
...
* commit '41f3170c67c8d58add5d72034c4d83d96f58d437':
Remove erroneous extra space char.
2011-01-20 17:05:11 -08:00
Todd Kennedy
f48d641ebb
am 02ba344c
: Only show messages from inbox for account & unread views
...
* commit '02ba344cf2489dba81058e25e3202f2898360083':
Only show messages from inbox for account & unread views
2011-01-20 17:05:04 -08:00
Roy West
1f5a5fe2ea
am c8f6d57c
: Change "status bar" to "System bar" for HC and future.
...
* commit 'c8f6d57ca5197b731625c3e1511863cb380ad9f5':
Change "status bar" to "System bar" for HC and future.
2011-01-20 17:01:16 -08:00
Makoto Onuki
7093746dd5
Don't modify content URI to non-email providers
...
The "?limit=" param is only supported by EmailProvider, so don't add
it to other URIs.
Doing so causes a permission error when opening an EML attachment on gmail,
because we're granted the permission only to the passed URI, but not to
the URI with the "?limit=" param.
Bug 3371630
Change-Id: I88fff88a7e48e5bc958124eedec3e592978a40c7
2011-01-20 16:28:36 -08:00
Makoto Onuki
092ff131af
Merge "Expand Reply/Forward/etc buttons for easier tap" into honeycomb
2011-01-20 15:33:32 -08:00
Makoto Onuki
b6acba0e7b
Expand Reply/Forward/etc buttons for easier tap
...
Bug 3372927
Change-Id: I9a6e01c43b4c534b5e6c5c697062313d610c44e6
2011-01-20 14:42:48 -08:00
Marc Blank
554ad34475
Merge "Respect email sync setting" into honeycomb
2011-01-20 14:38:48 -08:00
Marc Blank
6c9911e3fb
Merge "Strip content of the "head" tag" into honeycomb
2011-01-20 14:38:26 -08:00
Marc Blank
9dc8ba5cad
Strip content of the "head" tag
...
Bug: 3285281
Change-Id: I1183697ad09fbf8740e3529fecfa59cf6650b2f9
2011-01-20 14:31:09 -08:00
Roy West
41f3170c67
Merge "Remove erroneous extra space char." into honeycomb
2011-01-20 13:26:59 -08:00
Roy West
45939a77b8
Remove erroneous extra space char.
...
Change-Id: I2a4f107bc7f9ab4d407ddd6740faa2454f9c593f
2011-01-20 13:22:24 -08:00
Todd Kennedy
02ba344cf2
Only show messages from inbox for account & unread views
...
Use a sub-selection to limit the messages from the inbox. Also add a unit
test to ensure the selections are working correctly.
bug 3368613
Change-Id: Ia24ef6028ded27c69f982ecbc6b67f35f84d1b6d
2011-01-20 13:20:12 -08:00