Andy Stadler
1d4726ac73
am 18b73106
: am 24a81185
: Merge "Catch base64 errors and handle in-place" into honeycomb
...
* commit '18b7310684e3baf9d2bde91c2c1fabcf8aadb134':
Catch base64 errors and handle in-place
2011-01-24 19:42:45 -08:00
Andy Stadler
18b7310684
am 24a81185
: Merge "Catch base64 errors and handle in-place" into honeycomb
...
* commit '24a81185d1006a95b96561bfd5bc3f8c5669bdcb':
Catch base64 errors and handle in-place
2011-01-24 19:39:13 -08:00
Marc Blank
e09eb93b31
am b802246f
: am 3ef8f54b
: Prefetch respects "background data" setting and waits for connectivity
...
* commit 'b802246f99c0fe964aefbc06b9e4a9056c2a9fc4':
Prefetch respects "background data" setting and waits for connectivity
2011-01-24 19:37:14 -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
b802246f99
am 3ef8f54b
: Prefetch respects "background data" setting and waits for connectivity
...
* commit '3ef8f54bae6a3e02919cfd7add7ed6bf7fdda901':
Prefetch respects "background data" setting and waits for connectivity
2011-01-24 19:32:48 -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
3c66c31396
am df67c5d8
: am 48be275b
: Merge "Prevent auto-download of attachments not in an inbox" into honeycomb
...
* commit 'df67c5d8a002d81df4091eda62b6eeac4084a76f':
Prevent auto-download of attachments not in an inbox
2011-01-24 14:25:18 -08:00
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
c7ea1d0684
am 7ec5d58d
: (-s ours) am 46e848cc
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '7ec5d58d4007c0363a1a0f5125b6cc386cad00a6':
Import revised translations. DO NOT MERGE
2011-01-24 14:01:22 -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
0eb48fd0c4
am 3ac11f1e
: am 4fd1ebdc
: Fix multiline mode in signature
...
* commit '3ac11f1e65eca4801c12d825ac41754c2d1ea827':
Fix multiline mode in signature
2011-01-24 13:46:48 -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
Andy Stadler
370e838849
am d27516d8
: am 3dc2fcaa
: Merge "Rework account security bootstrap procedure" into honeycomb
...
* commit 'd27516d8569f118c00ab923891584407cec696fb':
Rework account security bootstrap procedure
2011-01-24 13:31:49 -08:00
Todd Kennedy
bb34a895b7
am eeabcedb
: am 819db01e
: Limit attachment background download attempts
...
* commit 'eeabcedbbc9ec4cae10974805d61d60b6b39d43c':
Limit attachment background download attempts
2011-01-24 13:31:04 -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
2760374f7d
am c93cf5d6
: am 5150d0e8
: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
...
* commit 'c93cf5d6797d80a6ac3a461d8630385105f78df8':
Don't require sSyncLock for sync error map
2011-01-23 17:00:24 -08:00
Marc Blank
8818e4f472
am 2d9a2186
: am d6fbab1e
: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
...
* commit '2d9a2186b883863a34378e0d62799ea1338ac2ce':
Prevent logging about "attachment with null contentUri"
2011-01-23 17:00:21 -08:00
Dianne Hackborn
91bee2345e
am f5adc395
: am 2b59ecae
: Remove use of old theme name.
...
* commit 'f5adc3955cf3d8ac6af06898cf14b8e145188c88':
Remove use of old theme name.
2011-01-23 16:50:28 -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
61ba91078d
am 2aee3a10
: am 04cf5e4b
: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb
...
* commit '2aee3a10027d6208e22742e17b8343a2af41845a':
AttachmentProvider: Always return mime-types in lowercase
2011-01-23 11:41:03 -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
929f32f3b3
am a01c5101
: (-s ours) am 5211161a
: (-s ours) am ecffd551
: DO NOT MERGE Remove all password trim() calls
...
* commit 'a01c510146fae9a6288c3192baaa0fd1205fba4d':
DO NOT MERGE Remove all password trim() calls
2011-01-21 17:44:05 -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
43ee0cb28f
am c8e5a4bc
: am f92dd2bf
: Don\'t display toast for background download failures
...
* commit 'c8e5a4bc6176f994f40d442fc55e1257bbc68961':
Don't display toast for background download failures
2011-01-21 15:38:39 -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
cddf449af8
am ebd4121f
: am d5c6717e
: Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb
...
* commit 'ebd4121f7ae7ff81997fecf6d3730a4b28e7568b':
Compose: Make sure to unhide CC if not empty for reply-all
2011-01-21 13:54:00 -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
cc43a53f2e
am 4fad1dd6
: am 0a7d214b
: Merge "Delete attachment if there\'s no corresponding message" into honeycomb
...
* commit '4fad1dd6a300cd3f49188cad69436f15fc2825a7':
Delete attachment if there's no corresponding message
2011-01-21 11:31:04 -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